diff --git a/builder/azure/dtl/config.hcl2spec.go b/builder/azure/dtl/config.hcl2spec.go index c410061a2..5033c2414 100644 --- a/builder/azure/dtl/config.hcl2spec.go +++ b/builder/azure/dtl/config.hcl2spec.go @@ -105,6 +105,7 @@ type FlatConfig struct { SSHBastionAgentAuth *bool `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"` SSHBastionUsername *string `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"` SSHBastionPassword *string `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"` + SSHBastionInteractive *bool `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive"` SSHBastionPrivateKeyFile *string `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"` SSHFileTransferMethod *string `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"` SSHProxyHost *string `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"` @@ -208,6 +209,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec { "ssh_bastion_agent_auth": &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false}, "ssh_bastion_username": &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false}, "ssh_bastion_password": &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false}, + "ssh_bastion_interactive": &hcldec.AttrSpec{Name: "ssh_bastion_interactive", Type: cty.Bool, Required: false}, "ssh_bastion_private_key_file": &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false}, "ssh_file_transfer_method": &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false}, "ssh_proxy_host": &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false}, diff --git a/builder/azure/dtl/step_deploy_template.go b/builder/azure/dtl/step_deploy_template.go index b9a394069..0cface5ff 100644 --- a/builder/azure/dtl/step_deploy_template.go +++ b/builder/azure/dtl/step_deploy_template.go @@ -135,10 +135,6 @@ func deleteResource(ctx context.Context, client *AzureClient, resourceType strin err = f.WaitForCompletionRef(ctx, client.VirtualMachinesClient.Client) } return err - case "Microsoft.KeyVault/vaults": - // TODO(paulmey): not sure why VaultClient doesn't do cancellation - _, err := client.VaultClientDelete.Delete(resourceGroupName, resourceName) - return err case "Microsoft.Network/networkInterfaces": f, err := client.InterfacesClient.Delete(ctx, resourceGroupName, resourceName) if err == nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index f962cef80..c9cd41e41 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -17,10 +17,15 @@ github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute/computeapi <<<<<<< HEAD +<<<<<<< HEAD github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault ======= github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl >>>>>>> Updating the module dependencies +======= +github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl +github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault +>>>>>>> Fixing issues due to merge. github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-01-01/network github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources