Skip to content

Commit 0e8b236

Browse files
jorgecotillojorgecotillo
authored
Merge pull request #1390 from Azure/autogenerate
Merge Autogenerate
2 parents aa2b0f5 + 471099c commit 0e8b236

File tree

14 files changed

+6716
-69
lines changed

14 files changed

+6716
-69
lines changed

‎generator/resources.json‎

Lines changed: 87 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -549,18 +549,36 @@
549549
"2020-10-01"
550550
],
551551
"Microsoft.Authorization/locks": [
552+
"2015-01-01",
552553
"2016-09-01"
553554
],
555+
"Microsoft.Authorization/policyAssignments": [
556+
"2018-03-01",
557+
"2018-05-01",
558+
"2019-01-01",
559+
"2019-06-01",
560+
"2019-09-01"
561+
],
562+
"Microsoft.Authorization/policyDefinitions": [
563+
"2018-03-01",
564+
"2018-05-01",
565+
"2019-01-01",
566+
"2019-06-01",
567+
"2019-09-01"
568+
],
569+
"Microsoft.Authorization/policySetDefinitions": [
570+
"2018-03-01",
571+
"2018-05-01",
572+
"2019-01-01",
573+
"2019-06-01",
574+
"2019-09-01"
575+
],
554576
"Microsoft.Authorization/roleAssignments": [
555-
"2015-07-01",
556-
"2017-10-01-preview",
557-
"2018-01-01-preview",
558-
"2018-09-01-preview",
559-
"2020-04-01-preview"
577+
"2014-10-01-preview",
578+
"2017-09-01"
560579
],
561580
"Microsoft.Authorization/roleDefinitions": [
562-
"2015-07-01",
563-
"2018-01-01-preview"
581+
"2017-09-01"
564582
],
565583
"Microsoft.Automation/automationAccounts": [
566584
"2015-10-31"
@@ -1074,7 +1092,8 @@
10741092
"2017-06-01-preview",
10751093
"2017-10-01",
10761094
"2019-05-01",
1077-
"2019-12-01-preview"
1095+
"2019-12-01-preview",
1096+
"2020-11-01-preview"
10781097
],
10791098
"Microsoft.ContainerRegistry/registries/agentPools": [
10801099
"2019-06-01-preview"
@@ -1085,26 +1104,35 @@
10851104
"Microsoft.ContainerRegistry/registries/buildTasks/steps": [
10861105
"2018-02-01-preview"
10871106
],
1107+
"Microsoft.ContainerRegistry/registries/connectedRegistries": [
1108+
"2020-11-01-preview"
1109+
],
10881110
"Microsoft.ContainerRegistry/registries/exportPipelines": [
1089-
"2019-12-01-preview"
1111+
"2019-12-01-preview",
1112+
"2020-11-01-preview"
10901113
],
10911114
"Microsoft.ContainerRegistry/registries/importPipelines": [
1092-
"2019-12-01-preview"
1115+
"2019-12-01-preview",
1116+
"2020-11-01-preview"
10931117
],
10941118
"Microsoft.ContainerRegistry/registries/pipelineRuns": [
1095-
"2019-12-01-preview"
1119+
"2019-12-01-preview",
1120+
"2020-11-01-preview"
10961121
],
10971122
"Microsoft.ContainerRegistry/registries/privateEndpointConnections": [
1098-
"2019-12-01-preview"
1123+
"2019-12-01-preview",
1124+
"2020-11-01-preview"
10991125
],
11001126
"Microsoft.ContainerRegistry/registries/replications": [
11011127
"2017-06-01-preview",
11021128
"2017-10-01",
11031129
"2019-05-01",
1104-
"2019-12-01-preview"
1130+
"2019-12-01-preview",
1131+
"2020-11-01-preview"
11051132
],
11061133
"Microsoft.ContainerRegistry/registries/scopeMaps": [
1107-
"2019-05-01-preview"
1134+
"2019-05-01-preview",
1135+
"2020-11-01-preview"
11081136
],
11091137
"Microsoft.ContainerRegistry/registries/taskRuns": [
11101138
"2019-06-01-preview"
@@ -1115,13 +1143,15 @@
11151143
"2019-06-01-preview"
11161144
],
11171145
"Microsoft.ContainerRegistry/registries/tokens": [
1118-
"2019-05-01-preview"
1146+
"2019-05-01-preview",
1147+
"2020-11-01-preview"
11191148
],
11201149
"Microsoft.ContainerRegistry/registries/webhooks": [
11211150
"2017-06-01-preview",
11221151
"2017-10-01",
11231152
"2019-05-01",
1124-
"2019-12-01-preview"
1153+
"2019-12-01-preview",
1154+
"2020-11-01-preview"
11251155
],
11261156
"Microsoft.ContainerService/containerServices": [
11271157
"2016-03-30",
@@ -2252,18 +2282,21 @@
22522282
"2019-09-07",
22532283
"2019-11-09",
22542284
"2020-02-15",
2255-
"2020-06-14"
2285+
"2020-06-14",
2286+
"2020-09-18"
22562287
],
22572288
"Microsoft.Kusto/clusters/AttachedDatabaseConfigurations": [
22582289
"2019-09-07",
22592290
"2019-11-09",
22602291
"2020-02-15",
2261-
"2020-06-14"
2292+
"2020-06-14",
2293+
"2020-09-18"
22622294
],
22632295
"Microsoft.Kusto/clusters/dataConnections": [
22642296
"2019-11-09",
22652297
"2020-02-15",
2266-
"2020-06-14"
2298+
"2020-06-14",
2299+
"2020-09-18"
22672300
],
22682301
"Microsoft.Kusto/clusters/databases": [
22692302
"2017-09-07-privatepreview",
@@ -2273,25 +2306,29 @@
22732306
"2019-09-07",
22742307
"2019-11-09",
22752308
"2020-02-15",
2276-
"2020-06-14"
2309+
"2020-06-14",
2310+
"2020-09-18"
22772311
],
22782312
"Microsoft.Kusto/clusters/databases/dataconnections": [
22792313
"2019-01-21",
22802314
"2019-05-15",
22812315
"2019-09-07",
22822316
"2019-11-09",
22832317
"2020-02-15",
2284-
"2020-06-14"
2318+
"2020-06-14",
2319+
"2020-09-18"
22852320
],
22862321
"Microsoft.Kusto/clusters/databases/principalAssignments": [
22872322
"2019-11-09",
22882323
"2020-02-15",
2289-
"2020-06-14"
2324+
"2020-06-14",
2325+
"2020-09-18"
22902326
],
22912327
"Microsoft.Kusto/clusters/principalAssignments": [
22922328
"2019-11-09",
22932329
"2020-02-15",
2294-
"2020-06-14"
2330+
"2020-06-14",
2331+
"2020-09-18"
22952332
],
22962333
"Microsoft.LabServices/labaccounts": [
22972334
"2018-10-15"
@@ -2555,6 +2592,12 @@
25552592
"Microsoft.Migrate/migrateProjects/solutions": [
25562593
"2018-09-01-preview"
25572594
],
2595+
"Microsoft.Migrate/moveCollections": [
2596+
"2019-10-01-preview"
2597+
],
2598+
"Microsoft.Migrate/moveCollections/moveResources": [
2599+
"2019-10-01-preview"
2600+
],
25582601
"Microsoft.Migrate/projects": [
25592602
"2018-02-02"
25602603
],
@@ -2573,10 +2616,14 @@
25732616
"2019-10-01",
25742617
"2019-11-01",
25752618
"2020-02-01",
2576-
"2020-06-01"
2619+
"2020-06-01",
2620+
"2020-07-01",
2621+
"2020-08-01"
25772622
],
25782623
"Microsoft.NetApp/netAppAccounts/backupPolicies": [
2579-
"2020-06-01"
2624+
"2020-06-01",
2625+
"2020-07-01",
2626+
"2020-08-01"
25802627
],
25812628
"Microsoft.NetApp/netAppAccounts/capacityPools": [
25822629
"2017-08-15",
@@ -2587,7 +2634,9 @@
25872634
"2019-10-01",
25882635
"2019-11-01",
25892636
"2020-02-01",
2590-
"2020-06-01"
2637+
"2020-06-01",
2638+
"2020-07-01",
2639+
"2020-08-01"
25912640
],
25922641
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes": [
25932642
"2017-08-15",
@@ -2598,10 +2647,14 @@
25982647
"2019-10-01",
25992648
"2019-11-01",
26002649
"2020-02-01",
2601-
"2020-06-01"
2650+
"2020-06-01",
2651+
"2020-07-01",
2652+
"2020-08-01"
26022653
],
26032654
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups": [
2604-
"2020-06-01"
2655+
"2020-06-01",
2656+
"2020-07-01",
2657+
"2020-08-01"
26052658
],
26062659
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots": [
26072660
"2017-08-15",
@@ -2612,10 +2665,14 @@
26122665
"2019-10-01",
26132666
"2019-11-01",
26142667
"2020-02-01",
2615-
"2020-06-01"
2668+
"2020-06-01",
2669+
"2020-07-01",
2670+
"2020-08-01"
26162671
],
26172672
"Microsoft.NetApp/netAppAccounts/snapshotPolicies": [
2618-
"2020-06-01"
2673+
"2020-06-01",
2674+
"2020-07-01",
2675+
"2020-08-01"
26192676
],
26202677
"Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies": [
26212678
"2018-12-01",

‎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": {

0 commit comments

Comments
 (0)