From ba3379e1adde6e9a19d84e973938bde375831c0c Mon Sep 17 00:00:00 2001 From: David Desberg Date: Thu, 14 Jan 2021 10:14:08 -0800 Subject: [PATCH] hopefully fixing very broken rebase/merge --- .../DeleteRoleDefinition-example.json | 48 ++++++++---------- .../examples/GetRoleDefinition-example.json | 50 +++++++++---------- 2 files changed, 46 insertions(+), 52 deletions(-) diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json index 9f4fcbc66218..3d632c7e36f9 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json @@ -1,29 +1,25 @@ { - "parameters": { - "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" + "parameters": { + "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" + ] } ] }, @@ -33,4 +29,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json index 19cfc1f4c14f..a0fd4a02e5b5 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json @@ -1,32 +1,30 @@ { "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" + } } - } } -} +} \ No newline at end of file