iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10210 from sumit-kalra/master 

[builder/azure-arm] Create keyvaults with SoftDelete enabled
This commit is contained in:
Paul Meyer 2020-11-06 14:07:41 -08:00 committed by GitHub
parent efc117fb55 2b69a5f496
commit 5ea90fea5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json
View File

@ -38,6 +38,7 @@
"tenantId": "[parameters('tenantId')]" "tenantId": "[parameters('tenantId')]"
} }
], ],
"enableSoftDelete": "true",
"enabledForDeployment": "true", "enabledForDeployment": "true",
"enabledForTemplateDeployment": "true", "enabledForTemplateDeployment": "true",
"sku": { "sku": {

1
builder/azure/common/template/template.go
View File

@ -85,6 +85,7 @@ type Properties struct {
DNSSettings *network.PublicIPAddressDNSSettings `json:"dnsSettings,omitempty"` DNSSettings *network.PublicIPAddressDNSSettings `json:"dnsSettings,omitempty"`
EnabledForDeployment *string `json:"enabledForDeployment,omitempty"` EnabledForDeployment *string `json:"enabledForDeployment,omitempty"`
EnabledForTemplateDeployment *string `json:"enabledForTemplateDeployment,omitempty"` EnabledForTemplateDeployment *string `json:"enabledForTemplateDeployment,omitempty"`
EnableSoftDelete *string `json:"enableSoftDelete,omitempty"`
HardwareProfile *compute.HardwareProfile `json:"hardwareProfile,omitempty"` HardwareProfile *compute.HardwareProfile `json:"hardwareProfile,omitempty"`
IPConfigurations *[]network.IPConfiguration `json:"ipConfigurations,omitempty"` IPConfigurations *[]network.IPConfiguration `json:"ipConfigurations,omitempty"`
NetworkProfile *compute.NetworkProfile `json:"networkProfile,omitempty"` NetworkProfile *compute.NetworkProfile `json:"networkProfile,omitempty"`

1
builder/azure/common/template/template_builder.go
View File

@ -554,6 +554,7 @@ const KeyVault = `{
"properties": { "properties": {
"enabledForDeployment": "true", "enabledForDeployment": "true",
"enabledForTemplateDeployment": "true", "enabledForTemplateDeployment": "true",
"enableSoftDelete": "true",
"tenantId": "[parameters('tenantId')]", "tenantId": "[parameters('tenantId')]",
"accessPolicies": [ "accessPolicies": [
{ {