Skip to content

Commit 7f416c1

Browse files
author
SDKAuto
committed
CodeGen from PR 12129 in Azure/azure-rest-api-specs
Merge 991c436e34e5f80c57b096c9dfd8692b6c6405fd into 97bf9c22ba709eba23b30021854d585e5c635255
1 parent 3b31cef commit 7f416c1

File tree

49 files changed

+23293
-457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+23293
-457
lines changed

‎schemas/2014-04-01-preview/deploymentTemplate.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,13 @@
156156
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
157157
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
158158
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
159+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
160+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
161+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
162+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
163+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
164+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
165+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
159166
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
160167
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
161168
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
@@ -1843,6 +1850,8 @@
18431850
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_groups_assessments" },
18441851
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_hypervcollectors" },
18451852
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_vmwarecollectors" },
1853+
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections" },
1854+
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections_moveResources" },
18461855
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Insights.json#/resourceDefinitions/actionGroups" },
18471856
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" },
18481857
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" },

‎schemas/2015-01-01/deploymentTemplate.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,13 @@
202202
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
203203
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
204204
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
205+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
206+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
207+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
208+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
209+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
210+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
211+
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
205212
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
206213
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
207214
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },

‎schemas/2015-05-01-preview/Microsoft.Sql.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,9 @@
996996
{
997997
"type": "string",
998998
"enum": [
999-
"SystemAssigned"
999+
"None",
1000+
"SystemAssigned",
1001+
"UserAssigned"
10001002
]
10011003
},
10021004
{

‎schemas/2017-06-01/Microsoft.AAD.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,17 @@
246246
],
247247
"description": "Secure LDAP Settings"
248248
},
249+
"migrationProperties": {
250+
"oneOf": [
251+
{
252+
"$ref": "#/definitions/MigrationProperties"
253+
},
254+
{
255+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
256+
}
257+
],
258+
"description": "Migration Properties"
259+
},
249260
"notificationSettings": {
250261
"oneOf": [
251262
{
@@ -388,6 +399,52 @@
388399
},
389400
"description": "Secure LDAP Settings"
390401
},
402+
"MigrationProgress": {
403+
"type": "object",
404+
"properties": {
405+
"completionPercentage": {
406+
"oneOf": [
407+
{
408+
"type": "number"
409+
},
410+
{
411+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
412+
}
413+
],
414+
"description": "Completion Percentage"
415+
},
416+
"progressMessage": {
417+
"type": "string",
418+
"description": "Progress Message"
419+
}
420+
},
421+
"description": "Migration Progress"
422+
},
423+
"MigrationProperties": {
424+
"type": "object",
425+
"properties": {
426+
"migrationProgress": {
427+
"oneOf": [
428+
{
429+
"$ref": "#/definitions/MigrationProgress"
430+
},
431+
{
432+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
433+
}
434+
],
435+
"description": "Migration Progress"
436+
},
437+
"oldSubnetId": {
438+
"type": "string",
439+
"description": "Old Subnet Id"
440+
},
441+
"oldVnetSiteId": {
442+
"type": "string",
443+
"description": "Old Vnet Site Id"
444+
}
445+
},
446+
"description": "Migration Properties"
447+
},
391448
"NotificationSettings": {
392449
"type": "object",
393450
"properties": {

‎schemas/2017-08-01-preview/Microsoft.ContainerInstance.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,4 +577,4 @@
577577
"description": "The properties of the volume mount."
578578
}
579579
}
580-
}
580+
}

‎schemas/2017-10-01-preview/Microsoft.ContainerInstance.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,4 +598,4 @@
598598
"description": "The properties of the volume mount."
599599
}
600600
}
601-
}
601+
}

0 commit comments

Comments
 (0)