Skip to content

Commit 2533c6d

Browse files
jorgecotillojorgecotillo
authored
Merge pull request #1453 from Azure/autogenerate
Merge Autogenerate
2 parents 55af2a6 + f2ff5da commit 2533c6d

File tree

67 files changed

+6296
-171
lines changed

Some content is hidden

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

67 files changed

+6296
-171
lines changed

‎generator/resources.json‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
"2020-03-20",
99
"2020-07-17-preview"
1010
],
11+
"Microsoft.AVS/privateClouds/addons": [
12+
"2020-07-17-preview"
13+
],
1114
"Microsoft.AVS/privateClouds/authorizations": [
1215
"2020-03-20",
1316
"2020-07-17-preview"
@@ -495,7 +498,8 @@
495498
"2020-06-01-preview"
496499
],
497500
"Microsoft.ApiManagement/service/tenant": [
498-
"2016-10-10"
501+
"2016-10-10",
502+
"2020-06-01-preview"
499503
],
500504
"Microsoft.ApiManagement/service/users": [
501505
"2016-07-07",
@@ -520,33 +524,41 @@
520524
],
521525
"Microsoft.AppPlatform/Spring": [
522526
"2019-05-01-preview",
523-
"2020-07-01"
527+
"2020-07-01",
528+
"2020-11-01-preview"
524529
],
525530
"Microsoft.AppPlatform/Spring/apps": [
526531
"2019-05-01-preview",
527-
"2020-07-01"
532+
"2020-07-01",
533+
"2020-11-01-preview"
528534
],
529535
"Microsoft.AppPlatform/Spring/apps/bindings": [
530536
"2019-05-01-preview",
531-
"2020-07-01"
537+
"2020-07-01",
538+
"2020-11-01-preview"
532539
],
533540
"Microsoft.AppPlatform/Spring/apps/deployments": [
534541
"2019-05-01-preview",
535-
"2020-07-01"
542+
"2020-07-01",
543+
"2020-11-01-preview"
536544
],
537545
"Microsoft.AppPlatform/Spring/apps/domains": [
538546
"2019-05-01-preview",
539-
"2020-07-01"
547+
"2020-07-01",
548+
"2020-11-01-preview"
540549
],
541550
"Microsoft.AppPlatform/Spring/certificates": [
542551
"2019-05-01-preview",
543-
"2020-07-01"
552+
"2020-07-01",
553+
"2020-11-01-preview"
544554
],
545555
"Microsoft.AppPlatform/Spring/configServers": [
546-
"2020-07-01"
556+
"2020-07-01",
557+
"2020-11-01-preview"
547558
],
548559
"Microsoft.AppPlatform/Spring/monitoringSettings": [
549-
"2020-07-01"
560+
"2020-07-01",
561+
"2020-11-01-preview"
550562
],
551563
"Microsoft.Attestation/attestationProviders": [
552564
"2018-09-01-preview",
@@ -1205,7 +1217,8 @@
12051217
"2020-06-01",
12061218
"2020-07-01",
12071219
"2020-09-01",
1208-
"2020-11-01"
1220+
"2020-11-01",
1221+
"2020-12-01"
12091222
],
12101223
"Microsoft.ContainerService/managedClusters/agentPools": [
12111224
"2019-02-01",
@@ -1221,13 +1234,18 @@
12211234
"2020-06-01",
12221235
"2020-07-01",
12231236
"2020-09-01",
1224-
"2020-11-01"
1237+
"2020-11-01",
1238+
"2020-12-01"
1239+
],
1240+
"Microsoft.ContainerService/managedClusters/maintenanceConfigurations": [
1241+
"2020-12-01"
12251242
],
12261243
"Microsoft.ContainerService/managedClusters/privateEndpointConnections": [
12271244
"2020-06-01",
12281245
"2020-07-01",
12291246
"2020-09-01",
1230-
"2020-11-01"
1247+
"2020-11-01",
1248+
"2020-12-01"
12311249
],
12321250
"Microsoft.ContainerService/openShiftManagedClusters": [
12331251
"2018-09-30-preview",
@@ -1262,7 +1280,7 @@
12621280
"2017-12-01",
12631281
"2017-12-01-preview"
12641282
],
1265-
"Microsoft.DBForMySQL/servers/Administrators": [
1283+
"Microsoft.DBForMySQL/servers/administrators": [
12661284
"2017-12-01",
12671285
"2017-12-01-preview"
12681286
],
@@ -1286,7 +1304,7 @@
12861304
"2017-12-01",
12871305
"2017-12-01-preview"
12881306
],
1289-
"Microsoft.DBForPostgreSQL/servers/Administrators": [
1307+
"Microsoft.DBForPostgreSQL/servers/administrators": [
12901308
"2017-12-01",
12911309
"2017-12-01-preview"
12921310
],
@@ -1604,7 +1622,8 @@
16041622
"2020-11-02-preview"
16051623
],
16061624
"Microsoft.DevOps/pipelines": [
1607-
"2019-07-01-preview"
1625+
"2019-07-01-preview",
1626+
"2020-07-13-preview"
16081627
],
16091628
"Microsoft.DevSpaces/controllers": [
16101629
"2019-04-01"
@@ -2343,7 +2362,7 @@
23432362
"Microsoft.Intune/locations/iosPolicies/groups": [
23442363
"2015-01-14-preview"
23452364
],
2346-
"Microsoft.IoTCentral/IoTApps": [
2365+
"Microsoft.IoTCentral/iotApps": [
23472366
"2018-09-01"
23482367
],
23492368
"Microsoft.IoTSpaces/Graph": [
@@ -4987,12 +5006,14 @@
49875006
"Microsoft.StorageCache/caches": [
49885007
"2019-08-01-preview",
49895008
"2019-11-01",
4990-
"2020-03-01"
5009+
"2020-03-01",
5010+
"2020-10-01"
49915011
],
49925012
"Microsoft.StorageCache/caches/storageTargets": [
49935013
"2019-08-01-preview",
49945014
"2019-11-01",
4995-
"2020-03-01"
5015+
"2020-03-01",
5016+
"2020-10-01"
49965017
],
49975018
"Microsoft.StorageSync/storageSyncServices": [
49985019
"2017-06-05-preview",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@
17641764
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries" },
17651765
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images" },
17661766
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images_versions" },
1767-
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/IoTApps" },
1767+
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/iotApps" },
17681768
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Maps.json#/resourceDefinitions/accounts" },
17691769
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces" },
17701770
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces_clusters" },

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -902,14 +902,14 @@
902902
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_firewallRules" },
903903
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_virtualNetworkRules" },
904904
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_securityAlertPolicies" },
905-
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_Administrators" },
905+
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_administrators" },
906906
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers" },
907907
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_configurations" },
908908
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_databases" },
909909
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_firewallRules" },
910910
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_virtualNetworkRules" },
911911
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_securityAlertPolicies" },
912-
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_Administrators" },
912+
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_administrators" },
913913
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/servers" },
914914
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_configurations" },
915915
{ "$ref": "https://schema.management.azure.com/schemas/2017-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_databases" },
@@ -1903,7 +1903,7 @@
19031903
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries" },
19041904
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images" },
19051905
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Compute.Galleries.json#/resourceDefinitions/galleries_images_versions" },
1906-
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/IoTApps" },
1906+
{ "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IotCentral.json#/resourceDefinitions/iotApps" },
19071907
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Maps.json#/resourceDefinitions/accounts" },
19081908
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces" },
19091909
{ "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.BatchAI.json#/resourceDefinitions/workspaces_clusters" },

‎schemas/2015-10-31/Microsoft.Automation.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2801,4 +2801,4 @@
28012801
"description": "The properties of the create webhook operation."
28022802
}
28032803
}
2804-
}
2804+
}

