Skip to content

Added SoftDeleteRetentionInDays, CustomizedRecoverable and recoverabl… #8223

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
allenjzhang merged 3 commits into from
Jan 25, 2020
Merged

Added SoftDeleteRetentionInDays, CustomizedRecoverable and recoverabl… #8223

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
85d2c87
Added SoftDeleteRetentionInDays, CustomizedRecoverable and recoverabl…
Jan 23, 2020
5f2b7b3
RP revision
Jan 23, 2020
1ae49df
Set "default": true for enableSoftDelete when put
Jan 24, 2020
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
55 changes: 50 additions & 5 deletions specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.1/keyvault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3872,14 +3872,23 @@
}
],
"properties": {
"recoverableDays": {
"type": "integer",
"format": "int32",
"readOnly": true,
"description": "softDelete data retention days. Value should be >=7 and <=90 when softDelete enabled, otherwise 0."
},
"recoveryLevel": {
"type": "string",
"description": "Reflects the deletion recovery level currently in effect for keys in the current vault. If it contains 'Purgeable' the key can be permanently deleted by a privileged user; otherwise, only the system can purge the key, at the end of the retention interval.",
"enum": [
"Purgeable",
"Recoverable+Purgeable",
"Recoverable",
"Recoverable+ProtectedSubscription"
"Recoverable+ProtectedSubscription",
"CustomizedRecoverable+Purgeable",
"CustomizedRecoverable",
"CustomizedRecoverable+ProtectedSubscription"
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
Expand Down Expand Up @@ -4119,14 +4128,23 @@
}
],
"properties": {
"recoverableDays": {
"type": "integer",
"format": "int32",
"readOnly": true,
"description": "softDelete data retention days. Value should be >=7 and <=90 when softDelete enabled, otherwise 0."
},
"recoveryLevel": {
"type": "string",
"description": "Reflects the deletion recovery level currently in effect for secrets in the current vault. If it contains 'Purgeable', the secret can be permanently deleted by a privileged user; otherwise, only the system can purge the secret, at the end of the retention interval.",
"enum": [
"Purgeable",
"Recoverable+Purgeable",
"Recoverable",
"Recoverable+ProtectedSubscription"
"Recoverable+ProtectedSubscription",
"CustomizedRecoverable+Purgeable",
"CustomizedRecoverable",
"CustomizedRecoverable+ProtectedSubscription"
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
Expand Down Expand Up @@ -4173,14 +4191,23 @@
}
],
"properties": {
"recoverableDays": {
"type": "integer",
"format": "int32",
"readOnly": true,
"description": "softDelete data retention days. Value should be >=7 and <=90 when softDelete enabled, otherwise 0."
},
"recoveryLevel": {
"type": "string",
"description": "Reflects the deletion recovery level currently in effect for certificates in the current vault. If it contains 'Purgeable', the certificate can be permanently deleted by a privileged user; otherwise, only the system can purge the certificate, at the end of the retention interval.",
"enum": [
"Purgeable",
"Recoverable+Purgeable",
"Recoverable",
"Recoverable+ProtectedSubscription"
"Recoverable+ProtectedSubscription",
"CustomizedRecoverable+Purgeable",
"CustomizedRecoverable",
"CustomizedRecoverable+ProtectedSubscription"
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
Expand Down Expand Up @@ -5490,14 +5517,23 @@
"readOnly": true,
"description": "Last updated time in UTC."
},
"recoverableDays": {
"type": "integer",
"format": "int32",
"readOnly": true,
"description": "softDelete data retention days. Value should be >=7 and <=90 when softDelete enabled, otherwise 0."
},
"recoveryLevel": {
"type": "string",
"description": "Reflects the deletion recovery level currently in effect for storage accounts in the current vault. If it contains 'Purgeable' the storage account can be permanently deleted by a privileged user; otherwise, only the system can purge the storage account, at the end of the retention interval.",
"enum": [
"Purgeable",
"Recoverable+Purgeable",
"Recoverable",
"Recoverable+ProtectedSubscription"
"Recoverable+ProtectedSubscription",
"CustomizedRecoverable+Purgeable",
"CustomizedRecoverable",
"CustomizedRecoverable+ProtectedSubscription"
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
Expand Down Expand Up @@ -5765,14 +5801,23 @@
"readOnly": true,
"description": "Last updated time in UTC."
},
"recoverableDays": {
"type": "integer",
"format": "int32",
"readOnly": true,
"description": "softDelete data retention days. Value should be >=7 and <=90 when softDelete enabled, otherwise 0."
},
"recoveryLevel": {
"type": "string",
"description": "Reflects the deletion recovery level currently in effect for SAS definitions in the current vault. If it contains 'Purgeable' the SAS definition can be permanently deleted by a privileged user; otherwise, only the system can purge the SAS definition, at the end of the retention interval.",
"enum": [
"Purgeable",
"Recoverable+Purgeable",
"Recoverable",
"Recoverable+ProtectedSubscription"
"Recoverable+ProtectedSubscription",
"CustomizedRecoverable+Purgeable",
"CustomizedRecoverable",
"CustomizedRecoverable+ProtectedSubscription"
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
Expand Down
17 changes: 17 additions & 0 deletions ...ce-manager/Microsoft.KeyVault/preview/2020-01-23/examples/checkVaultNameAvailability.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"api-version": "2020-01-23",
"vaultName": {
"name": "sample-vault",
"type": "Microsoft.KeyVault/vaults"
}
},
"responses": {
"200": {
"body": {
"nameAvailable": true
}
}
}
}
50 changes: 50 additions & 0 deletions ...eyvault/resource-manager/Microsoft.KeyVault/preview/2020-01-23/examples/createSecret.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"parameters": {
"resourceGroupName": "sample-group",
"vaultName": "sample-vault",
"secretName": "secret-name",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"api-version": "2020-01-23",
"parameters": {
"properties": {
"value": "secret-value"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.KeyVault/vaults/sample-vault/secrets/secret-name",
"name": "secret-name",
"type": "Microsoft.KeyVault/vaults/secrets",
"location": "westus",
"properties": {
"attributes": {
"enabled": true,
"created": 1514938738,
"updated": 1514938738
},
"secretUri": "https://sample-vault.vault.azure.net/secrets/secret-name",
"secretUriWithVersion": "https:/sample-vault.vault.azure.net/secrets/secret-name/baf6de32c4774c7c81345f6476cf90a4"
}
}
},
"201": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.KeyVault/vaults/sample-vault/secrets/secret-name",
"name": "secret-name",
"type": "Microsoft.KeyVault/vaults/secrets",
"location": "westus",
"properties": {
"attributes": {
"enabled": true,
"created": 1514938738,
"updated": 1514938738
},
"secretUri": "https://sample-vault.vault.azure.net/secrets/secret-name",
"secretUriWithVersion": "https:/sample-vault.vault.azure.net/secrets/secret-name/baf6de32c4774c7c81345f6476cf90a4"
}
}
}
}
}
Loading