Skip to content

Commit 7a2cb3e

Browse files
anthony-c-martinanthony-c-martin
authored
Merge pull request #1178 from Azure/autogenerate
Autogenerate merge
2 parents 85ebda1 + 2be02eb commit 7a2cb3e

File tree

21 files changed

+7673
-49
lines changed

21 files changed

+7673
-49
lines changed

‎generator/resources.json‎

Lines changed: 59 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
"Microsoft.AlertsManagement/actionRules": [
4242
"2019-05-05-preview"
4343
],
44+
"Microsoft.AlertsManagement/resourceHealthAlerts": [
45+
"2020-08-04-preview"
46+
],
4447
"Microsoft.AnalysisServices/servers": [
4548
"2016-05-16",
4649
"2017-07-14",
@@ -445,22 +448,34 @@
445448
"2020-06-01"
446449
],
447450
"Microsoft.AppPlatform/Spring": [
448-
"2019-05-01-preview"
451+
"2019-05-01-preview",
452+
"2020-07-01"
449453
],
450454
"Microsoft.AppPlatform/Spring/apps": [
451-
"2019-05-01-preview"
455+
"2019-05-01-preview",
456+
"2020-07-01"
452457
],
453458
"Microsoft.AppPlatform/Spring/apps/bindings": [
454-
"2019-05-01-preview"
459+
"2019-05-01-preview",
460+
"2020-07-01"
455461
],
456462
"Microsoft.AppPlatform/Spring/apps/deployments": [
457-
"2019-05-01-preview"
463+
"2019-05-01-preview",
464+
"2020-07-01"
458465
],
459466
"Microsoft.AppPlatform/Spring/apps/domains": [
460-
"2019-05-01-preview"
467+
"2019-05-01-preview",
468+
"2020-07-01"
461469
],
462470
"Microsoft.AppPlatform/Spring/certificates": [
463-
"2019-05-01-preview"
471+
"2019-05-01-preview",
472+
"2020-07-01"
473+
],
474+
"Microsoft.AppPlatform/Spring/configServers": [
475+
"2020-07-01"
476+
],
477+
"Microsoft.AppPlatform/Spring/monitoringSettings": [
478+
"2020-07-01"
464479
],
465480
"Microsoft.Attestation/attestationProviders": [
466481
"2018-09-01-preview"
@@ -1186,7 +1201,8 @@
11861201
],
11871202
"Microsoft.DataBox/jobs": [
11881203
"2018-01-01",
1189-
"2019-09-01"
1204+
"2019-09-01",
1205+
"2020-04-01"
11901206
],
11911207
"Microsoft.DataBoxEdge/dataBoxEdgeDevices": [
11921208
"2019-03-01",
@@ -1502,7 +1518,9 @@
15021518
"2019-07-01-preview",
15031519
"2019-11-04",
15041520
"2020-03-01",
1505-
"2020-04-01"
1521+
"2020-04-01",
1522+
"2020-06-15",
1523+
"2020-07-10-preview"
15061524
],
15071525
"Microsoft.Devices/IotHubs/certificates": [
15081526
"2017-07-01",
@@ -1514,7 +1532,9 @@
15141532
"2019-07-01-preview",
15151533
"2019-11-04",
15161534
"2020-03-01",
1517-
"2020-04-01"
1535+
"2020-04-01",
1536+
"2020-06-15",
1537+
"2020-07-10-preview"
15181538
],
15191539
"Microsoft.Devices/IotHubs/eventHubEndpoints/ConsumerGroups": [
15201540
"2016-02-03",
@@ -1528,11 +1548,15 @@
15281548
"2019-07-01-preview",
15291549
"2019-11-04",
15301550
"2020-03-01",
1531-
"2020-04-01"
1551+
"2020-04-01",
1552+
"2020-06-15",
1553+
"2020-07-10-preview"
15321554
],
15331555
"Microsoft.Devices/iotHubs/privateEndpointConnections": [
15341556
"2020-03-01",
1535-
"2020-04-01"
1557+
"2020-04-01",
1558+
"2020-06-15",
1559+
"2020-07-10-preview"
15361560
],
15371561
"Microsoft.Devices/provisioningServices": [
15381562
"2017-08-21-preview",
@@ -1956,11 +1980,24 @@
19561980
],
19571981
"Microsoft.HybridCompute/machines": [
19581982
"2019-12-12",
1959-
"2020-07-30-preview"
1983+
"2020-07-30-preview",
1984+
"2020-08-02",
1985+
"2020-08-15-preview"
19601986
],
19611987
"Microsoft.HybridCompute/machines/extensions": [
19621988
"2019-12-12",
1963-
"2020-07-30-preview"
1989+
"2020-07-30-preview",
1990+
"2020-08-02",
1991+
"2020-08-15-preview"
1992+
],
1993+
"Microsoft.HybridCompute/privateLinkScopes": [
1994+
"2020-08-15-preview"
1995+
],
1996+
"Microsoft.HybridCompute/privateLinkScopes/privateEndpointConnections": [
1997+
"2020-08-15-preview"
1998+
],
1999+
"Microsoft.HybridCompute/privateLinkScopes/scopedResources": [
2000+
"2020-08-15-preview"
19642001
],
19652002
"Microsoft.HybridData/dataManagers": [
19662003
"2016-06-01",
@@ -4181,11 +4218,15 @@
41814218
],
41824219
"Microsoft.Sql/managedInstances": [
41834220
"2015-05-01-preview",
4184-
"2018-06-01-preview"
4221+
"2018-06-01-preview",
4222+
"2020-02-02-preview"
41854223
],
41864224
"Microsoft.Sql/managedInstances/administrators": [
41874225
"2017-03-01-preview"
41884226
],
4227+
"Microsoft.Sql/managedInstances/azureADOnlyAuthentications": [
4228+
"2020-02-02-preview"
4229+
],
41894230
"Microsoft.Sql/managedInstances/databases": [
41904231
"2017-03-01-preview",
41914232
"2018-06-01-preview",
@@ -4274,7 +4315,8 @@
42744315
"2017-03-01-preview"
42754316
],
42764317
"Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies": [
4277-
"2017-10-01-preview"
4318+
"2017-10-01-preview",
4319+
"2020-02-02-preview"
42784320
],
42794321
"Microsoft.Sql/servers/databases/connectionPolicies": [
42804322
"2014-04-01"
@@ -4608,7 +4650,8 @@
46084650
"2016-03-01"
46094651
],
46104652
"Microsoft.Subscription/aliases": [
4611-
"2019-10-01-preview"
4653+
"2019-10-01-preview",
4654+
"2020-09-01"
46124655
],
46134656
"Microsoft.Subscription/subscriptionDefinitions": [
46144657
"2017-11-01-preview"

‎schemas/2017-12-01/Microsoft.DBforMySQL.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@
12731273
},
12741274
"name": {
12751275
"type": "string",
1276-
"description": "The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8."
1276+
"description": "The name of the sku, e.g. Standard_D32s_v3."
12771277
},
12781278
"size": {
12791279
"type": "string",
@@ -1286,7 +1286,8 @@
12861286
"enum": [
12871287
"Basic",
12881288
"GeneralPurpose",
1289-
"MemoryOptimized"
1289+
"MemoryOptimized",
1290+
"Burstable"
12901291
]
12911292
},
12921293
{

‎schemas/2017-12-01/Microsoft.DBforPostgreSQL.json‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"sku": {
7272
"oneOf": [
7373
{
74-
"$ref": "#/definitions/Sku"
74+
"$ref": "#/definitions/SkuModel"
7575
},
7676
{
7777
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -172,7 +172,7 @@
172172
"properties": {
173173
"oneOf": [
174174
{
175-
"$ref": "#/definitions/ConfigurationProperties"
175+
"$ref": "#/definitions/ConfigurationPropertiesModel"
176176
},
177177
{
178178
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -361,7 +361,7 @@
361361
}
362362
},
363363
"definitions": {
364-
"ConfigurationProperties": {
364+
"ConfigurationPropertiesModel": {
365365
"type": "object",
366366
"properties": {
367367
"source": {
@@ -661,7 +661,7 @@
661661
"storageProfile": {
662662
"oneOf": [
663663
{
664-
"$ref": "#/definitions/StorageProfile"
664+
"$ref": "#/definitions/StorageProfileModel"
665665
},
666666
{
667667
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -679,7 +679,8 @@
679679
"10",
680680
"10.0",
681681
"10.2",
682-
"11"
682+
"11",
683+
"12"
683684
]
684685
},
685686
{
@@ -840,7 +841,7 @@
840841
"properties": {
841842
"oneOf": [
842843
{
843-
"$ref": "#/definitions/ConfigurationProperties"
844+
"$ref": "#/definitions/ConfigurationPropertiesModel"
844845
},
845846
{
846847
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1022,7 +1023,7 @@
10221023
],
10231024
"description": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules"
10241025
},
1025-
"Sku": {
1026+
"SkuModel": {
10261027
"type": "object",
10271028
"properties": {
10281029
"capacity": {
@@ -1043,7 +1044,7 @@
10431044
},
10441045
"name": {
10451046
"type": "string",
1046-
"description": "The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8."
1047+
"description": "The name of the sku, typically, tier + family + cores, e.g. Standard_D4s_v3."
10471048
},
10481049
"size": {
10491050
"type": "string",
@@ -1056,7 +1057,8 @@
10561057
"enum": [
10571058
"Basic",
10581059
"GeneralPurpose",
1059-
"MemoryOptimized"
1060+
"MemoryOptimized",
1061+
"Burstable"
10601062
]
10611063
},
10621064
{
@@ -1068,7 +1070,7 @@
10681070
},
10691071
"description": "Billing information related properties of a server."
10701072
},
1071-
"StorageProfile": {
1073+
"StorageProfileModel": {
10721074
"type": "object",
10731075
"properties": {
10741076
"backupRetentionDays": {

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

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5878,6 +5878,12 @@
58785878
},
58795879
{
58805880
"$ref": "#/definitions/DatasetZipDeflateCompression"
5881+
},
5882+
{
5883+
"$ref": "#/definitions/DatasetTarCompression"
5884+
},
5885+
{
5886+
"$ref": "#/definitions/DatasetTarGZipCompression"
58815887
}
58825888
],
58835889
"properties": {
@@ -6058,6 +6064,41 @@
60586064
},
60596065
"description": "The format definition of a storage."
60606066
},
6067+
"DatasetTarCompression": {
6068+
"type": "object",
6069+
"properties": {
6070+
"type": {
6071+
"type": "string",
6072+
"enum": [
6073+
"Tar"
6074+
]
6075+
}
6076+
},
6077+
"required": [
6078+
"type"
6079+
],
6080+
"description": "The Tar archive method used on a dataset."
6081+
},
6082+
"DatasetTarGZipCompression": {
6083+
"type": "object",
6084+
"properties": {
6085+
"level": {
6086+
"type": "object",
6087+
"properties": {},
6088+
"description": "The TarGZip compression level."
6089+
},
6090+
"type": {
6091+
"type": "string",
6092+
"enum": [
6093+
"TarGZip"
6094+
]
6095+
}
6096+
},
6097+
"required": [
6098+
"type"
6099+
],
6100+
"description": "The TarGZip compression method used on a dataset."
6101+
},
60616102
"DatasetZipDeflateCompression": {
60626103
"type": "object",
60636104
"properties": {
@@ -6355,7 +6396,9 @@
63556396
"bzip2",
63566397
"deflate",
63576398
"zipDeflate",
6358-
"lz4"
6399+
"lz4",
6400+
"tar",
6401+
"tarGZip"
63596402
]
63606403
},
63616404
{
@@ -14374,7 +14417,9 @@
1437414417
"bzip2",
1437514418
"deflate",
1437614419
"zipDeflate",
14377-
"lz4"
14420+
"lz4",
14421+
"tar",
14422+
"tarGZip"
1437814423
]
1437914424
},
1438014425
{

‎schemas/2019-08-01/tenantDeploymentTemplate.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,9 @@
245245
},
246246
{
247247
"$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Subscription.json#/tenant_resourceDefinitions/aliases"
248+
},
249+
{
250+
"$ref": "https://schema.management.azure.com/schemas/2020-09-01/Microsoft.Subscription.json#/tenant_resourceDefinitions/aliases"
248251
}
249252
]
250253
}

‎schemas/2019-12-12/Microsoft.HybridCompute.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"identity": {
1717
"oneOf": [
1818
{
19-
"$ref": "#/definitions/MachineIdentity"
19+
"$ref": "#/definitions/MachineIdentityModel"
2020
},
2121
{
2222
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -34,7 +34,7 @@
3434
"properties": {
3535
"oneOf": [
3636
{
37-
"$ref": "#/definitions/MachinePropertiesModel"
37+
"$ref": "#/definitions/MachinePropertiesModelModelModel"
3838
},
3939
{
4040
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -321,7 +321,7 @@
321321
},
322322
"description": "The machine extension instance view."
323323
},
324-
"MachineIdentity": {
324+
"MachineIdentityModel": {
325325
"type": "object",
326326
"properties": {
327327
"type": {
@@ -340,7 +340,7 @@
340340
}
341341
}
342342
},
343-
"MachinePropertiesModel": {
343+
"MachinePropertiesModelModelModel": {
344344
"type": "object",
345345
"properties": {
346346
"clientPublicKey": {

0 commit comments

Comments
 (0)