[ReleasePR sql] SQL - Add Resource Identity swagger to common v2 (#1712)

msftbot[bot] · web-flow · commit d082267585c2 · 2021-05-18T00:26:10.000Z
Create to sync Azure/azure-rest-api-specs#14439 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/master...AzureSDKAutomation:sdkAuto/sql?expand=1)
diff --git a/schemas/2020-11-01-preview/Microsoft.Sql.json b/schemas/2020-11-01-preview/Microsoft.Sql.json
@@ -164,7 +164,7 @@
         "identity": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities"
+              "$ref": "#/definitions/ResourceIdentity"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1089,7 +1089,7 @@
         "identity": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities"
+              "$ref": "#/definitions/ResourceIdentity"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -5993,7 +5993,7 @@
         "status"
       ]
     },
-    "ResourceIdentityWithUserAssignedIdentities": {
+    "ResourceIdentity": {
       "type": "object",
       "properties": {
         "type": {
diff --git a/schemas/2021-02-01-preview/Microsoft.Sql.json b/schemas/2021-02-01-preview/Microsoft.Sql.json
@@ -164,7 +164,7 @@
         "identity": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities"
+              "$ref": "#/definitions/ResourceIdentity"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1089,7 +1089,7 @@
         "identity": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities"
+              "$ref": "#/definitions/ResourceIdentity"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -6109,7 +6109,7 @@
         "status"
       ]
     },
-    "ResourceIdentityWithUserAssignedIdentities": {
+    "ResourceIdentity": {
       "type": "object",
       "properties": {
         "type": {

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@`
`164`	`164`	`"identity": {`
`165`	`165`	`"oneOf": [`
`166`	`166`	`{`
`167`		`- "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities"`
	`167`	`+ "$ref": "#/definitions/ResourceIdentity"`
`168`	`168`	`},`
`169`	`169`	`{`
`170`	`170`	`"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"`
`@@ -1089,7 +1089,7 @@`
`1089`	`1089`	`"identity": {`
`1090`	`1090`	`"oneOf": [`
`1091`	`1091`	`{`
`1092`		`- "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities"`
	`1092`	`+ "$ref": "#/definitions/ResourceIdentity"`
`1093`	`1093`	`},`
`1094`	`1094`	`{`
`1095`	`1095`	`"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"`
`@@ -5993,7 +5993,7 @@`
`5993`	`5993`	`"status"`
`5994`	`5994`	`]`
`5995`	`5995`	`},`
`5996`		`- "ResourceIdentityWithUserAssignedIdentities": {`
	`5996`	`+ "ResourceIdentity": {`
`5997`	`5997`	`"type": "object",`
`5998`	`5998`	`"properties": {`
`5999`	`5999`	`"type": {`