Add http client factory (#764)

f-alizada · Farhad Alizada · web-flow · commit c1a043fc2225 · 2022-06-30T13:45:28.000+02:00
* Add httpclientFactory to DI

* Add mock IHHtpClientFactory and basic test

Co-authored-by: Farhad Alizada &lt;falizada@microsoft.com&gt;
diff --git a/src/ArmTemplates/ArmTemplates.csproj b/src/ArmTemplates/ArmTemplates.csproj
@@ -28,6 +28,7 @@
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
diff --git a/src/ArmTemplates/Common/API/Clients/Abstractions/ApiClientBase.cs b/src/ArmTemplates/Common/API/Clients/Abstractions/ApiClientBase.cs
@@ -19,18 +19,15 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clien
     public abstract class ApiClientBase
     {
         readonly IMemoryCache cache = new MemoryCache(new MemoryCacheOptions());
-        readonly HttpClient httpClient = new HttpClient();
+        readonly HttpClient httpClient;
 
         protected string BaseUrl { get; private set; } = GlobalConstants.BaseManagementAzureUrl;
 
-        protected AzureCliAuthenticator Auth { get; private set; } = new AzureCliAuthenticator();
+        protected virtual AzureCliAuthenticator Auth { get; private set; } = new AzureCliAuthenticator();
 
-        public ApiClientBase(string baseUrl = null) 
+        public ApiClientBase(IHttpClientFactory httpClientFactory)
         {
-            if (!string.IsNullOrEmpty(baseUrl))
-            {
-                this.BaseUrl = baseUrl;
-            }
+            this.httpClient = httpClientFactory.CreateClient();
         }
 
         protected async Task<string> CallApiManagementAsync(string azToken, string requestUrl, bool useCache = true, ClientHttpMethod method = ClientHttpMethod.GET)
diff --git a/src/ArmTemplates/Common/API/Clients/ApiOperations/ApiOperationClient.cs b/src/ArmTemplates/Common/API/Clients/ApiOperations/ApiOperationClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class ApiOperationClient : ApiClientBase, IApiOperationClient
     {
         const string GetOperationsLinkedToApiRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/operations?api-version={5}";
 
+        public ApiOperationClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<ApiOperationTemplateResource>> GetOperationsLinkedToApiAsync(string apiName, ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/ApiRevision/ApiRevisionClient.cs b/src/ArmTemplates/Common/API/Clients/ApiRevision/ApiRevisionClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class ApiRevisionClient : ApiClientBase, IApiRevisionClient
     {
         const string GetApiRevisionsRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/revisions?api-version={5}";
 
+        public ApiRevisionClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<ApiRevisionTemplateResource>> GetApiRevisionsAsync(string apiName, ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/ApiSchemas/ApiSchemaClient.cs b/src/ArmTemplates/Common/API/Clients/ApiSchemas/ApiSchemaClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class ApiSchemaClient : ApiClientBase, IApiSchemaClient
     {
         const string GetAllApiSchemasRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/schemas?api-version={5}";
 
+        public ApiSchemaClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<ApiSchemaTemplateResource>> GetApiSchemasAsync(string apiName, ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/ApiVersionSet/ApiVersionSetClient.cs b/src/ArmTemplates/Common/API/Clients/ApiVersionSet/ApiVersionSetClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class ApiVersionSetClient : ApiClientBase, IApiVersionSetClient
     {
         const string GetAllVersionSetsRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apiVersionSets?api-version={4}";
 
+        public ApiVersionSetClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<ApiVersionSetTemplateResource>> GetAllAsync(ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/Apis/ApisClient.cs b/src/ArmTemplates/Common/API/Clients/Apis/ApisClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -19,6 +20,10 @@ public class ApisClient : ApiClientBase, IApisClient
         const string GetAllApisLinkedToProductRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/products/{4}/apis?api-version={5}";
         const string GetApisLinkedToGatewayRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/gateways/{4}/apis?api-version={5}";
 
+        public ApisClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<ApiTemplateResource> GetSingleAsync(string apiName, ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/AuthorizationServer/AuthorizationServerClient.cs b/src/ArmTemplates/Common/API/Clients/AuthorizationServer/AuthorizationServerClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class AuthorizationServerClient : ApiClientBase, IAuthorizationServerClie
     {
         const string GetAllAuthorizationServersRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/authorizationServers?api-version={4}";
 
+        public AuthorizationServerClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<AuthorizationServerTemplateResource>> GetAllAsync(ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/Backend/BackendClient.cs b/src/ArmTemplates/Common/API/Clients/Backend/BackendClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class BackendClient : ApiClientBase, IBackendClient
     {
         const string GetAllBackendsRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/backends?api-version={4}";
 
+        public BackendClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<BackendTemplateResource>> GetAllAsync(ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/Diagnostics/DiagnosticClient.cs b/src/ArmTemplates/Common/API/Clients/Diagnostics/DiagnosticClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -17,6 +18,10 @@ public class DiagnosticClient : ApiClientBase, IDiagnosticClient
         const string GetAllDiagnosticsRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/diagnostics?api-version={4}";
         const string GetDiagnosticsLinkedToApiRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/diagnostics?api-version={5}";
 
+        public DiagnosticClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<DiagnosticTemplateResource>> GetApiDiagnosticsAsync(string apiName, ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/Gateway/GatewayClient.cs b/src/ArmTemplates/Common/API/Clients/Gateway/GatewayClient.cs
@@ -5,6 +5,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -23,8 +24,10 @@ public class GatewayClient : ApiClientBase, IGatewayClient
         readonly IApisClient apisClient;
 
         public GatewayClient(
+            IHttpClientFactory httpClientFactory,
             ILogger<GatewayClient> logger,
-            IApisClient apisClient)
+            IApisClient apisClient
+            ): base(httpClientFactory)
         {
             this.logger = logger;
             this.apisClient = apisClient;
diff --git a/src/ArmTemplates/Common/API/Clients/Groups/GroupsClient.cs b/src/ArmTemplates/Common/API/Clients/Groups/GroupsClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -20,7 +21,9 @@ public class GroupsClient : ApiClientBase, IGroupsClient
 
         readonly IGroupDataProcessor groupDataProcessor;
 
-        public GroupsClient(IGroupDataProcessor groupDataProcessor)
+        public GroupsClient(
+            IHttpClientFactory httpClientFactory,
+            IGroupDataProcessor groupDataProcessor): base(httpClientFactory)
         {
             this.groupDataProcessor = groupDataProcessor;
         }
diff --git a/src/ArmTemplates/Common/API/Clients/IdentityProviders/IdentityProviderClient.cs b/src/ArmTemplates/Common/API/Clients/IdentityProviders/IdentityProviderClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Models;
@@ -21,7 +22,9 @@ public class IdentityProviderClient : ApiClientBase, IIdentityProviderClient
 
         readonly IIdentityProviderProcessor identityProviderProcessor;
 
-        public IdentityProviderClient(IIdentityProviderProcessor identityProviderProcessor)
+        public IdentityProviderClient(
+            IHttpClientFactory httpClientFactory, 
+            IIdentityProviderProcessor identityProviderProcessor): base(httpClientFactory)
         {
             this.identityProviderProcessor = identityProviderProcessor;
         }
diff --git a/src/ArmTemplates/Common/API/Clients/Loggers/LoggerClient.cs b/src/ArmTemplates/Common/API/Clients/Loggers/LoggerClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class LoggerClient : ApiClientBase, ILoggerClient
     {
         const string GetAllLoggersRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/loggers?api-version={4}";
 
+        public LoggerClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<LoggerTemplateResource>> GetAllAsync(ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/NamedValues/NamedValuesClient.cs b/src/ArmTemplates/Common/API/Clients/NamedValues/NamedValuesClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -16,6 +17,10 @@ public class NamedValuesClient : ApiClientBase, INamedValuesClient
     {
         const string GetNamedValuesRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/namedValues?api-version={4}";
 
+        public NamedValuesClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<List<NamedValueTemplateResource>> GetAllAsync(ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/Policy/PolicyClient.cs b/src/ArmTemplates/Common/API/Clients/Policy/PolicyClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -19,6 +20,10 @@ public class PolicyClient : ApiClientBase, IPolicyClient
         const string GetPolicyLinkedToApiRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/policies?api-version={5}&format=rawxml";
         const string GetPolicyLinkedToApiOperationRequest = "{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/operations/{5}/policies?api-version={6}&format=rawxml";
 
+        public PolicyClient(IHttpClientFactory httpClientFactory) : base(httpClientFactory)
+        {
+        }
+
         public async Task<PolicyTemplateResource> GetGlobalServicePolicyAsync(ExtractorParameters extractorParameters)
         {
             var (azToken, azSubId) = await this.Auth.GetAccessToken();
diff --git a/src/ArmTemplates/Common/API/Clients/Product/ProductsClient.cs b/src/ArmTemplates/Common/API/Clients/Product/ProductsClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -22,7 +23,10 @@ public class ProductsClient : ApiClientBase, IProductsClient
         readonly IProductDataProcessor productDataProcessor;
         readonly IProductApiDataProcessor productApiDataProcessor;
 
-        public ProductsClient(IProductDataProcessor productDataProcessor, IProductApiDataProcessor productApiDataProcessor)
+        public ProductsClient(
+            IHttpClientFactory httpClientFactory,
+            IProductDataProcessor productDataProcessor,
+            IProductApiDataProcessor productApiDataProcessor): base(httpClientFactory)
         {
             this.productDataProcessor = productDataProcessor;
             this.productApiDataProcessor = productApiDataProcessor;
diff --git a/src/ArmTemplates/Common/API/Clients/Tags/TagClient.cs b/src/ArmTemplates/Common/API/Clients/Tags/TagClient.cs
@@ -4,6 +4,7 @@
 // --------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
@@ -21,7 +22,7 @@ public class TagClient : ApiClientBase, ITagClient
 
         readonly IApisClient apisClient;
 
-        public TagClient(IApisClient apisClient)
+        public TagClient(IHttpClientFactory httpClientFactory, IApisClient apisClient): base(httpClientFactory)
         {
             this.apisClient = apisClient;
         }
diff --git a/src/ArmTemplates/Extractor/Utilities/AzureCliAuthenticator.cs b/src/ArmTemplates/Extractor/Utilities/AzureCliAuthenticator.cs
@@ -19,7 +19,7 @@ public class AzureCliAuthenticator
         string internalAzToken;
         string internalAzSubscriptionId;
 
-        public async Task<(string azToken, string azSubscriptionId)> GetAccessToken()
+        public virtual async Task<(string azToken, string azSubscriptionId)> GetAccessToken()
         {
             var tokenTimeout = DateTime.Now;
 
diff --git a/src/ArmTemplates/Extractor/Utilities/DataProcessors/IdentityProviderProcessor.cs b/src/ArmTemplates/Extractor/Utilities/DataProcessors/IdentityProviderProcessor.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Extensions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.IdentityProviders;
-using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Products;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Extractor.Models;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Extractor.Utilities.DataProcessors.Absctraction;
 
diff --git a/src/ArmTemplates/ServiceExtensions.cs b/src/ArmTemplates/ServiceExtensions.cs
@@ -33,6 +33,8 @@
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Extractor.Utilities.DataProcessors.Absctraction;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Extractor.Utilities.DataProcessors;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.IdentityProviders;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Http;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
 {
@@ -50,7 +52,8 @@ public static void AddArmTemplatesServices(this IServiceCollection services, ILo
             });
 
             services.AddScoped<FileReader>();
-
+            services.AddHttpClient();
+            services.RemoveAll<IHttpMessageHandlerBuilderFilter>();
             SetupCommands(services);
             SetupExecutors(services);
             SetupApiClients(services);
diff --git a/tests/ArmTemplates.Tests/Extractor/Scenarios/GroupExtractorTests.cs b/tests/ArmTemplates.Tests/Extractor/Scenarios/GroupExtractorTests.cs
diff --git a/tests/ArmTemplates.Tests/Moqs/ApiClients/MockClientUtils.cs b/tests/ArmTemplates.Tests/Moqs/ApiClients/MockClientUtils.cs
diff --git a/tests/ArmTemplates.Tests/Moqs/ApiClients/MockGroupsClient.cs b/tests/ArmTemplates.Tests/Moqs/ApiClients/MockGroupsClient.cs
diff --git a/tests/ArmTemplates.Tests/Resources/ApiClientJsonResponses/ApiManagementListGroups_success_response.json b/tests/ArmTemplates.Tests/Resources/ApiClientJsonResponses/ApiManagementListGroups_success_response.json

Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,15 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clien`
`19`	`19`	`public abstract class ApiClientBase`
`20`	`20`	`{`
`21`	`21`	`readonly IMemoryCache cache = new MemoryCache(new MemoryCacheOptions());`
`22`		`- readonly HttpClient httpClient = new HttpClient();`
	`22`	`+ readonly HttpClient httpClient;`
`23`	`23`
`24`	`24`	`protected string BaseUrl { get; private set; } = GlobalConstants.BaseManagementAzureUrl;`
`25`	`25`
`26`		`- protected AzureCliAuthenticator Auth { get; private set; } = new AzureCliAuthenticator();`
	`26`	`+ protected virtual AzureCliAuthenticator Auth { get; private set; } = new AzureCliAuthenticator();`
`27`	`27`
`28`		`- public ApiClientBase(string baseUrl = null)`
	`28`	`+ public ApiClientBase(IHttpClientFactory httpClientFactory)`
`29`	`29`	`{`
`30`		`- if (!string.IsNullOrEmpty(baseUrl))`
`31`		`- {`
`32`		`- this.BaseUrl = baseUrl;`
`33`		`- }`
	`30`	`+ this.httpClient = httpClientFactory.CreateClient();`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`protected async Task<string> CallApiManagementAsync(string azToken, string requestUrl, bool useCache = true, ClientHttpMethod method = ClientHttpMethod.GET)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`// --------------------------------------------------------------------------`
`5`	`5`
`6`	`6`	`using System.Collections.Generic;`
	`7`	`+using System.Net.Http;`
`7`	`8`	`using System.Threading.Tasks;`
`8`	`9`	`using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.API.Clients.Abstractions;`
`9`	`10`	`using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;`
`@@ -21,7 +22,7 @@ public class TagClient : ApiClientBase, ITagClient`
`21`	`22`
`22`	`23`	`readonly IApisClient apisClient;`
`23`	`24`
`24`		`- public TagClient(IApisClient apisClient)`
	`25`	`+ public TagClient(IHttpClientFactory httpClientFactory, IApisClient apisClient): base(httpClientFactory)`
`25`	`26`	`{`
`26`	`27`	`this.apisClient = apisClient;`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class AzureCliAuthenticator`
`19`	`19`	`string internalAzToken;`
`20`	`20`	`string internalAzSubscriptionId;`
`21`	`21`
`22`		`- public async Task<(string azToken, string azSubscriptionId)> GetAccessToken()`
	`22`	`+ public virtual async Task<(string azToken, string azSubscriptionId)> GetAccessToken()`
`23`	`23`	`{`
`24`	`24`	`var tokenTimeout = DateTime.Now;`
`25`	`25`