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

Jump to bottom

Supporting User MSI and CMK in RS Vault CRUD Operation #12248

Merged
merged 6 commits into from
Jan 11, 2021
Merged

Supporting User MSI and CMK in RS Vault CRUD Operation #12248

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0133baa
Changes for supporting User Assigned Identity and CMK in Resource CRU…
asmaskar Dec 29, 2020
b887e86
Fixing Examples
asmaskar Dec 29, 2020
4fe5b9a
Fix for the Prettier check validation
asmaskar Dec 29, 2020
936c80f
Added new Api-version for the changes
asmaskar Jan 7, 2021
09dd999
Fixed the api-version in json files
asmaskar Jan 7, 2021
347fac1
Marked operation result as long running.
asmaskar Jan 8, 2021
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
45 changes: 45 additions & 0 deletions ...rce-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetOperationResult.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"subscriptionId": "77777777-b0c6-47a2-b37c-d8e65a629c18",
"resourceGroupName": "HelloWorld",
"vaultName": "swaggerExample",
"operationId": "YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==",
"api-version": "2016-06-01"
},
"responses": {
"202": {
"headers": {
"Retry-After": "10",
"Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15",
"Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15"
}
},
"200": {
"body": {
"location": "westus",
"name": "swaggerExample",
"eTag": "W/\"datetime'2017-12-15T12%3A36%3A51.68Z'\"",
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi": {
"clientId": "fbe75b66-01c5-4f87-a220-233af3270436",
"principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9219"
}
}
},
"properties": {
"provisioningState": "Succeeded"
},
"id": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample",
"type": "Microsoft.RecoveryServices/vaults",
"sku": {
"name": "Standard"
}
}
}
}
}
20 changes: 20 additions & 0 deletions ...rce-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetOperationStatus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parameters": {
"subscriptionId": "77777777-b0c6-47a2-b37c-d8e65a629c18",
"resourceGroupName": "HelloWorld",
"vaultName": "swaggerExample",
"operationId": "YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==",
"api-version": "2016-06-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==",
"name": "YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==",
"status": "Succeeded",
"startTime": "2019-11-20T09:49:44.0478496Z",
"endTime": "2019-11-20T09:49:46Z"
}
}
}
}
21 changes: 5 additions & 16 deletions ...es/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PATCHVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,11 @@
}
}
},
"201": {
"body": {
"location": "westus",
"name": "swaggerExample",
"eTag": "W/\"datetime'2017-12-15T12%3A36%3A51.68Z'\"",
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"properties": {
"provisioningState": "Succeeded"
},
"id": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample",
"type": "Microsoft.RecoveryServices/vaults",
"sku": {
"name": "Standard"
}
"202": {
"headers": {
"Retry-After": "10",
"Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15",
"Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15"
}
}
}
Expand Down
77 changes: 77 additions & 0 deletions ...rce-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PATCHVault_WithCMK.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"parameters": {
"subscriptionId": "77777777-b0c6-47a2-b37c-d8e65a629c18",
"resourceGroupName": "HelloWorld",
"vaultName": "swaggerExample",
"api-version": "2016-06-01",
"vault": {
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi": {}
}
},
"properties": {
"encryption": {
"keyVaultProperties": {
"keyUri": "https://cmk2xkv.vault.azure.net/keys/Key1/0767b348bb1a4c07baa6c4ec0055d2b3"
},
"kekIdentity": {
"type": "UserAssigned",
"userAssignedIdentity": "/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi"
},
"infrastructureEncryption": "Enabled"
}
}
}
},
"responses": {
"200": {
"body": {
"location": "westus",
"name": "swaggerExample",
"eTag": "W/\"datetime'2017-12-15T12%3A36%3A51.68Z'\"",
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi": {
"clientId": "fbe75b66-01c5-4f87-a220-233af3270436",
"principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9219"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"encryption": {
"keyVaultProperties": {
"keyUri": "https://cmk2xkv.vault.azure.net/keys/Key1/0767b348bb1a4c07baa6c4ec0055d2b3"
},
"kekIdentity": {
"type": "UserAssigned",
"userAssignedIdentity": "/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi"
},
"infrastructureEncryption": "Enabled"
}
},
"id": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample",
"type": "Microsoft.RecoveryServices/vaults",
"sku": {
"name": "Standard"
}
}
},
"202": {
"headers": {
"Retry-After": "10",
"Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15",
"Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15"
}
}
}
}
72 changes: 72 additions & 0 deletions ...ce-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PATCHVault_WithCMK3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"parameters": {
"subscriptionId": "77777777-b0c6-47a2-b37c-d8e65a629c18",
"resourceGroupName": "HelloWorld",
"vaultName": "swaggerExample",
"api-version": "2016-06-01",
"vault": {
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi": {}
}
},
"properties": {
"encryption": {
"keyVaultProperties": {
"keyUri": "https://cmk2xkv.vault.azure.net/keys/Key1/0767b348bb1a4c07baa6c4ec0055d2b3"
}
}
}
}
},
"responses": {
"200": {
"body": {
"location": "westus",
"name": "swaggerExample",
"eTag": "W/\"datetime'2017-12-15T12%3A36%3A51.68Z'\"",
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi": {
"clientId": "fbe75b66-01c5-4f87-a220-233af3270436",
"principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9219"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"encryption": {
"keyVaultProperties": {
"keyUri": "https://cmk2xkv.vault.azure.net/keys/Key1/0767b348bb1a4c07baa6c4ec0055d2b3"
},
"kekIdentity": {
"type": "UserAssigned",
"userAssignedIdentity": "/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi"
},
"infrastructureEncryption": "Enabled"
}
},
"id": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample",
"type": "Microsoft.RecoveryServices/vaults",
"sku": {
"name": "Standard"
}
}
},
"202": {
"headers": {
"Retry-After": "10",
"Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15",
"Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15"
}
}
}
}
55 changes: 55 additions & 0 deletions ...soft.RecoveryServices/stable/2016-06-01/examples/PATCHVault_WithUserAssignedIdentity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"parameters": {
"subscriptionId": "77777777-b0c6-47a2-b37c-d8e65a629c18",
"resourceGroupName": "HelloWorld",
"vaultName": "swaggerExample",
"api-version": "2016-06-01",
"vault": {
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi": {}
}
}
}
},
"responses": {
"200": {
"body": {
"location": "westus",
"name": "swaggerExample",
"eTag": "W/\"datetime'2017-12-15T12%3A36%3A51.68Z'\"",
"tags": {
"PatchKey": "PatchKeyUpdated"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/85bf5e8c-3084-4f42-add2-746ebb7e97b2/resourcegroups/defaultrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/examplemsi": {
"clientId": "fbe75b66-01c5-4f87-a220-233af3270436",
"principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9219"
}
}
},
"properties": {
"provisioningState": "Succeeded"
},
"id": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample",
"type": "Microsoft.RecoveryServices/vaults",
"sku": {
"name": "Standard"
}
}
},
"202": {
"headers": {
"Retry-After": "10",
"Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15",
"Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.RecoveryServices/vaults/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2015-03-15"
}
}
}
}
Loading