Skip to content

Commit 6e6fff5

Browse files
Use UnauthorizedAccessException (Azure#16846)
1 parent 4d38ddf commit 6e6fff5

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ public enum ServiceBusFailureReason
154154
ServiceCommunicationProblem = 9,
155155
SessionCannotBeLocked = 10,
156156
SessionLockLost = 11,
157-
Unauthorized = 12,
158-
MessagingEntityAlreadyExists = 13,
157+
MessagingEntityAlreadyExists = 12,
159158
}
160159
public partial class ServiceBusMessage
161160
{

sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/HttpRequestAndResponse.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ internal async Task ThrowIfRequestFailedAsync(Request request, Response response
5353
RequestFailedException ex = await _diagnostics.CreateRequestFailedExceptionAsync(response).ConfigureAwait(false);
5454
if (response.Status == (int)HttpStatusCode.Unauthorized)
5555
{
56-
throw new ServiceBusException(
56+
throw new UnauthorizedAccessException(
5757
ex.Message,
58-
ServiceBusFailureReason.Unauthorized,
59-
innerException: ex);
58+
inner: ex);
6059
}
6160

6261
if (response.Status == (int)HttpStatusCode.NotFound)

sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpExceptionHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static Exception ToMessagingContractException(string condition, string me
121121
if (string.Equals(condition, AmqpErrorCode.UnauthorizedAccess.Value, StringComparison.InvariantCultureIgnoreCase) ||
122122
string.Equals(condition, AmqpClientConstants.AuthorizationFailedError.Value, StringComparison.InvariantCultureIgnoreCase))
123123
{
124-
return new ServiceBusException(message, ServiceBusFailureReason.Unauthorized);
124+
return new UnauthorizedAccessException(message);
125125
}
126126

127127
if (string.Equals(condition, AmqpClientConstants.ServerBusyError.Value, StringComparison.InvariantCultureIgnoreCase))

sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusFailureReason.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ public enum ServiceBusFailureReason
6868
/// </summary>
6969
SessionLockLost,
7070

71-
/// <summary>
72-
/// The user doesn't have access to the entity.
73-
/// </summary>
74-
Unauthorized,
75-
7671
/// <summary>
7772
/// An entity with the same name exists under the same namespace.
7873
/// </summary>

sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RequestResponseTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ public async Task ThrowsUnauthorizedOn401()
3131
MockResponse response = new MockResponse((int)HttpStatusCode.Unauthorized);
3232
await _requestResponse.ThrowIfRequestFailedAsync(new MockRequest(), response);
3333
}
34-
catch (ServiceBusException ex)
34+
catch (UnauthorizedAccessException ex)
3535
{
36-
Assert.AreEqual(ServiceBusFailureReason.Unauthorized, ex.Reason);
3736
var inner = (RequestFailedException)ex.InnerException;
3837
Assert.AreEqual((int)HttpStatusCode.Unauthorized, inner.Status);
38+
return;
3939
}
40+
Assert.Fail($"Expected exception not thrown");
4041
}
4142

4243
[Test]

0 commit comments

Comments
 (0)