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

AKV: Bring changes from two recent PRs to 7.2-preview into 7.3-preview #12322

Merged
merged 7 commits into from
Jan 25, 2021
+291 −3
Merged

AKV: Bring changes from two recent PRs to 7.2-preview into 7.3-preview #12322

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6f635a
Bring changes from two recent PRs to 7.2-preview into 7.3-preview for…
daviddesberg Jan 7, 2021
fab2203
address review feedback
daviddesberg Jan 7, 2021
f918074
add missing scope strings to examples
daviddesberg Jan 13, 2021
ba3379e
hopefully fixing very broken rebase/merge
daviddesberg Jan 14, 2021
1347b9e
re-remove re-appearing trailing commas
daviddesberg Jan 15, 2021
033248b
one more..
daviddesberg Jan 15, 2021
5eb5b84
ran prettier-fix
daviddesberg Jan 15, 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
Prev Previous commit
ran prettier-fix
@daviddesberg
daviddesberg committed Jan 15, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 5eb5b8448fa056c83e3fec60954e892d42880b76
2 changes: 1 addition & 1 deletion ...a-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json
View file
Original file line number Diff line number Diff line change
@@ -29,4 +29,4 @@
}
}
}
}
}
50 changes: 26 additions & 24 deletions ...data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"scope": "/",
"api-version": "7.2-preview",
"roleDefinitionName": "00000000-0000-0000-0000-000000000000"
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"scope": "/",
"api-version": "7.2-preview",
"roleDefinitionName": "00000000-0000-0000-0000-000000000000"
},
"responses": {
"200": {
"body": {
"properties": {
"roleName": "My custom role",
"type": "CustomRole",
"description": "Role description",
"assignableScopes": [
"/"
],
"permissions": [
{
"dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ]
}
]
},
"id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000",
"type": "Microsoft.Authorization/roleDefinitions",
"name": "00000000-0000-0000-0000-000000000000"
}
"200": {
"body": {
"properties": {
"roleName": "My custom role",
"type": "CustomRole",
"description": "Role description",
"assignableScopes": [
"/"
],
"permissions": [
{
"dataActions": [
"Microsoft.KeyVault/managedHsm/keys/sign/action"
]
}
]
},
"id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000",
"type": "Microsoft.Authorization/roleDefinitions",
"name": "00000000-0000-0000-0000-000000000000"
}
}
}
}
}
58 changes: 29 additions & 29 deletions ...a-plane/Microsoft.KeyVault/preview/7.3-preview/examples/DeleteRoleDefinition-example.json
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"scope": "/",
"api-version": "7.3-preview",
"roleDefinitionName": "00000000-0000-0000-0000-000000000000"
},
"responses": {
"200": {
"body": {
"properties": {
"roleName": "My custom role",
"type": "CustomRole",
"description": "Role description",
"assignableScopes": [
"/"
],
"permissions": [
{
"dataActions": [
"Microsoft.KeyVault/managedHsm/keys/sign/action"
]
}
]
},
"id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000",
"type": "Microsoft.Authorization/roleDefinitions",
"name": "00000000-0000-0000-0000-000000000000"
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"scope": "/",
"api-version": "7.3-preview",
"roleDefinitionName": "00000000-0000-0000-0000-000000000000"
},
"responses": {
"200": {
"body": {
"properties": {
"roleName": "My custom role",
"type": "CustomRole",
"description": "Role description",
"assignableScopes": [
"/"
],
"permissions": [
{
"dataActions": [
"Microsoft.KeyVault/managedHsm/keys/sign/action"
]
}
}
]
},
"id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000",
"type": "Microsoft.Authorization/roleDefinitions",
"name": "00000000-0000-0000-0000-000000000000"
}
}
}
}
}
56 changes: 29 additions & 27 deletions ...data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/GetRoleDefinition-example.json
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"scope": "/",
"api-version": "7.3-preview",
"roleDefinitionName": "00000000-0000-0000-0000-000000000000"
},
"responses": {
"200": {
"body": {
"properties": {
"roleName": "My custom role",
"type": "CustomRole",
"description": "Role description",
"assignableScopes": [
"/"
],
"permissions": [
{
"dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ]
}
]
},
"id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000",
"type": "Microsoft.Authorization/roleDefinitions",
"name": "00000000-0000-0000-0000-000000000000"
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"scope": "/",
"api-version": "7.3-preview",
"roleDefinitionName": "00000000-0000-0000-0000-000000000000"
},
"responses": {
"200": {
"body": {
"properties": {
"roleName": "My custom role",
"type": "CustomRole",
"description": "Role description",
"assignableScopes": [
"/"
],
"permissions": [
{
"dataActions": [
"Microsoft.KeyVault/managedHsm/keys/sign/action"
]
}
}
]
},
"id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000",
"type": "Microsoft.Authorization/roleDefinitions",
"name": "00000000-0000-0000-0000-000000000000"
}
}
}
}
}
2 changes: 1 addition & 1 deletion ...data-plane/Microsoft.KeyVault/preview/7.3-preview/examples/PutRoleDefinition-example.json
View file
Original file line number Diff line number Diff line change
@@ -43,4 +43,4 @@
}
}
}
}
}