Skip to content

Commit 0157472

Browse files
authored
Remove generated REST client which depends on deprecated package. (#1902)
* For `RestHealthCheckService` (not really used now), the HttpClient timeout is not impacted by user settings. * For `ServiceManager.IsServiceHeathy`, the http client timeout is impacted by user settings. * For AAD related REST API calls, because they use a static `HttpClientFactory` instance, they have never impacted by the user settings.
1 parent 9f322b2 commit 0157472

29 files changed

+318
-1135
lines changed

Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<SignedPackageFile Include="$(PublishDir)Microsoft.IdentityModel.Protocols.OpenIdConnect.dll" Certificate="$(AssemblySigningCertName)" Visible="false" />
7575
<SignedPackageFile Include="$(PublishDir)Microsoft.IdentityModel.Protocols.dll" Certificate="$(AssemblySigningCertName)" Visible="false" />
7676
<SignedPackageFile Include="$(PublishDir)Microsoft.IdentityModel.Tokens.dll" Certificate="$(AssemblySigningCertName)" Visible="false" />
77-
<SignedPackageFile Include="$(PublishDir)Microsoft.Rest.ClientRuntime.dll" Certificate="$(AssemblySigningCertName)" Visible="false" />
7877
<SignedPackageFile Include="$(PublishDir)Newtonsoft.Json.Bson.dll" Certificate="$(AssemblySigningCertName)" Visible="false" />
7978
<SignedPackageFile Include="$(PublishDir)Newtonsoft.Json.dll" Certificate="$(AssemblySigningCertName)" Visible="false" />
8079
<SignedPackageFile Include="$(PublishDir)System.IO.Pipelines.dll" Certificate="$(AssemblySigningCertName)" Visible="false" />

build/dependencies.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<MicrosoftExtensionsLoggingPackageVersion>2.1.0</MicrosoftExtensionsLoggingPackageVersion>
2626
<MicrosoftExtensionsPrimitivesPackageVersion>2.1.1</MicrosoftExtensionsPrimitivesPackageVersion>
2727
<MicrosoftAspNetCoreSignalRClient>1.1.0</MicrosoftAspNetCoreSignalRClient>
28-
<MicrosoftRestClientRuntimePackageVersion>2.3.24</MicrosoftRestClientRuntimePackageVersion>
2928

3029
<!--Security Patch-->
3130
<!-- Fix risks from Microsoft.AspNetCore.SignalR 1.0.0-->

src/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
<ItemGroup Condition=" '$(OutputType)' != 'Exe'">
2828
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionHttpVersion)" />
29-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="$(MicrosoftRestClientRuntimePackageVersion)" />
3029
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityPackageVersion)" />
3130
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
3231
</ItemGroup>

src/Microsoft.Azure.SignalR.Common/Constants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ public static class HttpClientNames
113113
{
114114
public const string Resilient = "Resilient";
115115
public const string MessageResilient = "MessageResilient";
116+
public const string UserDefault = "UserDefault";
117+
public const string InternalDefault = "InternalDefault";
116118
}
117119
}
118120
}

src/Microsoft.Azure.SignalR.Common/Exceptions/ExceptionExtensions.cs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,12 @@
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

44
using System;
5-
using System.Net;
6-
using System.Net.Http;
75
using System.Net.WebSockets;
86

9-
using Microsoft.Rest;
10-
117
namespace Microsoft.Azure.SignalR.Common
128
{
139
internal static class ExceptionExtensions
1410
{
15-
internal static Exception WrapAsAzureSignalRException(this Exception e, Uri baseUri)
16-
{
17-
switch (e)
18-
{
19-
case HttpOperationException operationException:
20-
var response = operationException.Response;
21-
var request = operationException.Request;
22-
var detail = response.Content;
23-
24-
var innerException = new HttpRequestException(
25-
$"Response status code does not indicate success: {(int)response.StatusCode} ({response.ReasonPhrase})", operationException);
26-
27-
return response.StatusCode switch
28-
{
29-
HttpStatusCode.BadRequest => new AzureSignalRInvalidArgumentException(request.RequestUri.ToString(), innerException, detail),
30-
HttpStatusCode.Unauthorized => new AzureSignalRUnauthorizedException(request.RequestUri.ToString(), innerException),
31-
HttpStatusCode.NotFound => new AzureSignalRInaccessibleEndpointException(request.RequestUri.ToString(), innerException),
32-
_ => new AzureSignalRRuntimeException(baseUri.ToString(), innerException),
33-
};
34-
case HttpRequestException requestException:
35-
return new AzureSignalRInaccessibleEndpointException(baseUri.ToString(), requestException);
36-
default:
37-
return e;
38-
}
39-
}
40-
4111
internal static Exception WrapAsAzureSignalRException(this Exception e)
4212
{
4313
switch (e)

src/Microsoft.Azure.SignalR.Common/RestClients/Generated/HealthApi.cs

Lines changed: 0 additions & 157 deletions
This file was deleted.

src/Microsoft.Azure.SignalR.Common/RestClients/Generated/HealthApiExtensions.cs

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/Microsoft.Azure.SignalR.Common/RestClients/Generated/IHealthApi.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/Microsoft.Azure.SignalR.Common/RestClients/Generated/ISignalRServiceRestClient.cs

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)