CodeGen from PR 13951 in Azure/azure-rest-api-specs

Merge 945bbc673a28c374116df89c4113b5fea742566b into 7cca3c6f2b72f4b41e80645cd988a99388dd4f12
AzureSDKAutomation · Apr 25, 2021 · f09409a · f09409a
1 parent 6f183ef
commit f09409a
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 39 deletions.
diff --git a/schemas/2015-05-01/Microsoft.Insights.Application.json b/schemas/2015-05-01/Microsoft.Insights.Application.json
@@ -154,6 +154,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -435,6 +452,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -1053,6 +1087,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -1378,6 +1429,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [

diff --git a/schemas/2020-10-20/Microsoft.Insights.Application.json b/schemas/2020-10-20/Microsoft.Insights.Application.json
@@ -35,7 +35,7 @@
         "identity": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ManagedIdentity"
+              "$ref": "#/definitions/MyWorkbookManagedIdentity"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -138,7 +138,7 @@
         "identity": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ManagedIdentityModel"
+              "$ref": "#/definitions/WorkbookManagedIdentity"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -212,7 +212,7 @@
     }
   },
   "definitions": {
-    "ManagedIdentity": {
+    "MyWorkbookManagedIdentity": {
       "type": "object",
       "properties": {
         "type": {
@@ -233,39 +233,7 @@
         "userAssignedIdentities": {
           "oneOf": [
             {
-              "$ref": "#/definitions/UserAssignedIdentities"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Customer Managed Identity"
-        }
-      },
-      "description": "Customer Managed Identity"
-    },
-    "ManagedIdentityModel": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "UserAssigned",
-                "None"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The identity type."
-        },
-        "userAssignedIdentities": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/UserAssignedIdentitiesModel"
+              "$ref": "#/definitions/MyWorkbookUserAssignedIdentities"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -325,14 +293,41 @@
       ],
       "description": "Properties that contain a private workbook."
     },
-    "UserAssignedIdentities": {
+    "MyWorkbookUserAssignedIdentities": {
       "type": "object",
       "properties": {},
       "description": "Customer Managed Identity"
     },
-    "UserAssignedIdentitiesModel": {
+    "WorkbookManagedIdentity": {
       "type": "object",
-      "properties": {},
+      "properties": {
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "UserAssigned",
+                "None"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The identity type."
+        },
+        "userAssignedIdentities": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WorkbookUserAssignedIdentities"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Customer Managed Identity"
+        }
+      },
       "description": "Customer Managed Identity"
     },
     "WorkbookProperties": {
@@ -383,6 +378,11 @@
         "serializedData"
       ],
       "description": "Properties that contain a workbook."
+    },
+    "WorkbookUserAssignedIdentities": {
+      "type": "object",
+      "properties": {},
+      "description": "Customer Managed Identity"
     }
   }
 }