Skip to content

Commit 32a5c42

Browse files
skayaniskayani
authored
Managed Services Swagger Consistency Fixes (#11471)
* Updated 2018-06-01-preview specs * Updated 2019-04-01-preview specs * Updated 2018-06-01-preview specs * Updated 2020-02-01-preview specs * Updated 2019-06-01 specs * Updated 2019-09-01 specs * Updated 2018-06-01-preview examples * Updated ErrorResponse model * Model validation fix * Removed readOnly=true for ErrorResponse * Updated type specification for error * Removed old type reference for ErrorResponse
1 parent 53ad4b5 commit 32a5c42

34 files changed

+549
-96
lines changed

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignment.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,16 @@
1919
"authorizations": [
2020
{
2121
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
22+
"principalIdDisplayName": "Support User",
2223
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
24+
},
25+
{
26+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
27+
"principalIdDisplayName": "User Access Administrator",
28+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
29+
"delegatedRoleDefinitionIds": [
30+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
31+
]
2332
}
2433
],
2534
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationAssignments.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,16 @@
1818
"authorizations": [
1919
{
2020
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
21+
"principalIdDisplayName": "Support User",
2122
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
23+
},
24+
{
25+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
26+
"principalIdDisplayName": "User Access Administrator",
27+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
28+
"delegatedRoleDefinitionIds": [
29+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
30+
]
2231
}
2332
],
2433
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinition.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
"authorizations": [
1515
{
1616
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
17+
"principalIdDisplayName": "Support User",
1718
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
19+
},
20+
{
21+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
22+
"principalIdDisplayName": "User Access Administrator",
23+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
24+
"delegatedRoleDefinitionIds": [
25+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
26+
]
1827
}
1928
],
2029
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/GetRegistrationDefinitions.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
"authorizations": [
1616
{
1717
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
18+
"principalIdDisplayName": "Support User",
1819
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
20+
},
21+
{
22+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
23+
"principalIdDisplayName": "User Access Administrator",
24+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
25+
"delegatedRoleDefinitionIds": [
26+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
27+
]
1928
}
2029
],
2130
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/examples/PutRegistrationDefinition.json‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,21 @@
66
"requestBody": {
77
"properties": {
88
"registrationDefinitionName": "DefinitionName",
9-
"description": "Tes1t",
9+
"description": "Test",
1010
"managedByTenantId": "83abe5cd-bcc3-441a-bd86-e6a75360cecc",
1111
"authorizations": [
1212
{
1313
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
14+
"principalIdDisplayName": "Support User",
1415
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
16+
},
17+
{
18+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
19+
"principalIdDisplayName": "User Access Administrator",
20+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
21+
"delegatedRoleDefinitionIds": [
22+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
23+
]
1524
}
1625
]
1726
},
@@ -33,7 +42,16 @@
3342
"authorizations": [
3443
{
3544
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
45+
"principalIdDisplayName": "Support User",
3646
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
47+
},
48+
{
49+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
50+
"principalIdDisplayName": "User Access Administrator",
51+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
52+
"delegatedRoleDefinitionIds": [
53+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
54+
]
3755
}
3856
],
3957
"provisioningState": "Succeeded",
@@ -59,7 +77,16 @@
5977
"authorizations": [
6078
{
6179
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
80+
"principalIdDisplayName": "Support User",
6281
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
82+
},
83+
{
84+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
85+
"principalIdDisplayName": "User Access Administrator",
86+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
87+
"delegatedRoleDefinitionIds": [
88+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
89+
]
6390
}
6491
],
6592
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2018-06-01-preview/managedservices.json‎

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -759,9 +759,21 @@
759759
"type": "string",
760760
"description": "Principal Id of the security group/service principal/user that would be assigned permissions to the projected subscription"
761761
},
762+
"principalIdDisplayName": {
763+
"type": "string",
764+
"description": "Display name of the principal Id."
765+
},
762766
"roleDefinitionId": {
763767
"type": "string",
764768
"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."
769+
},
770+
"delegatedRoleDefinitionIds": {
771+
"type": "array",
772+
"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.",
773+
"items": {
774+
"format": "uuid",
775+
"type": "string"
776+
}
765777
}
766778
},
767779
"required": [
@@ -771,29 +783,40 @@
771783
"type": "object",
772784
"description": "Authorization tuple containing principal Id (of user/service principal/security group) and role definition id."
773785
},
786+
"ErrorDefinition": {
787+
"properties": {
788+
"code": {
789+
"type": "string",
790+
"description": "Error code."
791+
},
792+
"message": {
793+
"type": "string",
794+
"description": "Error message indicating why the operation failed."
795+
},
796+
"details": {
797+
"description": "Internal error details.",
798+
"type": "array",
799+
"items": {
800+
"$ref": "#/definitions/ErrorDefinition"
801+
}
802+
}
803+
},
804+
"required": [
805+
"code",
806+
"message"
807+
],
808+
"type": "object",
809+
"description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message."
810+
},
774811
"ErrorResponse": {
812+
"description": "Error response.",
775813
"properties": {
776814
"error": {
777-
"readOnly": true,
778-
"properties": {
779-
"code": {
780-
"type": "string",
781-
"description": "Error code."
782-
},
783-
"message": {
784-
"type": "string",
785-
"description": "Error message indicating why the operation failed."
786-
}
787-
},
788-
"required": [
789-
"code",
790-
"message"
791-
],
792-
"type": "object",
793-
"description": "Error response indicates Azure Resource Manager is not able to process the incoming request. The reason is provided in the error message."
815+
"$ref": "#/definitions/ErrorDefinition",
816+
"description": "The error details.",
817+
"type": "object"
794818
}
795-
},
796-
"description": "Error response."
819+
}
797820
}
798821
},
799822
"parameters": {

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignment.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,16 @@
1919
"authorizations": [
2020
{
2121
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
22+
"principalIdDisplayName": "Support User",
2223
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
24+
},
25+
{
26+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
27+
"principalIdDisplayName": "User Access Administrator",
28+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
29+
"delegatedRoleDefinitionIds": [
30+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
31+
]
2332
}
2433
],
2534
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationAssignments.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,16 @@
1818
"authorizations": [
1919
{
2020
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
21+
"principalIdDisplayName": "Support User",
2122
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
23+
},
24+
{
25+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
26+
"principalIdDisplayName": "User Access Administrator",
27+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
28+
"delegatedRoleDefinitionIds": [
29+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
30+
]
2231
}
2332
],
2433
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinition.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
"authorizations": [
1515
{
1616
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
17+
"principalIdDisplayName": "Support User",
1718
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
19+
},
20+
{
21+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
22+
"principalIdDisplayName": "User Access Administrator",
23+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
24+
"delegatedRoleDefinitionIds": [
25+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
26+
]
1827
}
1928
],
2029
"provisioningState": "Succeeded",

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2019-04-01-preview/examples/GetRegistrationDefinitions.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
"authorizations": [
1616
{
1717
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
18+
"principalIdDisplayName": "Support User",
1819
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
20+
},
21+
{
22+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
23+
"principalIdDisplayName": "User Access Administrator",
24+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
25+
"delegatedRoleDefinitionIds": [
26+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
27+
]
1928
}
2029
],
2130
"provisioningState": "Succeeded",

0 commit comments

Comments
 (0)