SQL - Add Resource Identity swagger to common v2 (Azure#14439)

* Add Resource Identity swagger to common v2 * Change version number * Changed version num. Removed parameters
mkarmark · Jul 20, 2021 · 4925d37
1 parent 59ba1b6
commit 4925d37
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 8 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
@@ -969,7 +969,7 @@
       ],
       "properties": {
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "The Azure Active Directory identity of the managed instance.",
           "x-ms-mutability": [
             "read",
@@ -996,7 +996,7 @@
           "description": "Managed instance sku"
         },
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "Managed instance identity"
         },
         "properties": {

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
@@ -736,7 +736,7 @@
       ],
       "properties": {
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "The Azure Active Directory identity of the server.",
           "x-ms-mutability": [
             "read",
@@ -760,7 +760,7 @@
       "type": "object",
       "properties": {
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "Server identity"
         },
         "properties": {

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
@@ -978,7 +978,7 @@
       ],
       "properties": {
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "The Azure Active Directory identity of the managed instance.",
           "x-ms-mutability": [
             "read",
@@ -1005,7 +1005,7 @@
           "description": "Managed instance sku"
         },
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "Managed instance identity"
         },
         "properties": {

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
@@ -749,7 +749,7 @@
       ],
       "properties": {
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "The Azure Active Directory identity of the server.",
           "x-ms-mutability": [
             "read",
@@ -773,7 +773,7 @@
       "type": "object",
       "properties": {
         "identity": {
-          "$ref": "#/definitions/ResourceIdentityWithUserAssignedIdentities",
+          "$ref": "../../../common/v2/types.json#/definitions/ResourceIdentity",
           "description": "Server identity"
         },
         "properties": {

diff --git a/specification/sql/resource-manager/common/v2/types.json b/specification/sql/resource-manager/common/v2/types.json
@@ -0,0 +1,66 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "v2",
+    "title": "Common types"
+  },
+  "paths": {},
+  "definitions": {
+    "UserIdentity": {
+      "description": "Azure Active Directory identity configuration for a resource.",
+      "type": "object",
+      "properties": {
+        "principalId": {
+          "format": "uuid",
+          "description": "The Azure Active Directory principal id.",
+          "type": "string",
+          "readOnly": true
+        },
+        "clientId": {
+          "format": "uuid",
+          "description": "The Azure Active Directory client id.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ResourceIdentity": {
+      "description": "Azure Active Directory identity configuration for a resource.",
+      "type": "object",
+      "properties": {
+        "userAssignedIdentities": {
+          "description": "