Use WithBaseURI

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 {

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
 }