Skip to content

Commit 13db3b1

Browse files
author
SDKAuto
committed
CodeGen from PR 11859 in Azure/azure-rest-api-specs
Update references for OpenAPI (#11859)
1 parent 3b31cef commit 13db3b1

27 files changed

+8816
-48
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/2016-07-07/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2843,4 +2843,4 @@
28432843
"description": "Configuration of a virtual network to which API Management service is deployed."
28442844
}
28452845
}
2846-
}
2846+
}

‎schemas/2016-10-10/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3427,4 +3427,4 @@
34273427
"description": "Configuration of a virtual network to which API Management service is deployed."
34283428
}
34293429
}
3430-
}
3430+
}

‎schemas/2017-03-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6460,4 +6460,4 @@
64606460
"description": "Properties of server X509Names."
64616461
}
64626462
}
6463-
}
6463+
}

‎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/2018-01-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6513,4 +6513,4 @@
65136513
"description": "Properties of server X509Names."
65146514
}
65156515
}
6516-
}
6516+
}

‎schemas/2018-06-01-preview/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6668,4 +6668,4 @@
66686668
"description": "Properties of server X509Names."
66696669
}
66706670
}
6671-
}
6671+
}

‎schemas/2018-06-01/Microsoft.DataFactory.json‎

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5908,6 +5908,16 @@
59085908
],
59095909
"description": "Cmdkey command custom setup type properties."
59105910
},
5911+
"CMKIdentityDefinition": {
5912+
"type": "object",
5913+
"properties": {
5914+
"userAssignedIdentity": {
5915+
"type": "string",
5916+
"description": "The resource id of the user assigned identity to authenticate to customer's key vault."
5917+
}
5918+
},
5919+
"description": "Managed Identity used for CMK."
5920+
},
59115921
"CommonDataServiceForAppsEntityDataset": {
59125922
"type": "object",
59135923
"properties": {
@@ -10376,6 +10386,39 @@
1037610386
],
1037710387
"description": "A copy activity Eloqua server source."
1037810388
},
10389+
"EncryptionConfiguration": {
10390+
"type": "object",
10391+
"properties": {
10392+
"identity": {
10393+
"oneOf": [
10394+
{
10395+
"$ref": "#/definitions/CMKIdentityDefinition"
10396+
},
10397+
{
10398+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
10399+
}
10400+
],
10401+
"description": "Managed Identity used for CMK."
10402+
},
10403+
"keyName": {
10404+
"type": "string",
10405+
"description": "The name of the key in Azure Key Vault to use as Customer Managed Key."
10406+
},
10407+
"keyVersion": {
10408+
"type": "string",
10409+
"description": "The version of the key used for CMK. If not provided, latest version will be used."
10410+
},
10411+
"vaultBaseUrl": {
10412+
"type": "string",
10413+
"description": "The url of the Azure Key Vault used for CMK."
10414+
}
10415+
},
10416+
"required": [
10417+
"keyName",
10418+
"vaultBaseUrl"
10419+
],
10420+
"description": "Definition of CMK for the factory."
10421+
},
1037910422
"EntityReference": {
1038010423
"type": "object",
1038110424
"properties": {
@@ -11490,7 +11533,23 @@
1149011533
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1149111534
}
1149211535
],
11493-
"description": "The identity type. Currently the only supported type is 'SystemAssigned'."
11536+
"description": "The identity type."
11537+
},
11538+
"userAssignedIdentities": {
11539+
"oneOf": [
11540+
{
11541+
"type": "object",
11542+
"additionalProperties": {
11543+
"type": "object",
11544+
"properties": {}
11545+
},
11546+
"properties": {}
11547+
},
11548+
{
11549+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
11550+
}
11551+
],
11552+
"description": "Definition of all user assigned identities for a factory."
1149411553
}
1149511554
},
1149611555
"required": [
@@ -11501,6 +11560,17 @@
1150111560
"FactoryProperties": {
1150211561
"type": "object",
1150311562
"properties": {
11563+
"encryption": {
11564+
"oneOf": [
11565+
{
11566+
"$ref": "#/definitions/EncryptionConfiguration"
11567+
},
11568+
{
11569+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
11570+
}
11571+
],
11572+
"description": "Definition of CMK for the factory."
11573+
},
1150411574
"globalParameters": {
1150511575
"oneOf": [
1150611576
{

‎schemas/2019-01-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6580,4 +6580,4 @@
65806580
"description": "Properties of server X509Names."
65816581
}
65826582
}
6583-
}
6583+
}

0 commit comments

Comments
 (0)