Merge pull request Azure#6065 from maddieclayton/constructor

Maddie Clayton · web-flow · commit e32b14355dcc · 2018-05-02T21:43:09.000-07:00
Fix GetCustomArmClient
diff --git a/src/Common/Commands.Common.Authentication/Factories/ClientFactory.cs b/src/Common/Commands.Common.Authentication/Factories/ClientFactory.cs
@@ -73,19 +73,33 @@ public virtual TClient CreateArmClient<TClient>(IAzureContext context, string en
         public virtual TClient CreateCustomArmClient<TClient>(params object[] parameters) where TClient : Microsoft.Rest.ServiceClient<TClient>
         {
             List<Type> types = new List<Type>();
+            var containsDelegatingHandler = false;
             foreach (object obj in parameters)
             {
+                if (obj.GetType().Name.Equals("DelegatingHandler[]"))
+                {
+                    containsDelegatingHandler = true;
+                }
                 types.Add(obj.GetType());
             }
 
+            var copiedParameters = parameters;
+            if (!containsDelegatingHandler)
+            {
+                types.Add((new DelegatingHandler[0]).GetType());
+                var parameterList = copiedParameters.ToList();
+                parameterList.Add(new DelegatingHandler[0]);
+                copiedParameters = parameterList.ToArray();
+            }
+
             var constructor = typeof(TClient).GetConstructor(types.ToArray());
 
             if (constructor == null)
             {
                 throw new InvalidOperationException(string.Format(Resources.InvalidManagementClientType, typeof(TClient).Name));
             }
 
-            TClient client = (TClient)constructor.Invoke(parameters);
+            TClient client = (TClient)constructor.Invoke(copiedParameters);
 
             foreach (ProductInfoHeaderValue userAgent in _userAgents.Keys)
             {
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/LocationCompleter.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/LocationCompleter.cs
@@ -49,12 +49,7 @@ protected static IDictionary<string, ICollection<string>> ResourceTypeLocationDi
                     {
                         try
                         {
-                            var instance = AzureSession.Instance;
-                            IResourceManagementClient client = instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(
-                                context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
-                                instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager),
-                                instance.ClientFactory.GetCustomHandlers());
-                            client.SubscriptionId = context.Subscription.Id;
+                            IResourceManagementClient client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
                             var allProviders = client.Providers.ListAsync();
                             if (allProviders.Wait(TimeSpan.FromSeconds(_timeout)))
                             {
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ResourceGroupCompleter.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ResourceGroupCompleter.cs
@@ -48,12 +48,7 @@ protected static IList<String> ResourceGroupNames
                         var tempResourceGroupList = new List<string>();
                         try
                         {
-                            var instance = AzureSession.Instance;
-                            var client = instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(
-                                context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
-                                instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager),
-                                instance.ClientFactory.GetCustomHandlers());
-                            client.SubscriptionId = context.Subscription.Id;
+                            var client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
                             // Retrieve only the first page of ResourceGroups to display to the user
                             var resourceGroups = client.ResourceGroups.ListAsync();
                             if (resourceGroups.Wait(TimeSpan.FromSeconds(_timeout)))
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ResourceTypeCompleter.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ResourceTypeCompleter.cs
@@ -48,12 +48,7 @@ protected static IList<String> ResourceTypes
                         var tempResourceTypeList = new List<string>();
                         try
                         {
-                            var instance = AzureSession.Instance;
-                            var client = instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(
-                                context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
-                                instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager),
-                                instance.ClientFactory.GetCustomHandlers());
-                            client.SubscriptionId = context.Subscription.Id;
+                            var client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
                             var resourceTypes = new List<Provider>();
                             var task = client.Providers.ListAsync();
                             if (task.Wait(TimeSpan.FromSeconds(_timeout)))
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ScopeCompleter.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/ArgumentCompleters/ScopeCompleter.cs
@@ -45,12 +45,7 @@ protected static IList<String> Scopes
                         var tempScopeList = new List<string>();
                         try
                         {
-                            var instance = AzureSession.Instance;
-                            var client = instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(
-                                context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
-                                instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager),
-                                instance.ClientFactory.GetCustomHandlers());
-                            client.SubscriptionId = context.Subscription.Id;
+                            var client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
                             // Retrieve only the first page of ResourceGroups to use for scopes
                             var resourceGroups = client.ResourceGroups.ListAsync();
                             if (resourceGroups.Wait(TimeSpan.FromSeconds(_timeout)))

Original file line number	Diff line number	Diff line change
`@@ -73,19 +73,33 @@ public virtual TClient CreateArmClient<TClient>(IAzureContext context, string en`
`73`	`73`	`public virtual TClient CreateCustomArmClient<TClient>(params object[] parameters) where TClient : Microsoft.Rest.ServiceClient<TClient>`
`74`	`74`	`{`
`75`	`75`	`List<Type> types = new List<Type>();`
	`76`	`+ var containsDelegatingHandler = false;`
`76`	`77`	`foreach (object obj in parameters)`
`77`	`78`	`{`
	`79`	`+ if (obj.GetType().Name.Equals("DelegatingHandler[]"))`
	`80`	`+ {`
	`81`	`+ containsDelegatingHandler = true;`
	`82`	`+ }`
`78`	`83`	`types.Add(obj.GetType());`
`79`	`84`	`}`
`80`	`85`
	`86`	`+ var copiedParameters = parameters;`
	`87`	`+ if (!containsDelegatingHandler)`
	`88`	`+ {`
	`89`	`+ types.Add((new DelegatingHandler[0]).GetType());`
	`90`	`+ var parameterList = copiedParameters.ToList();`
	`91`	`+ parameterList.Add(new DelegatingHandler[0]);`
	`92`	`+ copiedParameters = parameterList.ToArray();`
	`93`	`+ }`
	`94`	`+`
`81`	`95`	`var constructor = typeof(TClient).GetConstructor(types.ToArray());`
`82`	`96`
`83`	`97`	`if (constructor == null)`
`84`	`98`	`{`
`85`	`99`	`throw new InvalidOperationException(string.Format(Resources.InvalidManagementClientType, typeof(TClient).Name));`
`86`	`100`	`}`
`87`	`101`
`88`		`- TClient client = (TClient)constructor.Invoke(parameters);`
	`102`	`+ TClient client = (TClient)constructor.Invoke(copiedParameters);`
`89`	`103`
`90`	`104`	`foreach (ProductInfoHeaderValue userAgent in _userAgents.Keys)`
`91`	`105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,7 @@ protected static IDictionary<string, ICollection<string>> ResourceTypeLocationDi`
`49`	`49`	`{`
`50`	`50`	`try`
`51`	`51`	`{`
`52`		`- var instance = AzureSession.Instance;`
`53`		`- IResourceManagementClient client = instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(`
`54`		`- context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),`
`55`		`- instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager),`
`56`		`- instance.ClientFactory.GetCustomHandlers());`
`57`		`- client.SubscriptionId = context.Subscription.Id;`
	`52`	`+ IResourceManagementClient client = AzureSession.Instance.ClientFactory.CreateArmClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);`
`58`	`53`	`var allProviders = client.Providers.ListAsync();`
`59`	`54`	`if (allProviders.Wait(TimeSpan.FromSeconds(_timeout)))`
`60`	`55`	`{`