‎schemas/2016-02-03/Microsoft.Devices.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,4 +542,4 @@
542542
"description": "The properties of the Azure Storage endpoint for file upload."
543543
}
544544
}
545-
}
545+
}

‎schemas/2016-05-16/Microsoft.AnalysisServices.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,51 @@
104104
"backupBlobContainerUri": {
105105
"type": "string",
106106
"description": "The container URI of backup blob."
107+
},
108+
"managedMode": {
109+
"oneOf": [
110+
{
111+
"type": "integer",
112+
"default": "1"
113+
},
114+
{
115+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
116+
}
117+
],
118+
"description": "The managed mode of the server (0 = not managed, 1 = managed)."
119+
},
120+
"serverMonitorMode": {
121+
"oneOf": [
122+
{
123+
"type": "integer",
124+
"default": "1"
125+
},
126+
{
127+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
128+
}
129+
],
130+
"description": "The server monitor mode for AS server"
107131
}
108132
},
109133
"description": "Properties of Analysis Services resource."
110134
},
111135
"ResourceSku": {
112136
"type": "object",
113137
"properties": {
138+
"capacity": {
139+
"oneOf": [
140+
{
141+
"type": "integer",
142+
"minimum": 1,
143+
"maximum": 8,
144+
"default": "1"
145+
},
146+
{
147+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
148+
}
149+
],
150+
"description": "The number of instances in the read only query pool."
151+
},
114152
"name": {
115153
"type": "string",
116154
"description": "Name of the SKU level."

‎schemas/2017-01-19/Microsoft.Devices.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,4 +872,4 @@
872872
"description": "The properties of the Azure Storage endpoint for file upload."
873873
}
874874
}
875-
}
875+
}

‎schemas/2017-05-15-preview/Microsoft.Automation.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,4 +1047,4 @@
10471047
"description": "Windows specific update configuration."
10481048
}
10491049
}
1050-
}
1050+
}

‎schemas/2017-07-01/Microsoft.Devices.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,4 +1047,4 @@
10471047
"description": "The properties of the Azure Storage endpoint for file upload."
10481048
}
10491049
}
1050-
}
1050+
}

‎schemas/2017-07-14/Microsoft.AnalysisServices.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,30 @@
115115
}
116116
],
117117
"description": "The gateway details."
118+
},
119+
"managedMode": {
120+
"oneOf": [
121+
{
122+
"type": "integer",
123+
"default": "1"
124+
},
125+
{
126+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
127+
}
128+
],
129+
"description": "The managed mode of the server (0 = not managed, 1 = managed)."
130+
},
131+
"serverMonitorMode": {
132+
"oneOf": [
133+
{
134+
"type": "integer",
135+
"default": "1"
136+
},
137+
{
138+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
139+
}
140+
],
141+
"description": "The server monitor mode for AS server"
118142
}
119143
},
120144
"description": "Properties of Analysis Services resource."

0 commit comments

Comments
 (0)