Merge pull request #10210 from sumit-kalra/master

[builder/azure-arm] Create keyvaults with SoftDelete enabled
5 years ago · 5ea90fea5b
parent efc117fb55 2b69a5f496
commit 5ea90fea5b
3 changed files with 3 additions and 0 deletions
--- a/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json
+++ b/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json
@ -38,6 +38,7 @@
            "tenantId": "[parameters('tenantId')]"
          }
        ],
+        "enableSoftDelete": "true",
        "enabledForDeployment": "true",
        "enabledForTemplateDeployment": "true",
        "sku": {
--- a/builder/azure/common/template/template.go
+++ b/builder/azure/common/template/template.go
@ -85,6 +85,7 @@ type Properties struct {
 	DNSSettings                  *network.PublicIPAddressDNSSettings `json:"dnsSettings,omitempty"`
 	EnabledForDeployment         *string                             `json:"enabledForDeployment,omitempty"`
 	EnabledForTemplateDeployment *string                             `json:"enabledForTemplateDeployment,omitempty"`
+	EnableSoftDelete             *string                             `json:"enableSoftDelete,omitempty"`
 	HardwareProfile              *compute.HardwareProfile            `json:"hardwareProfile,omitempty"`
 	IPConfigurations             *[]network.IPConfiguration          `json:"ipConfigurations,omitempty"`
 	NetworkProfile               *compute.NetworkProfile             `json:"networkProfile,omitempty"`
--- a/builder/azure/common/template/template_builder.go
+++ b/builder/azure/common/template/template_builder.go
@ -554,6 +554,7 @@ const KeyVault = `{
      "properties": {
        "enabledForDeployment": "true",
        "enabledForTemplateDeployment": "true",
+        "enableSoftDelete": "true",
        "tenantId": "[parameters('tenantId')]",
        "accessPolicies": [
          {