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

Merge 80ba4220aa70f8396a5f740da12e089428f23ead into dcd3140ab6509c5adba2cd9918c2290b051e93c6
AzureSDKAutomation · Dec 15, 2020 · 150a8d4 · 150a8d4
1 parent 3b31cef
commit 150a8d4
Show file tree

Hide file tree

Showing 54 changed files with 23,375 additions and 462 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/2015-05-01-preview/Microsoft.Storage.json b/schemas/2015-05-01-preview/Microsoft.Storage.json
@@ -57,6 +57,7 @@
         "apiVersion",
         "location",
         "name",
+        "properties",
         "type"
       ],
       "description": "Microsoft.Storage/storageAccounts"
@@ -87,4 +88,4 @@
       }
     }
   }
-}
+}
diff --git a/schemas/2015-06-15/Microsoft.Storage.json b/schemas/2015-06-15/Microsoft.Storage.json
@@ -60,6 +60,7 @@
         "apiVersion",
         "location",
         "name",
+        "properties",
         "type"
       ],
       "description": "Microsoft.Storage/storageAccounts"
@@ -94,4 +95,4 @@
       "description": "The parameters used to create the storage account."
     }
   }
-}
+}
diff --git a/schemas/2016-01-01/Microsoft.Storage.json b/schemas/2016-01-01/Microsoft.Storage.json
@@ -86,6 +86,7 @@
         "kind",
         "location",
         "name",
+        "properties",
         "sku",
         "type"
       ],
@@ -255,4 +256,4 @@
       }
     }
   }
-}
+}
diff --git a/schemas/2016-05-01/Microsoft.Storage.json b/schemas/2016-05-01/Microsoft.Storage.json
@@ -87,6 +87,7 @@
         "kind",
         "location",
         "name",
+        "properties",
         "sku",
         "type"
       ],
@@ -257,4 +258,4 @@
       "description": "The parameters used to create the storage account."
     }
   }
-}
+}
diff --git a/schemas/2016-12-01/Microsoft.Storage.json b/schemas/2016-12-01/Microsoft.Storage.json
@@ -87,6 +87,7 @@
         "kind",
         "location",
         "name",
+        "properties",
         "sku",
         "type"
       ],
@@ -280,4 +281,4 @@
       "description": "The parameters used to create the storage account."
     }
   }
-}
+}
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": {

diff --git a/schemas/2017-06-01/Microsoft.Storage.json b/schemas/2017-06-01/Microsoft.Storage.json
@@ -98,6 +98,7 @@
         "kind",
         "location",
         "name",
+        "properties",
         "sku",
         "type"
       ],
@@ -531,4 +532,4 @@
       "description": "Virtual Network rule."
     }
   }
-}
+}
diff --git a/schemas/2017-10-01/Microsoft.Storage.json b/schemas/2017-10-01/Microsoft.Storage.json
@@ -99,6 +99,7 @@
         "kind",
         "location",
         "name",
+        "properties",
         "sku",
         "type"
       ],
@@ -532,4 +533,4 @@
       "description": "Virtual Network rule."
     }
   }
-}
+}