Skip to content

adding purge protection vault property #2478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schaabs merged 3 commits into from
Feb 21, 2018
Merged

adding purge protection vault property #2478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e331ee2
adding purge protection vault property
Feb 12, 2018
3627cad
Expanding the description of the soft delete and purge protection pro…
Feb 13, 2018
cc21704
relocating the newly introduced property to the end of the schema
Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ource-manager/Microsoft.KeyVault/stable/2016-10-01/examples/listVaultByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"enabledForDeployment":true,
"enabledForDiskEncryption":true,
"enabledForTemplateDeployment":true,
"enableSoftDelete":true,
"vaultUri":"https://sample-vault.vault.azure.net/"
}
}
Expand Down
1 change: 1 addition & 0 deletions ...source-manager/Microsoft.KeyVault/stable/2016-10-01/examples/listVaultBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"enabledForDiskEncryption":true,
"enabledForTemplateDeployment":true,
"enableSoftDelete":true,
"enablePurgeProtection":true,
"vaultUri":"https://sample-vault.vault.azure.net/"
}
}
Expand Down
12 changes: 10 additions & 2 deletions specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2016-10-01/keyvault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@
},
"enableSoftDelete": {
"type": "boolean",
"description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. It does not accept false value."
"description": "Property specifying whether recoverable deletion is enabled for this key vault. Setting this property to true activates the soft delete feature, whereby vaults or vault entities can be recovered after deletion. Enabling this functionality is irreversible - that is, the property does not accept false as its value."
},
"createMode": {
"type": "string",
Expand All @@ -882,6 +882,10 @@
"name": "CreateMode",
"modelAsString": false
}
},
"enablePurgeProtection": {
"type": "boolean",
"description": "Property specifying whether protection against purge is enabled for this vault. Setting this property to true activates protection against purge for this vault and its content - only the Key Vault service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible - that is, the property does not accept false as its value."
}
},
"required": [
Expand Down Expand Up @@ -922,7 +926,7 @@
},
"enableSoftDelete": {
"type": "boolean",
"description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. It does not accept false value."
"description": "Property specifying whether recoverable deletion ('soft' delete) is enabled for this key vault. The property may not be set to false."
},
"createMode": {
"type": "string",
Expand All @@ -935,6 +939,10 @@
"name": "CreateMode",
"modelAsString": false
}
},
"enablePurgeProtection": {
"type": "boolean",
"description": "Property specifying whether protection against purge is enabled for this vault; it is only effective if soft delete is also enabled. Once activated, the property may no longer be reset to false."
}
},
"description": "Properties of the vault"
Expand Down