From 7cfc460c5b4f17a896510314e12432f9fdc2eecd Mon Sep 17 00:00:00 2001
From: James Christianson <jamesrchristianson@gmail.com>
Date: Mon, 4 Mar 2019 08:08:30 -0800
Subject: [PATCH] Update UserAssignedIdentities spec in Web (#5288)

* Update UserAssignedIdentities spec in Web

Microsoft.Web recently added support for UserAssigned managed service identities (in preview), but the swagger spec is incorrect for the identity payload as it follows the old construct of sending an array of identityIds as opposed to the updated spec which instead sends a dictionary object called userAssignedIdentities.

Spec + history outlined here:
http://sharepoint/sites/AzureUX/Sparta/_layouts/15/WopiFrame2.aspx?sourcedoc=%7b633632B4-02E4-4DE2-92A9-EDCAF9BE73D4%7d&file=ARM%2BMSI.docx&action=default

Our swagger contains identityids[] because of previous work to future support UserAssigned identities, but never released the feature in that state, rather we opted to wait for the new spec to be supported and then integrated with that on our end.

Our MSI implementation reflects Microsoft.Compute's spec for user assigned.

https://github.com/Azure/azure-rest-api-specs/blob/78e1feab142c605839aa3cec23442ca26b8ef04d/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json

* fix linterdiff tool
---
 .../stable/2018-02-01/CommonDefinitions.json  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json
index 929ec3a077e7..da30e23dc16e 100644
--- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json
+++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json
@@ -1326,12 +1326,23 @@
           "type": "string",
           "readOnly": true
         },
-        "identityIds": {
-          "description": "Array of UserAssigned managed service identities.",
-          "type": "array",
-          "items": {
-            "description": "Resource Id for UserAssigned managed service identity",
-            "type": "string"
+        "userAssignedIdentities": {
+          "description": "The list of user assigned identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}",
+          "type": "object",
+          "additionalProperties": {
+            "type": "object",
+            "properties": {
+              "principalId": {
+                "description": "Principal Id of user assigned identity",
+                "type": "string",
+                "readOnly": true
+              },
+              "clientId": {
+                "description": "Client Id of user assigned identity",
+                "type": "string",
+                "readOnly": true
+              }
+            }
           }
         }
       }