Skip to content
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

Update DeletionRecovery Level #9895

Merged
merged 13 commits into from
Jun 23, 2020
Merged

Update DeletionRecovery Level #9895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7739fcc
Merge pull request #1 from Azure/master
jlichwa Nov 12, 2019
83c4922
Update description for certificate type
jlichwa Nov 12, 2019
3093d69
update description for certificate type
jlichwa Nov 12, 2019
4a25078
Revert "update description for certificate type"
jlichwa Nov 12, 2019
707d797
Revert "Update description for certificate type"
jlichwa Nov 12, 2019
c4ae393
Update description for certificate type
jlichwa Nov 12, 2019
832cf0f
Update
jlichwa Nov 12, 2019
e7e5936
Update DeletionRecoveryLevel
jlichwa Jun 19, 2020
a0159ac
Update keyvault.json
jlichwa Jun 19, 2020
bcd8f83
Update RecoveryLevel
jlichwa Jun 19, 2020
8fb813a
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
jlichwa Jun 19, 2020
c2ffc1c
Update Recovery Level description
jlichwa Jun 19, 2020
b6f52e2
Update Deletion Recovery Level
jlichwa Jun 19, 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
32 changes: 31 additions & 1 deletion specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.1/certificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,37 @@
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
"modelAsString": true
"modelAsString": true,
"values": [
{
"value": "Purgeable",
"description": "Denotes a vault state in which deletion is an irreversible operation, without the possibility for recovery. This level corresponds to no protection being available against a Delete operation; the data is irretrievably lost upon accepting a Delete operation at the entity level or higher (vault, resource group, subscription etc.)"
},
{
"value": "Recoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval (90 days), unless a Purge operation is requested, or the subscription is cancelled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval(90 days) and while the subscription is still available. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable within retention interval (90 days), immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "CustomizedRecoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90). This level guarantees the recoverability of the deleted entity during the retention interval, unless a Purge operation is requested, or the subscription is cancelled."
},
{
"value": "CustomizedRecoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90).This level guarantees the recoverability of the deleted entity during the retention interval and while the subscription is still available."
},
{
"value": "CustomizedRecoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable, immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled when 7<= SoftDeleteRetentionInDays < 90. This level guarantees the recoverability of the deleted entity during the retention interval, and also reflects the fact that the subscription itself cannot be cancelled."
}
]
},
"readOnly": true,
"x-nullable": false
Expand Down
32 changes: 31 additions & 1 deletion specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.1/keys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,37 @@
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
"modelAsString": true
"modelAsString": true,
"values": [
{
"value": "Purgeable",
"description": "Denotes a vault state in which deletion is an irreversible operation, without the possibility for recovery. This level corresponds to no protection being available against a Delete operation; the data is irretrievably lost upon accepting a Delete operation at the entity level or higher (vault, resource group, subscription etc.)"
},
{
"value": "Recoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval (90 days), unless a Purge operation is requested, or the subscription is cancelled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval(90 days) and while the subscription is still available. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable within retention interval (90 days), immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "CustomizedRecoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90). This level guarantees the recoverability of the deleted entity during the retention interval, unless a Purge operation is requested, or the subscription is cancelled."
},
{
"value": "CustomizedRecoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90).This level guarantees the recoverability of the deleted entity during the retention interval and while the subscription is still available."
},
{
"value": "CustomizedRecoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable, immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled when 7<= SoftDeleteRetentionInDays < 90. This level guarantees the recoverability of the deleted entity during the retention interval, and also reflects the fact that the subscription itself cannot be cancelled."
}
]
},
"readOnly": true,
"x-nullable": false
Expand Down
32 changes: 31 additions & 1 deletion specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.1/secrets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,37 @@
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
"modelAsString": true
"modelAsString": true,
"values": [
{
"value": "Purgeable",
"description": "Denotes a vault state in which deletion is an irreversible operation, without the possibility for recovery. This level corresponds to no protection being available against a Delete operation; the data is irretrievably lost upon accepting a Delete operation at the entity level or higher (vault, resource group, subscription etc.)"
},
{
"value": "Recoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval (90 days), unless a Purge operation is requested, or the subscription is cancelled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval(90 days) and while the subscription is still available. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable within retention interval (90 days), immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "CustomizedRecoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90). This level guarantees the recoverability of the deleted entity during the retention interval, unless a Purge operation is requested, or the subscription is cancelled."
},
{
"value": "CustomizedRecoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90).This level guarantees the recoverability of the deleted entity during the retention interval and while the subscription is still available."
},
{
"value": "CustomizedRecoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable, immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled when 7<= SoftDeleteRetentionInDays < 90. This level guarantees the recoverability of the deleted entity during the retention interval, and also reflects the fact that the subscription itself cannot be cancelled."
}
]
},
"readOnly": true,
"x-nullable": false
Expand Down
32 changes: 31 additions & 1 deletion specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.1/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,37 @@
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
"modelAsString": true
"modelAsString": true,
"values": [
{
"value": "Purgeable",
"description": "Denotes a vault state in which deletion is an irreversible operation, without the possibility for recovery. This level corresponds to no protection being available against a Delete operation; the data is irretrievably lost upon accepting a Delete operation at the entity level or higher (vault, resource group, subscription etc.)"
},
{
"value": "Recoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval (90 days), unless a Purge operation is requested, or the subscription is cancelled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval(90 days) and while the subscription is still available. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable within retention interval (90 days), immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "CustomizedRecoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90). This level guarantees the recoverability of the deleted entity during the retention interval, unless a Purge operation is requested, or the subscription is cancelled."
},
{
"value": "CustomizedRecoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90).This level guarantees the recoverability of the deleted entity during the retention interval and while the subscription is still available."
},
{
"value": "CustomizedRecoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable, immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled when 7<= SoftDeleteRetentionInDays < 90. This level guarantees the recoverability of the deleted entity during the retention interval, and also reflects the fact that the subscription itself cannot be cancelled."
}
]
},
"readOnly": true,
"x-nullable": false
Expand Down
32 changes: 31 additions & 1 deletion specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/certificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,37 @@
],
"x-ms-enum": {
"name": "DeletionRecoveryLevel",
"modelAsString": true
"modelAsString": true,
"values": [
{
"value": "Purgeable",
"description": "Denotes a vault state in which deletion is an irreversible operation, without the possibility for recovery. This level corresponds to no protection being available against a Delete operation; the data is irretrievably lost upon accepting a Delete operation at the entity level or higher (vault, resource group, subscription etc.)"
},
{
"value": "Recoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval (90 days), unless a Purge operation is requested, or the subscription is cancelled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge). This level guarantees the recoverability of the deleted entity during the retention interval(90 days) and while the subscription is still available. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "Recoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable within retention interval (90 days), immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled. System wil permanently delete it after 90 days, if not recovered"
},
{
"value": "CustomizedRecoverable+Purgeable",
"description": "Denotes a vault state in which deletion is recoverable, and which also permits immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90). This level guarantees the recoverability of the deleted entity during the retention interval, unless a Purge operation is requested, or the subscription is cancelled."
},
{
"value": "CustomizedRecoverable",
"description": "Denotes a vault state in which deletion is recoverable without the possibility for immediate and permanent deletion (i.e. purge when 7<= SoftDeleteRetentionInDays < 90).This level guarantees the recoverability of the deleted entity during the retention interval and while the subscription is still available."
},
{
"value": "CustomizedRecoverable+ProtectedSubscription",
"description": "Denotes a vault and subscription state in which deletion is recoverable, immediate and permanent deletion (i.e. purge) is not permitted, and in which the subscription itself cannot be permanently canceled when 7<= SoftDeleteRetentionInDays < 90. This level guarantees the recoverability of the deleted entity during the retention interval, and also reflects the fact that the subscription itself cannot be cancelled."
}
]
},
"readOnly": true,
"x-nullable": false
Expand Down
Loading