Removed unused definition of ResourceIdentityWithUserAssignedIdentiti…

…es (Azure#15027) * Removed unused definition of ResourceIdentityWithUserAssignedIdentities in servers.json and ManagedInstances.json * Added "SystemAssigned,UserAssigned" identity type
mkarmark · Jul 20, 2021 · 104a95d · 104a95d
1 parent 0238ea9
commit 104a95d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 154 deletions.
diff --git a/...ation/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/ManagedInstances.json b/...ation/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
@@ -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/...ation/sql/resource-manager/Microsoft.Sql/preview/2021-02-01-preview/ManagedInstances.json b/...ation/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
@@ -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
@@ -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
@@ -46,7 +46,8 @@
           "enum": [
             "None",
             "SystemAssigned",
-            "UserAssigned"
+            "UserAssigned",
+            "SystemAssigned,UserAssigned"
           ],
           "type": "string",
           "x-ms-enum": {