-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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.
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
[Storage CMK Key Vault Key Auto Rotation] Add read-only properties for current versioned key in use and last rotation timestamp. #8585
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0ca637c
[Storage CMK Key Vault Key Auto Rotation] Add read-only properties fo…
tonykjose 0370907
Include example for storage account Customer Managed Keys enable.
tonykjose 7427416
Add more examples and fix avocado checks.
tonykjose 6647d5d
Fix model validation failures.
tonykjose File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
94 changes: 94 additions & 0 deletions
94
...esource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountEnableCMK.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "res9407", | ||
| "accountName": "sto8596", | ||
| "api-version": "2019-06-01", | ||
| "monitor": "true", | ||
| "parameters": { | ||
| "properties": { | ||
| "encryption": { | ||
| "services": { | ||
| "file": { | ||
| "keyType": "Account", | ||
| "enabled": true | ||
| }, | ||
| "blob": { | ||
| "keyType": "Account", | ||
| "enabled": true | ||
| } | ||
| }, | ||
| "keySource": "Microsoft.Keyvault", | ||
| "keyvaultproperties": { | ||
| "keyvaulturi": "https://myvault8569.vault.azure.net", | ||
| "keyname": "wrappingKey", | ||
| "keyversion": "" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/subscriptions/{subscription-id}/resourceGroups/res9407/providers/Microsoft.Storage/storageAccounts/sto8596", | ||
| "identity": { | ||
| "principalId": "911871cc-ffd1-4fc4-ac11-7a316433ea66", | ||
| "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", | ||
| "type": "SystemAssigned" | ||
| }, | ||
| "kind": "Storage", | ||
| "location": "eastus2(stage)", | ||
| "name": "sto8596", | ||
| "properties": { | ||
| "creationTime": "2017-06-01T02:42:41.7633306Z", | ||
| "encryption": { | ||
| "services": { | ||
| "file": { | ||
| "keyType": "Account", | ||
| "enabled": true, | ||
| "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" | ||
| }, | ||
| "blob": { | ||
| "keyType": "Account", | ||
| "enabled": true, | ||
| "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" | ||
| } | ||
| }, | ||
| "keySource": "Microsoft.Keyvault", | ||
| "keyvaultproperties": { | ||
| "keyvaulturi": "https://myvault8569.vault.azure.net", | ||
| "keyname": "wrappingKey", | ||
| "keyversion": "", | ||
| "currentVersionedKeyIdentifier": "https://myvault8569.vault.azure.net/keys/wrappingKey/0682afdd9c104f4285df20107e956cad", | ||
| "lastKeyRotationTimestamp": "2019-12-13T20:36:23.7023290Z" | ||
| } | ||
| }, | ||
| "primaryEndpoints": { | ||
| "web": "https://sto8596.web.core.windows.net/", | ||
| "dfs": "https://sto8596.dfs.core.windows.net/", | ||
| "blob": "https://sto8596.blob.core.windows.net/", | ||
| "file": "https://sto8596.file.core.windows.net/", | ||
| "queue": "https://sto8596.queue.core.windows.net/", | ||
| "table": "https://sto8596.table.core.windows.net/" | ||
| }, | ||
| "primaryLocation": "eastus2(stage)", | ||
| "provisioningState": "Succeeded", | ||
| "secondaryLocation": "northcentralus(stage)", | ||
| "statusOfPrimary": "available", | ||
| "statusOfSecondary": "available", | ||
| "supportsHttpsTrafficOnly": false | ||
| }, | ||
| "sku": { | ||
| "name": "Standard_GRS", | ||
| "tier": "Standard" | ||
| }, | ||
| "tags": { | ||
| "key1": "value1", | ||
| "key2": "value2" | ||
| }, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| } | ||
| } | ||
| } |
103 changes: 103 additions & 0 deletions
103
...r/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountGetPropertiesCMKEnabled.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "res9407", | ||
| "accountName": "sto8596", | ||
| "api-version": "2019-06-01", | ||
| "monitor": "true" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/subscriptions/{subscription-id}/resourceGroups/res9407/providers/Microsoft.Storage/storageAccounts/sto8596", | ||
| "identity": { | ||
| "principalId": "911871cc-ffd1-4fc4-ac11-7a316433ea66", | ||
| "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", | ||
| "type": "SystemAssigned" | ||
| }, | ||
| "kind": "Storage", | ||
| "location": "eastus2(stage)", | ||
| "name": "sto8596", | ||
| "properties": { | ||
| "geoReplicationStats": { | ||
| "status": "Live", | ||
| "lastSyncTime": "2018-10-30T00:25:34Z", | ||
| "canFailover": true | ||
| }, | ||
| "isHnsEnabled": true, | ||
| "creationTime": "2017-06-01T02:42:41.7633306Z", | ||
| "networkAcls": { | ||
| "bypass": "AzureServices", | ||
| "defaultAction": "Allow", | ||
| "ipRules": [], | ||
| "virtualNetworkRules": [] | ||
| }, | ||
| "primaryEndpoints": { | ||
| "web": "https://sto8596.web.core.windows.net/", | ||
| "dfs": "https://sto8596.dfs.core.windows.net/", | ||
| "blob": "https://sto8596.blob.core.windows.net/", | ||
| "file": "https://sto8596.file.core.windows.net/", | ||
| "queue": "https://sto8596.queue.core.windows.net/", | ||
| "table": "https://sto8596.table.core.windows.net/", | ||
| "microsoftEndpoints": { | ||
| "web": "https://sto8596-microsoftrouting.web.core.windows.net/", | ||
| "dfs": "https://sto8596-microsoftrouting.dfs.core.windows.net/", | ||
| "blob": "https://sto8596-microsoftrouting.blob.core.windows.net/", | ||
| "file": "https://sto8596-microsoftrouting.file.core.windows.net/", | ||
| "queue": "https://sto8596-microsoftrouting.queue.core.windows.net/", | ||
| "table": "https://sto8596-microsoftrouting.table.core.windows.net/" | ||
| }, | ||
| "internetEndpoints": { | ||
| "web": "https://sto8596-internetrouting.web.core.windows.net/", | ||
| "dfs": "https://sto8596-internetrouting.dfs.core.windows.net/", | ||
| "blob": "https://sto8596-internetrouting.blob.core.windows.net/", | ||
| "file": "https://sto8596-internetrouting.file.core.windows.net/" | ||
| } | ||
| }, | ||
| "primaryLocation": "eastus2(stage)", | ||
| "provisioningState": "Succeeded", | ||
| "routingPreference": { | ||
| "routingChoice": "MicrosoftRouting", | ||
| "publishMicrosoftEndpoints": true, | ||
| "publishInternetEndpoints": true | ||
| }, | ||
| "encryption": { | ||
| "services": { | ||
| "file": { | ||
| "keyType": "Account", | ||
| "enabled": true, | ||
| "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" | ||
| }, | ||
| "blob": { | ||
| "keyType": "Account", | ||
| "enabled": true, | ||
| "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" | ||
| } | ||
| }, | ||
| "keySource": "Microsoft.Keyvault", | ||
| "keyvaultproperties": { | ||
| "keyvaulturi": "https://myvault8569.vault.azure.net", | ||
| "keyname": "wrappingKey", | ||
| "keyversion": "", | ||
| "currentVersionedKeyIdentifier": "https://myvault8569.vault.azure.net/keys/wrappingKey/0682afdd9c104f4285df20107e956cad", | ||
| "lastKeyRotationTimestamp": "2019-12-13T20:36:23.7023290Z" | ||
| } | ||
| }, | ||
| "secondaryLocation": "northcentralus(stage)", | ||
| "statusOfPrimary": "available", | ||
| "statusOfSecondary": "available", | ||
| "supportsHttpsTrafficOnly": false | ||
| }, | ||
| "sku": { | ||
| "name": "Standard_GRS", | ||
| "tier": "Standard" | ||
| }, | ||
| "tags": { | ||
| "key1": "value1", | ||
| "key2": "value2" | ||
| }, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add example for it, include create/update/get/list account.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. example is required.
In reply to: 388050640 [](ancestors = 388050640)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Once examples are added, I will merge this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added example
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tonykjose Please fix the CI errors. PrettierCheck can be fixed by adding the word into https://github.com/Azure/azure-rest-api-specs/blob/master/custom-words.txt
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed and updated.