From 104a95d8b00f9e60da6b3122cd264fb6e7921905 Mon Sep 17 00:00:00 2001
From: alswanso <85137251+alswanso@users.noreply.github.com>
Date: Tue, 13 Jul 2021 21:51:37 -0700
Subject: [PATCH] Removed unused definition of
 ResourceIdentityWithUserAssignedIdentities  (#15027)

* Removed unused definition of ResourceIdentityWithUserAssignedIdentities in servers.json and ManagedInstances.json

* Added "SystemAssigned,UserAssigned" identity type
---
 .../2020-11-01-preview/ManagedInstances.json  | 38 -------------------
 .../preview/2020-11-01-preview/Servers.json   | 38 -------------------
 .../2021-02-01-preview/ManagedInstances.json  | 38 -------------------
 .../preview/2021-02-01-preview/Servers.json   | 38 -------------------
 .../sql/resource-manager/common/v1/types.json |  3 +-
 .../sql/resource-manager/common/v2/types.json |  3 +-
 6 files changed, 4 insertions(+), 154 deletions(-)

diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/ManagedInstances.json
index 84c7e9cb35ab..0f5cf17099fb 100644
--- a/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/ManagedInstances.json
+++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/ManagedInstances.json
@@ -580,44 +580,6 @@
         }
       }
     },
-    "ResourceIdentityWithUserAssignedIdentities": {
-      "description": "Azure Active Directory identity configuration for a resource.",
-      "type": "object",
-      "properties": {
-        "userAssignedIdentities": {
-          "description": "The resource ids of the user assigned identities to use",
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/UserIdentity"
-          }
-        },
-        "principalId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory principal id.",
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "description": "The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource.",
-          "enum": [
-            "None",
-            "SystemAssigned",
-            "UserAssigned"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "IdentityType",
-            "modelAsString": true
-          }
-        },
-        "tenantId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory tenant id.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
     "ManagedInstanceProperties": {
       "description": "The properties of a managed instance.",
       "type": "object",
diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Servers.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Servers.json
index b99f6785495b..6d3b4a863bb8 100644
--- a/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Servers.json
+++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Servers.json
@@ -431,44 +431,6 @@
         }
       }
     },
-    "ResourceIdentityWithUserAssignedIdentities": {
-      "description": "Azure Active Directory identity configuration for a resource.",
-      "type": "object",
-      "properties": {
-        "userAssignedIdentities": {
-          "description": "The resource ids of the user assigned identities to use",
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/UserIdentity"
-          }
-        },
-        "principalId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory principal id.",
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "description": "The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource.",
-          "enum": [
-            "None",
-            "SystemAssigned",
-            "UserAssigned"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "IdentityType",
-            "modelAsString": true
-          }
-        },
-        "tenantId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory tenant id.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
     "ServerProperties": {
       "description": "The properties of a server.",
       "type": "object",
diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/ManagedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/ManagedInstances.json
index 1321783eb9dc..eb1b69cbfd24 100644
--- a/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/ManagedInstances.json
+++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/ManagedInstances.json
@@ -580,44 +580,6 @@
         }
       }
     },
-    "ResourceIdentityWithUserAssignedIdentities": {
-      "description": "Azure Active Directory identity configuration for a resource.",
-      "type": "object",
-      "properties": {
-        "userAssignedIdentities": {
-          "description": "The resource ids of the user assigned identities to use",
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/UserIdentity"
-          }
-        },
-        "principalId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory principal id.",
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "description": "The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource.",
-          "enum": [
-            "None",
-            "SystemAssigned",
-            "UserAssigned"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "IdentityType",
-            "modelAsString": true
-          }
-        },
-        "tenantId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory tenant id.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
     "ManagedInstanceProperties": {
       "description": "The properties of a managed instance.",
       "type": "object",
diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/Servers.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/Servers.json
index 4e8657f0cdc8..00043bcd5cfe 100644
--- a/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/Servers.json
+++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/Servers.json
@@ -431,44 +431,6 @@
         }
       }
     },
-    "ResourceIdentityWithUserAssignedIdentities": {
-      "description": "Azure Active Directory identity configuration for a resource.",
-      "type": "object",
-      "properties": {
-        "userAssignedIdentities": {
-          "description": "The resource ids of the user assigned identities to use",
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/UserIdentity"
-          }
-        },
-        "principalId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory principal id.",
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "description": "The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource.",
-          "enum": [
-            "None",
-            "SystemAssigned",
-            "UserAssigned"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "IdentityType",
-            "modelAsString": true
-          }
-        },
-        "tenantId": {
-          "format": "uuid",
-          "description": "The Azure Active Directory tenant id.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
     "ServerProperties": {
       "description": "The properties of a server.",
       "type": "object",
diff --git a/specification/sql/resource-manager/common/v1/types.json b/specification/sql/resource-manager/common/v1/types.json
index e6dd454ebd39..53499340e882 100644
--- a/specification/sql/resource-manager/common/v1/types.json
+++ b/specification/sql/resource-manager/common/v1/types.json
@@ -165,7 +165,8 @@
           "enum": [
             "None",
             "SystemAssigned",
-            "UserAssigned"
+            "UserAssigned",
+            "SystemAssigned,UserAssigned"
           ],
           "type": "string",
           "x-ms-enum": {
diff --git a/specification/sql/resource-manager/common/v2/types.json b/specification/sql/resource-manager/common/v2/types.json
index 9cd1182902d7..ed376ed6fca2 100644
--- a/specification/sql/resource-manager/common/v2/types.json
+++ b/specification/sql/resource-manager/common/v2/types.json
@@ -46,7 +46,8 @@
           "enum": [
             "None",
             "SystemAssigned",
-            "UserAssigned"
+            "UserAssigned",
+            "SystemAssigned,UserAssigned"
           ],
           "type": "string",
           "x-ms-enum": {