From 752ed70adc2aaae7ff8fc38d71c9674a2a34f1a3 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 13:52:45 -0700 Subject: [PATCH 01/12] Updated 2018-06-01-preview specs --- .../examples/GetRegistrationAssignment.json | 9 ++++++ .../examples/GetRegistrationAssignments.json | 9 ++++++ .../examples/GetRegistrationDefinition.json | 9 ++++++ .../examples/GetRegistrationDefinitions.json | 9 ++++++ .../examples/PutRegistrationDefinition.json | 29 ++++++++++++++++++- .../2018-06-01-preview/managedservices.json | 27 ++++++++++++----- 6 files changed, 83 insertions(+), 9 deletions(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json index 68f78d0ec843..b779ab91ff37 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json @@ -19,7 +19,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "UAA", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json index 7a97d1abfb3c..bc525907faee 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json @@ -18,7 +18,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "UAA", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json index 9f19da45b26a..041152c49216 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json @@ -14,7 +14,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "UAA", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json index 9b17b35b4468..0998aeccfe51 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json @@ -15,7 +15,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "UAA", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json index 711415ea161f..9c1410d3a71e 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json @@ -6,12 +6,21 @@ "requestBody": { "properties": { "registrationDefinitionName": "DefinitionName", - "description": "Tes1t", + "description": "Test", "managedByTenantId": "83abe5cd-bcc3-441a-bd86-e6a75360cecc", "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "UAA", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ] }, @@ -33,7 +42,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "UAA", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", @@ -59,7 +77,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "UAA", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json index 06423c281682..326dc74302d7 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json @@ -759,18 +759,29 @@ "type": "string", "description": "Principal Id of the security group/service principal/user that would be assigned permissions to the projected subscription" }, + "principalIdDisplayName": { + "type": "string", + "description": "Display name of the principal Id." + }, "roleDefinitionId": { "type": "string", "description": "The role definition identifier. This role will define all the permissions that the security group/service principal/user must have on the projected subscription. This role cannot be an owner role." - } + }, + "delegatedRoleDefinitionIds": { + "type": "array", + "description": "The delegatedRoleDefinitionIds field is required when the roleDefinitionId refers to the User Access Administrator Role. It is the list of role definition ids which define all the permissions that the user in the authorization can assign to other security groups/service principals/users.", + "items": { + "format": "uuid", + "type": "string" + } + }, + "required": [ + "principalId", + "roleDefinitionId" + ], + "type": "object", + "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." }, - "required": [ - "principalId", - "roleDefinitionId" - ], - "type": "object", - "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." - }, "ErrorResponse": { "properties": { "error": { From 7c14d460c4e5d4db0753932d71cb1ad8ca3f3495 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 14:00:03 -0700 Subject: [PATCH 02/12] Updated 2019-04-01-preview specs --- .../examples/GetRegistrationAssignment.json | 9 +++++++ .../examples/GetRegistrationAssignments.json | 11 +++++++- .../examples/GetRegistrationDefinition.json | 9 +++++++ .../examples/GetRegistrationDefinitions.json | 9 +++++++ .../examples/PutRegistrationDefinition.json | 26 +++++++++++++++++++ .../2019-04-01-preview/managedservices.json | 12 +++++++++ 6 files changed, 75 insertions(+), 1 deletion(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignment.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignment.json index efc27f28722e..b868038d4e71 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignment.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignment.json @@ -19,7 +19,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json index f4c0d77582c7..10a0e3c289b2 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json @@ -18,9 +18,18 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } - ], + ] "provisioningState": "Succeeded", "manageeTenantId": "01c0bcd5-4f47-4e4b-b492-418b7e2a8854", "manageeTenantName": "test_test_aad_SbtFhyGiLHPFm", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinition.json index 7b604562f6bd..a7d790a7a132 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinition.json @@ -14,7 +14,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinitions.json index 6d459491d38d..3311403b2d89 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinitions.json @@ -15,7 +15,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/PutRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/PutRegistrationDefinition.json index 1723f91c08b1..8291478e29d4 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/PutRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/PutRegistrationDefinition.json @@ -11,7 +11,15 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ] }, @@ -33,7 +41,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", @@ -59,7 +76,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json index 407c38b6327b..8725695ea243 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json @@ -765,9 +765,21 @@ "type": "string", "description": "Principal Id of the security group/service principal/user that would be assigned permissions to the projected subscription" }, + "principalIdDisplayName": { + "type": "string", + "description": "Display name of the principal Id." + }, "roleDefinitionId": { "type": "string", "description": "The role definition identifier. This role will define all the permissions that the security group/service principal/user must have on the projected subscription. This role cannot be an owner role." + }, + "delegatedRoleDefinitionIds": { + "type": "array", + "description": "The delegatedRoleDefinitionIds field is required when the roleDefinitionId refers to the User Access Administrator Role. It is the list of role definition ids which define all the permissions that the user in the authorization can assign to other security groups/service principals/users.", + "items": { + "format": "uuid", + "type": "string" + } } }, "required": [ From 6d45d0a976698ada5e044153945bff364e937aa5 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 14:01:18 -0700 Subject: [PATCH 03/12] Updated 2018-06-01-preview specs --- .../2019-04-01-preview/examples/GetRegistrationAssignments.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json index 10a0e3c289b2..db8d79b5dd12 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json @@ -29,7 +29,7 @@ "b24988ac-6180-42a0-ab88-20f7382dd24c" ] } - ] + ], "provisioningState": "Succeeded", "manageeTenantId": "01c0bcd5-4f47-4e4b-b492-418b7e2a8854", "manageeTenantName": "test_test_aad_SbtFhyGiLHPFm", From 718eb4481f89585da7a3b50a8c3f9dc183d37e18 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 14:10:05 -0700 Subject: [PATCH 04/12] Updated 2020-02-01-preview specs --- .../GetMarketplaceRegistrationDefinition.json | 9 +++++++ ...GetMarketplaceRegistrationDefinitions.json | 9 +++++++ .../examples/GetRegistrationAssignment.json | 9 +++++++ .../examples/GetRegistrationAssignments.json | 9 +++++++ .../examples/GetRegistrationDefinition.json | 9 +++++++ .../examples/GetRegistrationDefinitions.json | 9 +++++++ .../examples/PutRegistrationDefinition.json | 27 +++++++++++++++++++ 7 files changed, 81 insertions(+) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json index be0edc4cc58e..7fd74c9209af 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json @@ -12,7 +12,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "offerDisplayName": "Marketplace Test Offer", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json index b511ed1128fd..868fa1080e4a 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json @@ -14,7 +14,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "offerDisplayName": "Marketplace Test Offer", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignment.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignment.json index 415424960bf8..fdaa27e29def 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignment.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignment.json @@ -19,7 +19,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "eligibleAuthorizations": [ diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignments.json index 83d264d3de1c..f0e872b4a23c 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignments.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationAssignments.json @@ -18,7 +18,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "eligibleAuthorizations": [ diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinition.json index d44d61718a6d..74c110b7344a 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinition.json @@ -14,7 +14,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "eligibleAuthorizations": [ diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinitions.json index d8b63c6d0417..798e0175e0b7 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetRegistrationDefinitions.json @@ -15,7 +15,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "eligibleAuthorizations": [ diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/PutRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/PutRegistrationDefinition.json index 3f38948f3565..589fd42e8057 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/PutRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/PutRegistrationDefinition.json @@ -11,7 +11,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "eligibleAuthorizations": [ @@ -44,7 +53,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "eligibleAuthorizations": [ @@ -81,7 +99,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "eligibleAuthorizations": [ From ea3d04e013aa5560fc121cd0808ded51f04aa8f6 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 14:17:45 -0700 Subject: [PATCH 05/12] Updated 2019-06-01 specs --- .../examples/GetRegistrationAssignment.json | 9 +++++++ .../examples/GetRegistrationAssignments.json | 9 +++++++ .../examples/GetRegistrationDefinition.json | 9 +++++++ .../examples/GetRegistrationDefinitions.json | 9 +++++++ .../examples/PutRegistrationDefinition.json | 27 +++++++++++++++++++ .../stable/2019-06-01/managedservices.json | 12 +++++++++ 6 files changed, 75 insertions(+) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignment.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignment.json index 37b79850b164..43473b1279b8 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignment.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignment.json @@ -19,7 +19,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignments.json index f3355d221f1f..cd9fd3a3f66d 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignments.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationAssignments.json @@ -18,7 +18,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinition.json index a772ff5161d3..58a9a933e3b0 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinition.json @@ -14,7 +14,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinitions.json index dbf8cc57fb18..ed1b9e6e26fe 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/GetRegistrationDefinitions.json @@ -15,7 +15,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/PutRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/PutRegistrationDefinition.json index 5c5fde7daceb..647280ad7a03 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/PutRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/examples/PutRegistrationDefinition.json @@ -11,7 +11,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ] }, @@ -33,7 +42,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", @@ -59,7 +77,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json index 6f4a6b03172c..ed5a8113cc28 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json @@ -765,9 +765,21 @@ "type": "string", "description": "Principal Id of the security group/service principal/user that would be assigned permissions to the projected subscription" }, + "principalIdDisplayName": { + "type": "string", + "description": "Display name of the principal Id." + }, "roleDefinitionId": { "type": "string", "description": "The role definition identifier. This role will define all the permissions that the security group/service principal/user must have on the projected subscription. This role cannot be an owner role." + }, + "delegatedRoleDefinitionIds": { + "type": "array", + "description": "The delegatedRoleDefinitionIds field is required when the roleDefinitionId refers to the User Access Administrator Role. It is the list of role definition ids which define all the permissions that the user in the authorization can assign to other security groups/service principals/users.", + "items": { + "format": "uuid", + "type": "string" + } } }, "required": [ From 112318a59c3b5e7c740e08b7a73dbeefbc43f41d Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 14:48:03 -0700 Subject: [PATCH 06/12] Updated 2019-09-01 specs --- .../GetMarketplaceRegistrationDefinition.json | 9 +++++++ ...GetMarketplaceRegistrationDefinitions.json | 9 +++++++ .../examples/GetRegistrationAssignment.json | 9 +++++++ .../examples/GetRegistrationAssignments.json | 9 +++++++ .../examples/GetRegistrationDefinition.json | 9 +++++++ .../examples/GetRegistrationDefinitions.json | 9 +++++++ .../examples/PutRegistrationDefinition.json | 27 +++++++++++++++++++ .../stable/2019-09-01/managedservices.json | 12 +++++++++ 8 files changed, 93 insertions(+) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json index 7d81dfc342fb..c434dac4d113 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json @@ -12,7 +12,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "offerDisplayName": "Marketplace Test Offer", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json index bd2d422e11eb..3f6a9e384128 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json @@ -14,7 +14,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "offerDisplayName": "Marketplace Test Offer", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignment.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignment.json index d007d055ebc2..1cf6356276b5 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignment.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignment.json @@ -19,7 +19,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignments.json index 870bd754c5af..0a80045bc900 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignments.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationAssignments.json @@ -18,7 +18,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinition.json index 4957e59467e9..6b6f9f99c681 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinition.json @@ -14,7 +14,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinitions.json index b30eb6d7f515..a19652b0c75b 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetRegistrationDefinitions.json @@ -15,7 +15,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/PutRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/PutRegistrationDefinition.json index ba1017913c23..ecc95a7ccc35 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/PutRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/PutRegistrationDefinition.json @@ -11,7 +11,16 @@ "authorizations": [ { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ] }, @@ -33,7 +42,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", @@ -59,7 +77,16 @@ "authorizations": [ { "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "Support User", "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" + }, + { + "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", + "principalIdDisplayName": "User Access Administrator", + "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", + "delegatedRoleDefinitionIds": [ + "b24988ac-6180-42a0-ab88-20f7382dd24c" + ] } ], "provisioningState": "Succeeded", diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json index 308312c1b835..323d6fedb67c 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json @@ -926,9 +926,21 @@ "type": "string", "description": "Principal Id of the security group/service principal/user that would be assigned permissions to the projected subscription" }, + "principalIdDisplayName": { + "type": "string", + "description": "Display name of the principal Id." + }, "roleDefinitionId": { "type": "string", "description": "The role definition identifier. This role will define all the permissions that the security group/service principal/user must have on the projected subscription. This role cannot be an owner role." + }, + "delegatedRoleDefinitionIds": { + "type": "array", + "description": "The delegatedRoleDefinitionIds field is required when the roleDefinitionId refers to the User Access Administrator Role. It is the list of role definition ids which define all the permissions that the user in the authorization can assign to other security groups/service principals/users.", + "items": { + "format": "uuid", + "type": "string" + } } }, "required": [ From 2a2aa45330f4b296a7191e60ba41f03209f4a932 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 14:53:27 -0700 Subject: [PATCH 07/12] Updated 2018-06-01-preview examples --- .../examples/GetRegistrationAssignment.json | 2 +- .../examples/GetRegistrationAssignments.json | 2 +- .../examples/GetRegistrationDefinition.json | 2 +- .../examples/GetRegistrationDefinitions.json | 2 +- .../examples/PutRegistrationDefinition.json | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json index b779ab91ff37..b42011bc476f 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json @@ -24,7 +24,7 @@ }, { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", - "principalIdDisplayName": "UAA", + "principalIdDisplayName": "User Access Administrator", "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", "delegatedRoleDefinitionIds": [ "b24988ac-6180-42a0-ab88-20f7382dd24c" diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json index bc525907faee..8c4af3fabec2 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json @@ -23,7 +23,7 @@ }, { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", - "principalIdDisplayName": "UAA", + "principalIdDisplayName": "User Access Administrator", "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", "delegatedRoleDefinitionIds": [ "b24988ac-6180-42a0-ab88-20f7382dd24c" diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json index 041152c49216..3a9967b0119a 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json @@ -19,7 +19,7 @@ }, { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", - "principalIdDisplayName": "UAA", + "principalIdDisplayName": "User Access Administrator", "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", "delegatedRoleDefinitionIds": [ "b24988ac-6180-42a0-ab88-20f7382dd24c" diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json index 0998aeccfe51..58f6e2e081aa 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json @@ -20,7 +20,7 @@ }, { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", - "principalIdDisplayName": "UAA", + "principalIdDisplayName": "User Access Administrator", "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", "delegatedRoleDefinitionIds": [ "b24988ac-6180-42a0-ab88-20f7382dd24c" diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json index 9c1410d3a71e..25d448c10838 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json @@ -16,7 +16,7 @@ }, { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", - "principalIdDisplayName": "UAA", + "principalIdDisplayName": "User Access Administrator", "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", "delegatedRoleDefinitionIds": [ "b24988ac-6180-42a0-ab88-20f7382dd24c" @@ -47,7 +47,7 @@ }, { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", - "principalIdDisplayName": "UAA", + "principalIdDisplayName": "User Access Administrator", "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", "delegatedRoleDefinitionIds": [ "b24988ac-6180-42a0-ab88-20f7382dd24c" @@ -82,7 +82,7 @@ }, { "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", - "principalIdDisplayName": "UAA", + "principalIdDisplayName": "User Access Administrator", "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", "delegatedRoleDefinitionIds": [ "b24988ac-6180-42a0-ab88-20f7382dd24c" From 5e4c0bc5f3353f7b2b2045e11462b1d5bfb47bd1 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 16:16:02 -0700 Subject: [PATCH 08/12] Updated ErrorResponse model --- .../2018-06-01-preview/managedservices.json | 48 +++++++++++------- .../2019-04-01-preview/managedservices.json | 47 +++++++++++------- .../2020-02-01-preview/managedservices.json | 47 +++++++++++------- .../stable/2019-06-01/managedservices.json | 49 ++++++++++++------- .../stable/2019-09-01/managedservices.json | 49 ++++++++++++------- 5 files changed, 148 insertions(+), 92 deletions(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json index 326dc74302d7..f81ad30ee599 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json @@ -781,30 +781,42 @@ ], "type": "object", "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." + } + }, + "ErrorDefinition": { + "properties": { + "code": { + "type": "string", + "description": "Error code." + }, + "message": { + "type": "string", + "description": "Error message indicating why the operation failed." + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + } + } }, + "required": [ + "code", + "message" + ], + "type": "object", + "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + }, "ErrorResponse": { + "description": "Error response.", "properties": { "error": { "readOnly": true, - "properties": { - "code": { - "type": "string", - "description": "Error code." - }, - "message": { - "type": "string", - "description": "Error message indicating why the operation failed." - } - }, - "required": [ - "code", - "message" - ], - "type": "object", - "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." } - }, - "description": "Error response." + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json index 8725695ea243..b7fe55ad6b6b 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json @@ -789,29 +789,40 @@ "type": "object", "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." }, + "ErrorDefinition": { + "properties": { + "code": { + "type": "string", + "description": "Error code." + }, + "message": { + "type": "string", + "description": "Error message indicating why the operation failed." + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + } + } + }, + "required": [ + "code", + "message" + ], + "type": "object", + "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + }, "ErrorResponse": { + "description": "Error response.", "properties": { "error": { "readOnly": true, - "properties": { - "code": { - "type": "string", - "description": "Error code." - }, - "message": { - "type": "string", - "description": "Error message indicating why the operation failed." - } - }, - "required": [ - "code", - "message" - ], - "type": "object", - "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." } - }, - "description": "Error response." + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json index 4c0da88970ae..0e5c959d4c17 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json @@ -1023,29 +1023,40 @@ "type": "object", "description": "Just-in-time access policy setting." }, + "ErrorDefinition": { + "properties": { + "code": { + "type": "string", + "description": "Error code." + }, + "message": { + "type": "string", + "description": "Error message indicating why the operation failed." + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + } + } + }, + "required": [ + "code", + "message" + ], + "type": "object", + "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + }, "ErrorResponse": { + "description": "Error response.", "properties": { "error": { "readOnly": true, - "properties": { - "code": { - "type": "string", - "description": "Error code." - }, - "message": { - "type": "string", - "description": "Error message indicating why the operation failed." - } - }, - "required": [ - "code", - "message" - ], - "type": "object", - "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." } - }, - "description": "Error response." + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json index ed5a8113cc28..8d3fbb8e41a2 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json @@ -789,29 +789,40 @@ "type": "object", "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." }, + "ErrorDefinition": { + "properties": { + "code": { + "type": "string", + "description": "Error code." + }, + "message": { + "type": "string", + "description": "Error message indicating why the operation failed." + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + } + } + }, + "required": [ + "code", + "message" + ], + "type": "object", + "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + }, "ErrorResponse": { + "description": "Error response.", "properties": { "error": { - "readOnly": true, - "properties": { - "code": { - "type": "string", - "description": "Error code." - }, - "message": { - "type": "string", - "description": "Error message indicating why the operation failed." - } - }, - "required": [ - "code", - "message" - ], - "type": "object", - "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + "readonly": true, + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." } - }, - "description": "Error response." + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json index 323d6fedb67c..acba6bcfc10a 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json @@ -950,29 +950,40 @@ "type": "object", "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." }, + "ErrorDefinition": { + "properties": { + "code": { + "type": "string", + "description": "Error code." + }, + "message": { + "type": "string", + "description": "Error message indicating why the operation failed." + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + } + } + }, + "required": [ + "code", + "message" + ], + "type": "object", + "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + }, "ErrorResponse": { + "description": "Error response.", "properties": { "error": { - "readOnly": true, - "properties": { - "code": { - "type": "string", - "description": "Error code." - }, - "message": { - "type": "string", - "description": "Error message indicating why the operation failed." - } - }, - "required": [ - "code", - "message" - ], - "type": "object", - "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." + "readonly": true, + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." } - }, - "description": "Error response." + } } }, "parameters": { From 3a0168aca47ae7f82a46cf82ced39c0bd9d83079 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 16:28:46 -0700 Subject: [PATCH 09/12] Model validation fix --- .../preview/2018-06-01-preview/managedservices.json | 4 ++-- .../preview/2019-04-01-preview/managedservices.json | 3 ++- .../preview/2020-02-01-preview/managedservices.json | 3 ++- .../stable/2019-06-01/managedservices.json | 3 ++- .../stable/2019-09-01/managedservices.json | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json index f81ad30ee599..1bfeb7fe41aa 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json @@ -809,14 +809,14 @@ "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." }, "ErrorResponse": { - "description": "Error response.", "properties": { "error": { "readOnly": true, "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } - } + }, + "type": "object" } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json index b7fe55ad6b6b..f9975afec43d 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json @@ -822,7 +822,8 @@ "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } - } + }, + "type": "object" } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json index 0e5c959d4c17..847d99bf8729 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json @@ -1056,7 +1056,8 @@ "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } - } + }, + "type": "object" } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json index 8d3fbb8e41a2..8c6af7e1bf0e 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json @@ -822,7 +822,8 @@ "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } - } + }, + "type": "object" } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json index acba6bcfc10a..810636ccc53a 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json @@ -983,7 +983,8 @@ "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } - } + }, + "type": "object" } }, "parameters": { From 7b38d55d17d3b80f84fd0381af211324f334ff8d Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 16:51:38 -0700 Subject: [PATCH 10/12] Removed readOnly=true for ErrorResponse --- .../2018-06-01-preview/managedservices.json | 18 +++++++++--------- .../2019-04-01-preview/managedservices.json | 1 - .../2020-02-01-preview/managedservices.json | 1 - .../stable/2019-06-01/managedservices.json | 1 - .../stable/2019-09-01/managedservices.json | 1 - 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json index 1bfeb7fe41aa..c66e19811636 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json @@ -774,14 +774,14 @@ "format": "uuid", "type": "string" } - }, - "required": [ - "principalId", - "roleDefinitionId" - ], - "type": "object", - "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." - } + } + }, + "required": [ + "principalId", + "roleDefinitionId" + ], + "type": "object", + "description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id." }, "ErrorDefinition": { "properties": { @@ -809,9 +809,9 @@ "description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message." }, "ErrorResponse": { + "description": "Error response.", "properties": { "error": { - "readOnly": true, "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json index f9975afec43d..45a60fd35875 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json @@ -818,7 +818,6 @@ "description": "Error response.", "properties": { "error": { - "readOnly": true, "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json index 847d99bf8729..5fea5dd84489 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json @@ -1052,7 +1052,6 @@ "description": "Error response.", "properties": { "error": { - "readOnly": true, "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json index 8c6af7e1bf0e..5e65833dfa18 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json @@ -818,7 +818,6 @@ "description": "Error response.", "properties": { "error": { - "readonly": true, "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json index 810636ccc53a..25fa822db75e 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json @@ -979,7 +979,6 @@ "description": "Error response.", "properties": { "error": { - "readonly": true, "$ref": "#/definitions/ErrorDefinition", "description": "The error details." } From 36e7630cd12b986610a1e71dc99adefa9a1a0ae2 Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 17:10:58 -0700 Subject: [PATCH 11/12] Updated type specification for error --- .../preview/2018-06-01-preview/managedservices.json | 6 +++--- .../preview/2019-04-01-preview/managedservices.json | 3 ++- .../preview/2020-02-01-preview/managedservices.json | 3 ++- .../stable/2019-06-01/managedservices.json | 3 ++- .../stable/2019-09-01/managedservices.json | 3 ++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json index c66e19811636..6428cc4c8e5a 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json @@ -813,10 +813,10 @@ "properties": { "error": { "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "description": "The error details.", + "type": "object" } - }, - "type": "object" + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json index 45a60fd35875..eeffa7f6c7ab 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json @@ -819,7 +819,8 @@ "properties": { "error": { "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "description": "The error details.", + "type": "object" } }, "type": "object" diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json index 5fea5dd84489..c779ce802cb9 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json @@ -1053,7 +1053,8 @@ "properties": { "error": { "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "description": "The error details.", + "type": "object" } }, "type": "object" diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json index 5e65833dfa18..52b0824f0ac3 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json @@ -819,7 +819,8 @@ "properties": { "error": { "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "description": "The error details.", + "type": "object" } }, "type": "object" diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json index 25fa822db75e..809e30d989bc 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json @@ -980,7 +980,8 @@ "properties": { "error": { "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "description": "The error details.", + "type": "object" } }, "type": "object" From 8277f20ca4f2779b5a35a0d64ac9d6af2df757fc Mon Sep 17 00:00:00 2001 From: Saif Kayani Date: Fri, 30 Oct 2020 17:16:21 -0700 Subject: [PATCH 12/12] Removed old type reference for ErrorResponse --- .../preview/2019-04-01-preview/managedservices.json | 3 +-- .../preview/2020-02-01-preview/managedservices.json | 3 +-- .../stable/2019-06-01/managedservices.json | 3 +-- .../stable/2019-09-01/managedservices.json | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json index eeffa7f6c7ab..30e87e4dbcae 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/managedservices.json @@ -822,8 +822,7 @@ "description": "The error details.", "type": "object" } - }, - "type": "object" + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json index c779ce802cb9..f6dd0e1f485c 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json @@ -1056,8 +1056,7 @@ "description": "The error details.", "type": "object" } - }, - "type": "object" + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json index 52b0824f0ac3..e63a62b2230b 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-06-01/managedservices.json @@ -822,8 +822,7 @@ "description": "The error details.", "type": "object" } - }, - "type": "object" + } } }, "parameters": { diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json index 809e30d989bc..3166a1b71d8d 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json @@ -983,8 +983,7 @@ "description": "The error details.", "type": "object" } - }, - "type": "object" + } } }, "parameters": {