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..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 @@ -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/2018-06-01-preview/examples/GetRegistrationAssignments.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json index 7a97d1abfb3c..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 @@ -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/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..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 @@ -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/2018-06-01-preview/examples/GetRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json index 9b17b35b4468..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 @@ -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/2018-06-01-preview/examples/PutRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json index 711415ea161f..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 @@ -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": "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/preview/2018-06-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json index 06423c281682..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 @@ -759,9 +759,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": [ @@ -771,29 +783,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.", + "type": "object" } - }, - "description": "Error response." + } } }, "parameters": { 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..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 @@ -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/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..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 @@ -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": [ @@ -777,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.", + "type": "object" } - }, - "description": "Error response." + } } }, "parameters": { 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": [ 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..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 @@ -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.", + "type": "object" } - }, - "description": "Error response." + } } }, "parameters": { 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..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 @@ -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": [ @@ -777,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.", + "type": "object" } - }, - "description": "Error response." + } } }, "parameters": { 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..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 @@ -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": [ @@ -938,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." + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details.", + "type": "object" } - }, - "description": "Error response." + } } }, "parameters": {