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

[Hub Generated] Review request for Microsoft.Advisor to add version stable/2020-01-01 (#12020) * Update advisor.json * Update advisor.json * Update CreateSuppression.json * Update CreateSuppression.json * Update GetSuppressionDetail.json * Update advisor.json * Update advisor.json * Update advisor.json * Adds suppression to readme * Adds suppression to readme * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Add body to GetSuppressionDetail.json * Update response body for CreateSuppression.json
Azure · Dec 15, 2020 · a199d78 · a199d78
1 parent 3b31cef
commit a199d78
Show file tree

Hide file tree

Showing 44 changed files with 23,337 additions and 495 deletions.
diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json
@@ -156,6 +156,13 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
@@ -1843,6 +1850,8 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_groups_assessments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_hypervcollectors" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_vmwarecollectors" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections_moveResources" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Insights.json#/resourceDefinitions/actionGroups" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" },

diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json
@@ -202,6 +202,13 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },

diff --git a/schemas/2015-05-01-preview/Microsoft.Sql.json b/schemas/2015-05-01-preview/Microsoft.Sql.json
@@ -996,7 +996,9 @@
             {
               "type": "string",
               "enum": [
-                "SystemAssigned"
+                "None",
+                "SystemAssigned",
+                "UserAssigned"
               ]
             },
             {

diff --git a/schemas/2016-07-12-preview/Microsoft.Advisor.json b/schemas/2016-07-12-preview/Microsoft.Advisor.json
@@ -3,7 +3,8 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.Advisor",
   "description": "Microsoft Advisor Resource Types",
-  "resourceDefinitions": {
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
     "recommendations_suppressions": {
       "type": "object",
       "properties": {
@@ -47,7 +48,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -56,8 +57,8 @@
         "name",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {}
-}
+}
diff --git a/schemas/2017-03-31/Microsoft.Advisor.json b/schemas/2017-03-31/Microsoft.Advisor.json
@@ -3,7 +3,8 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.Advisor",
   "description": "Microsoft Advisor Resource Types",
-  "resourceDefinitions": {
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
     "recommendations_suppressions": {
       "type": "object",
       "properties": {
@@ -31,7 +32,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -41,7 +42,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {
@@ -60,4 +61,4 @@
       "description": "The properties of the suppression."
     }
   }
-}
+}
diff --git a/schemas/2017-04-19/Microsoft.Advisor.json b/schemas/2017-04-19/Microsoft.Advisor.json
@@ -48,8 +48,10 @@
         "type"
       ],
       "description": "Microsoft.Advisor/configurations"
-    },
-    "recommendations_suppressions": {
+    }
+  },
+  "subscription_resourceDefinitions": {
+    "configurations": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -58,25 +60,31 @@
             "2017-04-19"
           ]
         },
+        "id": {
+          "type": "string",
+          "description": "The resource Id of the configuration resource."
+        },
         "name": {
           "type": "string",
-          "description": "The name of the suppression."
+          "enum": [
+            "configurations"
+          ]
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/SuppressionProperties"
+              "$ref": "#/definitions/ConfigDataProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The properties of the suppression."
+          "description": "The list of property name/value pairs."
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/configurations"
           ]
         }
       },
@@ -86,11 +94,11 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/configurations"
     }
   },
-  "subscription_resourceDefinitions": {
-    "configurations": {
+  "unknown_resourceDefinitions": {
+    "recommendations_suppressions": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -99,31 +107,25 @@
             "2017-04-19"
           ]
         },
-        "id": {
-          "type": "string",
-          "description": "The resource Id of the configuration resource."
-        },
         "name": {
           "type": "string",
-          "enum": [
-            "configurations"
-          ]
+          "description": "The name of the suppression."
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ConfigDataProperties"
+              "$ref": "#/definitions/SuppressionProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The list of property name/value pairs."
+          "description": "The properties of the suppression."
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/configurations"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -133,7 +135,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/configurations"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {
@@ -189,4 +191,4 @@
       "description": "The properties of the suppression."
     }
   }
-}
+}
diff --git a/schemas/2017-06-01/Microsoft.AAD.json b/schemas/2017-06-01/Microsoft.AAD.json
@@ -246,6 +246,17 @@
           ],
           "description": "Secure LDAP Settings"
         },
+        "migrationProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MigrationProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Migration Properties"
+        },
         "notificationSettings": {
           "oneOf": [
             {
@@ -388,6 +399,52 @@
       },
       "description": "Secure LDAP Settings"
     },
+    "MigrationProgress": {
+      "type": "object",
+      "properties": {
+        "completionPercentage": {
+          "oneOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Completion Percentage"
+        },
+        "progressMessage": {
+          "type": "string",
+          "description": "Progress Message"
+        }
+      },
+      "description": "Migration Progress"
+    },
+    "MigrationProperties": {
+      "type": "object",
+      "properties": {
+        "migrationProgress": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MigrationProgress"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Migration Progress"
+        },
+        "oldSubnetId": {
+          "type": "string",
+          "description": "Old Subnet Id"
+        },
+        "oldVnetSiteId": {
+          "type": "string",
+          "description": "Old Vnet Site Id"
+        }
+      },
+      "description": "Migration Properties"
+    },
     "NotificationSettings": {
       "type": "object",
       "properties": {