Skip to content

Commit c8a2a21

Browse files
jorgecotillojorgecotillo
authored
Merge pull request #1433 from Azure/autogenerate
Merge Autogenerate
2 parents e19a420 + 7eafab8 commit c8a2a21

File tree

20 files changed

+5231
-781
lines changed

20 files changed

+5231
-781
lines changed

‎generator/resources.json‎

Lines changed: 94 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"2020-01-01"
66
],
77
"Microsoft.AVS/privateClouds": [
8-
"2019-08-09-preview",
98
"2020-03-20",
109
"2020-07-17-preview"
1110
],
@@ -14,7 +13,6 @@
1413
"2020-07-17-preview"
1514
],
1615
"Microsoft.AVS/privateClouds/clusters": [
17-
"2019-08-09-preview",
1816
"2020-03-20",
1917
"2020-07-17-preview"
2018
],
@@ -893,7 +891,8 @@
893891
"2019-04-01"
894892
],
895893
"Microsoft.Capacity/resourceProviders/locations/serviceLimits": [
896-
"2019-07-19-preview"
894+
"2019-07-19-preview",
895+
"2020-10-25"
897896
],
898897
"Microsoft.Cdn/CdnWebApplicationFirewallPolicies": [
899898
"2019-06-15",
@@ -1770,11 +1769,16 @@
17701769
],
17711770
"Microsoft.DigitalTwins/digitalTwinsInstances": [
17721771
"2020-03-01-preview",
1773-
"2020-10-31"
1772+
"2020-10-31",
1773+
"2020-12-01"
17741774
],
17751775
"Microsoft.DigitalTwins/digitalTwinsInstances/endpoints": [
17761776
"2020-03-01-preview",
1777-
"2020-10-31"
1777+
"2020-10-31",
1778+
"2020-12-01"
1779+
],
1780+
"Microsoft.DigitalTwins/digitalTwinsInstances/privateEndpointConnections": [
1781+
"2020-12-01"
17781782
],
17791783
"Microsoft.DocumentDB/databaseAccounts": [
17801784
"2015-04-01",
@@ -2199,7 +2203,7 @@
21992203
"2018-10-31-preview"
22002204
],
22012205
"Microsoft.HealthBot/healthBots": [
2202-
"2020-10-20-preview"
2206+
"2020-12-08"
22032207
],
22042208
"Microsoft.HealthcareApis/services": [
22052209
"2018-08-20-preview",
@@ -2705,12 +2709,14 @@
27052709
"2020-02-01",
27062710
"2020-06-01",
27072711
"2020-07-01",
2708-
"2020-08-01"
2712+
"2020-08-01",
2713+
"2020-09-01"
27092714
],
27102715
"Microsoft.NetApp/netAppAccounts/backupPolicies": [
27112716
"2020-06-01",
27122717
"2020-07-01",
2713-
"2020-08-01"
2718+
"2020-08-01",
2719+
"2020-09-01"
27142720
],
27152721
"Microsoft.NetApp/netAppAccounts/capacityPools": [
27162722
"2017-08-15",
@@ -2723,7 +2729,8 @@
27232729
"2020-02-01",
27242730
"2020-06-01",
27252731
"2020-07-01",
2726-
"2020-08-01"
2732+
"2020-08-01",
2733+
"2020-09-01"
27272734
],
27282735
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes": [
27292736
"2017-08-15",
@@ -2736,12 +2743,14 @@
27362743
"2020-02-01",
27372744
"2020-06-01",
27382745
"2020-07-01",
2739-
"2020-08-01"
2746+
"2020-08-01",
2747+
"2020-09-01"
27402748
],
27412749
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups": [
27422750
"2020-06-01",
27432751
"2020-07-01",
2744-
"2020-08-01"
2752+
"2020-08-01",
2753+
"2020-09-01"
27452754
],
27462755
"Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots": [
27472756
"2017-08-15",
@@ -2754,12 +2763,14 @@
27542763
"2020-02-01",
27552764
"2020-06-01",
27562765
"2020-07-01",
2757-
"2020-08-01"
2766+
"2020-08-01",
2767+
"2020-09-01"
27582768
],
27592769
"Microsoft.NetApp/netAppAccounts/snapshotPolicies": [
27602770
"2020-06-01",
27612771
"2020-07-01",
2762-
"2020-08-01"
2772+
"2020-08-01",
2773+
"2020-09-01"
27632774
],
27642775
"Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies": [
27652776
"2018-12-01",
@@ -4068,6 +4079,12 @@
40684079
"2020-08-01",
40694080
"2020-10-01"
40704081
],
4082+
"Microsoft.OperationalInsights/queryPacks": [
4083+
"2019-09-01-preview"
4084+
],
4085+
"Microsoft.OperationalInsights/queryPacks/queries": [
4086+
"2019-09-01-preview"
4087+
],
40714088
"Microsoft.OperationalInsights/workspaces": [
40724089
"2015-11-01-preview",
40734090
"2020-03-01-preview",
@@ -4377,30 +4394,68 @@
43774394
],
43784395
"Microsoft.Security/advancedThreatProtectionSettings": [
43794396
"2017-08-01-preview",
4380-
"2018-06-01"
4397+
"2019-01-01"
4398+
],
4399+
"Microsoft.Security/alertsSuppressionRules": [
4400+
"2019-01-01-preview"
4401+
],
4402+
"Microsoft.Security/assessmentMetadata": [
4403+
"2019-01-01-preview",
4404+
"2020-01-01"
4405+
],
4406+
"Microsoft.Security/assessments": [
4407+
"2019-01-01-preview",
4408+
"2020-01-01"
43814409
],
43824410
"Microsoft.Security/autoProvisioningSettings": [
4411+
"2017-08-01-preview"
4412+
],
4413+
"Microsoft.Security/automations": [
4414+
"2019-01-01-preview"
4415+
],
4416+
"Microsoft.Security/connectors": [
4417+
"2020-01-01-preview"
4418+
],
4419+
"Microsoft.Security/deviceSecurityGroups": [
43834420
"2017-08-01-preview",
4384-
"2018-06-01"
4421+
"2019-08-01"
43854422
],
43864423
"Microsoft.Security/informationProtectionPolicies": [
4424+
"2017-08-01-preview"
4425+
],
4426+
"Microsoft.Security/iotDefenderSettings": [
4427+
"2020-08-06-preview"
4428+
],
4429+
"Microsoft.Security/iotSecuritySolutions": [
43874430
"2017-08-01-preview",
4388-
"2018-06-01"
4431+
"2019-08-01"
4432+
],
4433+
"Microsoft.Security/iotSensors": [
4434+
"2020-08-06-preview"
4435+
],
4436+
"Microsoft.Security/locations/applicationWhitelistings": [
4437+
"2015-06-01-preview",
4438+
"2020-01-01"
43894439
],
43904440
"Microsoft.Security/locations/jitNetworkAccessPolicies": [
4391-
"2015-06-01-preview"
4441+
"2015-06-01-preview",
4442+
"2020-01-01"
43924443
],
43934444
"Microsoft.Security/pricings": [
4445+
"2017-08-01-preview",
43944446
"2017-08-01-preview",
43954447
"2018-06-01"
43964448
],
43974449
"Microsoft.Security/securityContacts": [
43984450
"2017-08-01-preview",
4399-
"2018-06-01"
4451+
"2020-01-01-preview"
44004452
],
4401-
"Microsoft.Security/workspaceSettings": [
4453+
"Microsoft.Security/settings": [
44024454
"2017-08-01-preview",
4403-
"2018-06-01"
4455+
"2019-01-01"
4456+
],
4457+
"Microsoft.Security/workspaceSettings": [
4458+
"2017-08-01-preview"
44044459
],
44054460
"Microsoft.ServiceBus/namespaces": [
44064461
"2015-08-01",
@@ -4409,16 +4464,19 @@
44094464
],
44104465
"Microsoft.ServiceBus/namespaces/AuthorizationRules": [
44114466
"2015-08-01",
4412-
"2017-04-01"
4467+
"2017-04-01",
4468+
"2018-01-01-preview"
44134469
],
44144470
"Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs": [
4415-
"2017-04-01"
4471+
"2017-04-01",
4472+
"2018-01-01-preview"
44164473
],
44174474
"Microsoft.ServiceBus/namespaces/ipfilterrules": [
44184475
"2018-01-01-preview"
44194476
],
44204477
"Microsoft.ServiceBus/namespaces/migrationConfigurations": [
4421-
"2017-04-01"
4478+
"2017-04-01",
4479+
"2018-01-01-preview"
44224480
],
44234481
"Microsoft.ServiceBus/namespaces/networkRuleSets": [
44244482
"2017-04-01",
@@ -4429,26 +4487,32 @@
44294487
],
44304488
"Microsoft.ServiceBus/namespaces/queues": [
44314489
"2015-08-01",
4432-
"2017-04-01"
4490+
"2017-04-01",
4491+
"2018-01-01-preview"
44334492
],
44344493
"Microsoft.ServiceBus/namespaces/queues/authorizationRules": [
44354494
"2015-08-01",
4436-
"2017-04-01"
4495+
"2017-04-01",
4496+
"2018-01-01-preview"
44374497
],
44384498
"Microsoft.ServiceBus/namespaces/topics": [
44394499
"2015-08-01",
4440-
"2017-04-01"
4500+
"2017-04-01",
4501+
"2018-01-01-preview"
44414502
],
44424503
"Microsoft.ServiceBus/namespaces/topics/authorizationRules": [
44434504
"2015-08-01",
4444-
"2017-04-01"
4505+
"2017-04-01",
4506+
"2018-01-01-preview"
44454507
],
44464508
"Microsoft.ServiceBus/namespaces/topics/subscriptions": [
44474509
"2015-08-01",
4448-
"2017-04-01"
4510+
"2017-04-01",
4511+
"2018-01-01-preview"
44494512
],
44504513
"Microsoft.ServiceBus/namespaces/topics/subscriptions/rules": [
4451-
"2017-04-01"
4514+
"2017-04-01",
4515+
"2018-01-01-preview"
44524516
],
44534517
"Microsoft.ServiceBus/namespaces/virtualnetworkrules": [
44544518
"2018-01-01-preview"
@@ -4631,6 +4695,7 @@
46314695
"2017-03-01-preview",
46324696
"2017-10-01-preview",
46334697
"2019-06-01-preview",
4698+
"2020-02-02-preview",
46344699
"2020-08-01-preview"
46354700
],
46364701
"Microsoft.Sql/servers/databases/advisors": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1887,7 +1887,7 @@
18871887
{ "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_topics_subscriptions_rules" },
18881888
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces" },
18891889
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_ipfilterrules" },
1890-
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkrulesets" },
1890+
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkRuleSets" },
18911891
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_virtualnetworkrules" },
18921892
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account" },
18931893
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account_extension" },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,7 @@
20262026
{ "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_topics_subscriptions_rules" },
20272027
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces" },
20282028
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_ipfilterrules" },
2029-
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkrulesets" },
2029+
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_networkRuleSets" },
20302030
{ "$ref": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces_virtualnetworkrules" },
20312031
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account" },
20322032
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.VisualStudio.json#/resourceDefinitions/account_extension" },

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

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -246,17 +246,6 @@
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-
},
260249
"notificationSettings": {
261250
"oneOf": [
262251
{
@@ -399,52 +388,6 @@
399388
},
400389
"description": "Secure LDAP Settings"
401390
},
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-
},
448391
"NotificationSettings": {
449392
"type": "object",
450393
"properties": {

0 commit comments

Comments
 (0)