From 6e9ef1c6eb24cdf8cd6358c53b94c266a757f428 Mon Sep 17 00:00:00 2001 From: Christopher Boumenot Date: Wed, 20 Jul 2016 11:23:51 -0700 Subject: [PATCH] Use WithBaseURI --- builder/azure/arm/azure_client.go | 15 +++++---------- builder/azure/common/devicelogin.go | 9 +-------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/builder/azure/arm/azure_client.go b/builder/azure/arm/azure_client.go index 546bf9fb1..2f6e1e39a 100644 --- a/builder/azure/arm/azure_client.go +++ b/builder/azure/arm/azure_client.go @@ -110,40 +110,35 @@ func NewAzureClient(subscriptionID, resourceGroupName, storageAccountName string maxlen := getInspectorMaxLength() - azureClient.DeploymentsClient = resources.NewDeploymentsClient(subscriptionID) + azureClient.DeploymentsClient = resources.NewDeploymentsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.DeploymentsClient.Authorizer = servicePrincipalToken azureClient.DeploymentsClient.RequestInspector = withInspection(maxlen) azureClient.DeploymentsClient.ResponseInspector = byInspecting(maxlen) azureClient.DeploymentsClient.UserAgent += packerUserAgent - azureClient.DeploymentsClient.BaseURI = cloud.ResourceManagerEndpoint - azureClient.GroupsClient = resources.NewGroupsClient(subscriptionID) + azureClient.GroupsClient = resources.NewGroupsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.GroupsClient.Authorizer = servicePrincipalToken azureClient.GroupsClient.RequestInspector = withInspection(maxlen) azureClient.GroupsClient.ResponseInspector = byInspecting(maxlen) azureClient.GroupsClient.UserAgent += packerUserAgent - azureClient.GroupsClient.BaseURI = cloud.ResourceManagerEndpoint - azureClient.PublicIPAddressesClient = network.NewPublicIPAddressesClient(subscriptionID) + azureClient.PublicIPAddressesClient = network.NewPublicIPAddressesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.PublicIPAddressesClient.Authorizer = servicePrincipalToken azureClient.PublicIPAddressesClient.RequestInspector = withInspection(maxlen) azureClient.PublicIPAddressesClient.ResponseInspector = byInspecting(maxlen) azureClient.PublicIPAddressesClient.UserAgent += packerUserAgent - azureClient.PublicIPAddressesClient.BaseURI = cloud.ResourceManagerEndpoint - azureClient.VirtualMachinesClient = compute.NewVirtualMachinesClient(subscriptionID) + azureClient.VirtualMachinesClient = compute.NewVirtualMachinesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.VirtualMachinesClient.Authorizer = servicePrincipalToken azureClient.VirtualMachinesClient.RequestInspector = withInspection(maxlen) azureClient.VirtualMachinesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient)) azureClient.VirtualMachinesClient.UserAgent += packerUserAgent - azureClient.VirtualMachinesClient.BaseURI = cloud.ResourceManagerEndpoint - azureClient.AccountsClient = armStorage.NewAccountsClient(subscriptionID) + azureClient.AccountsClient = armStorage.NewAccountsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID) azureClient.AccountsClient.Authorizer = servicePrincipalToken azureClient.AccountsClient.RequestInspector = withInspection(maxlen) azureClient.AccountsClient.ResponseInspector = byInspecting(maxlen) azureClient.AccountsClient.UserAgent += packerUserAgent - azureClient.AccountsClient.BaseURI = cloud.ResourceManagerEndpoint keyVaultURL, err := url.Parse(cloud.KeyVaultEndpoint) if err != nil { diff --git a/builder/azure/common/devicelogin.go b/builder/azure/common/devicelogin.go index 700b2b4f8..d10eb9de5 100644 --- a/builder/azure/common/devicelogin.go +++ b/builder/azure/common/devicelogin.go @@ -231,13 +231,6 @@ func FindTenantID(env azure.Environment, subscriptionID string) (string, error) } func subscriptionsClient(baseURI string) subscriptions.Client { - client := subscriptions.Client{ - subscriptions.ManagementClient{ - Client: autorest.NewClientWithUserAgent(subscriptions.UserAgent() + userAgent), - BaseURI: baseURI, - APIVersion: subscriptions.APIVersion, - }, - } - + client := subscriptions.NewClientWithBaseURI(baseURI) return client }