From 78d0aa7e3764eb83c1d155b08a066e44dd7575f5 Mon Sep 17 00:00:00 2001 From: Dandan Date: Mon, 9 Mar 2020 14:22:49 -0700 Subject: [PATCH 1/3] Add missed properties of Identity. --- .../2019-07-01/managedapplications.json | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json index 82d30ad10387..cfd34fe18c8b 100644 --- a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json +++ b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json @@ -1606,16 +1606,39 @@ "type": "string", "description": "The identity type.", "enum": [ - "SystemAssigned" + "SystemAssigned", + "UserAssigned", + "SystemAssigned, UserAssigned", + "None" ], "x-ms-enum": { "name": "ResourceIdentityType", "modelAsString": false } + }, + "userAssignedIdentities": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/userAssignedResourceIdentity" + }, + "description": "The list of user identities associated with the resource. The user identity dictionary key references will be resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'." } }, "description": "Identity for the resource." }, + "userAssignedResourceIdentity" :{ + "properties":{ + "principalId": { + "type": "string", + "description": "The principal id of user assigned identity." + }, + "tenantId": { + "type": "string", + "description": "The tenant id of user assigned identity." + } + }, + "description": "Represents the user assigned identity that is contained within the UserAssignedIdentities dictionary on ResourceIdentity" + }, "Resource": { "properties": { "id": { From 063a87bdc31dab0c124bdc038f67d2acce66df17 Mon Sep 17 00:00:00 2001 From: Dandan Date: Mon, 9 Mar 2020 14:42:10 -0700 Subject: [PATCH 2/3] Fix prettier check. --- .../stable/2019-07-01/managedapplications.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json index cfd34fe18c8b..e489af41e804 100644 --- a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json +++ b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json @@ -1626,8 +1626,8 @@ }, "description": "Identity for the resource." }, - "userAssignedResourceIdentity" :{ - "properties":{ + "userAssignedResourceIdentity": { + "properties": { "principalId": { "type": "string", "description": "The principal id of user assigned identity." From ee67e477dc606aea359b5055aae86e11ce1542f8 Mon Sep 17 00:00:00 2001 From: Dandan Date: Thu, 2 Apr 2020 19:38:30 -0700 Subject: [PATCH 3/3] Add read only according to comment. --- .../stable/2019-07-01/managedapplications.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json index e489af41e804..6a3432f615ea 100644 --- a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json +++ b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json @@ -1629,10 +1629,12 @@ "userAssignedResourceIdentity": { "properties": { "principalId": { + "readOnly": true, "type": "string", "description": "The principal id of user assigned identity." }, "tenantId": { + "readOnly": true, "type": "string", "description": "The tenant id of user assigned identity." }