updates
This commit is contained in:
parent
1f46271a6b
commit
df5cc234fc
|
@ -122,7 +122,7 @@ func byConcatDecorators(decorators ...autorest.RespondDecorator) autorest.Respon
|
|||
}
|
||||
|
||||
func NewAzureClient(subscriptionID, resourceGroupName, storageAccountName string,
|
||||
cloud *azure.Environment, tenantID string, isDeviceLogin bool,
|
||||
cloud *azure.Environment,
|
||||
servicePrincipalToken, servicePrincipalTokenVault *adal.ServicePrincipalToken) (*AzureClient, error) {
|
||||
|
||||
var azureClient = &AzureClient{}
|
||||
|
|
|
@ -83,8 +83,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
|
|||
b.config.ResourceGroupName,
|
||||
b.config.StorageAccount,
|
||||
b.config.cloudEnvironment,
|
||||
b.config.TenantID,
|
||||
b.config.useDeviceLogin,
|
||||
spnCloud,
|
||||
spnKeyVault)
|
||||
if err != nil {
|
||||
|
|
|
@ -203,7 +203,7 @@ func validateToken(env string, token *adal.ServicePrincipalToken) error {
|
|||
err := token.EnsureFresh()
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s token validity check failed: %v", env,err)
|
||||
return fmt.Errorf("%s token validity check failed: %v", env, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -67,7 +67,7 @@ var (
|
|||
ResourceManagerEndpoint: "https://management.azure.com/",
|
||||
ActiveDirectoryEndpoint: "https://login.microsoftonline.com/",
|
||||
GalleryEndpoint: "https://gallery.azure.com/",
|
||||
KeyVaultEndpoint: "https://vault.azure.net",
|
||||
KeyVaultEndpoint: "https://vault.azure.net/",
|
||||
GraphEndpoint: "https://graph.windows.net/",
|
||||
ServiceBusEndpoint: "https://servicebus.windows.net/",
|
||||
BatchManagementEndpoint: "https://batch.core.windows.net/",
|
||||
|
|
Loading…
Reference in New Issue