From 2b69a5f496441df33119e33c516fcddad1b42c6a Mon Sep 17 00:00:00 2001 From: Sumit Kalra Date: Mon, 2 Nov 2020 20:42:55 -0800 Subject: [PATCH] azure-arm builder: Create keyvaults with SoftDelete enabled --- .../template_factory_test.TestKeyVaultDeployment03.approved.json | 1 + builder/azure/common/template/template.go | 1 + builder/azure/common/template/template_builder.go | 1 + 3 files changed, 3 insertions(+) diff --git a/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json b/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json index 44c9e68e4..c4f85c6a8 100644 --- 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": { diff --git a/builder/azure/common/template/template.go b/builder/azure/common/template/template.go index 32fa39917..2366b7a24 100644 --- 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"` diff --git a/builder/azure/common/template/template_builder.go b/builder/azure/common/template/template_builder.go index d4248d04b..cdb9f92d1 100644 --- 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": [ {