Skip to content

Commit 5fdbc39

Browse files
authored
Merge pull request #2051 from Azure/autogenerate
Merge Autogenerate
2 parents ef45423 + 9b7ec3b commit 5fdbc39

File tree

43 files changed

+9773
-473
lines changed

Some content is hidden

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

43 files changed

+9773
-473
lines changed

azure-pipelines-autogen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- script: |
5757
set -Eeuxo pipefail
5858
cd generator
59-
npm install
59+
npm ci
6060
displayName: 'Install packages'
6161
6262
- script: |
@@ -87,4 +87,4 @@ jobs:
8787
git commit -m "Update resource list"
8888
git push origin $(Build.SourceBranchName)
8989
fi
90-
displayName: Commit resource list
90+
displayName: Commit resource list

generator/autogenlist.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,16 @@ const autoGenList: AutoGenConfig[] = [
819819
namespace: 'Microsoft.StorSimple',
820820
suffix: '1200'
821821
},
822+
{
823+
basePath: 'resources/resource-manager',
824+
namespace: 'Microsoft.Solutions',
825+
suffix: 'resourcesolutions'
826+
},
827+
{
828+
basePath: 'solutions/resource-manager',
829+
namespace: 'Microsoft.Solutions',
830+
suffix: 'solutions'
831+
},
822832
{
823833
basePath: 'storage/resource-manager',
824834
namespace: 'Microsoft.Storage',

generator/resources.json

Lines changed: 80 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -890,11 +890,7 @@
890890
"2020-05-01"
891891
],
892892
"Microsoft.Authorization/policyExemptions": [
893-
"2020-07-01-preview",
894-
"2021-07-01"
895-
],
896-
"Microsoft.Authorization/policyPricings": [
897-
"2021-07-01"
893+
"2020-07-01-preview"
898894
],
899895
"Microsoft.Authorization/policySetDefinitions": [
900896
"2017-06-01-preview",
@@ -992,6 +988,12 @@
992988
"Microsoft.Automanage/configurationProfilePreferences": [
993989
"2020-06-30-preview"
994990
],
991+
"Microsoft.Automanage/configurationProfiles": [
992+
"2021-04-30-preview"
993+
],
994+
"Microsoft.Automanage/configurationProfiles/versions": [
995+
"2021-04-30-preview"
996+
],
995997
"Microsoft.Automation/automationAccounts": [
996998
"2015-10-31",
997999
"2019-06-01",
@@ -1544,11 +1546,19 @@
15441546
"Microsoft.CognitiveServices/accounts": [
15451547
"2016-02-01-preview",
15461548
"2017-04-18",
1547-
"2021-04-30"
1549+
"2021-04-30",
1550+
"2021-10-01"
1551+
],
1552+
"Microsoft.CognitiveServices/accounts/commitmentPlans": [
1553+
"2021-10-01"
1554+
],
1555+
"Microsoft.CognitiveServices/accounts/deployments": [
1556+
"2021-10-01"
15481557
],
15491558
"Microsoft.CognitiveServices/accounts/privateEndpointConnections": [
15501559
"2017-04-18",
1551-
"2021-04-30"
1560+
"2021-04-30",
1561+
"2021-10-01"
15521562
],
15531563
"Microsoft.Communication/communicationServices": [
15541564
"2020-08-20",
@@ -1857,12 +1867,14 @@
18571867
"Microsoft.Confluent/agreements": [
18581868
"2020-03-01",
18591869
"2020-03-01-preview",
1860-
"2021-03-01-preview"
1870+
"2021-03-01-preview",
1871+
"2021-09-01-preview"
18611872
],
18621873
"Microsoft.Confluent/organizations": [
18631874
"2020-03-01",
18641875
"2020-03-01-preview",
1865-
"2021-03-01-preview"
1876+
"2021-03-01-preview",
1877+
"2021-09-01-preview"
18661878
],
18671879
"Microsoft.ConnectedVMwarevSphere/clusters": [
18681880
"2020-10-01-preview"
@@ -2919,7 +2931,9 @@
29192931
"2021-03-03-preview",
29202932
"2021-03-31",
29212933
"2021-07-01",
2922-
"2021-07-01-preview"
2934+
"2021-07-01-preview",
2935+
"2021-07-02",
2936+
"2021-07-02-preview"
29232937
],
29242938
"Microsoft.Devices/IotHubs/certificates": [
29252939
"2017-07-01",
@@ -2941,7 +2955,9 @@
29412955
"2021-03-03-preview",
29422956
"2021-03-31",
29432957
"2021-07-01",
2944-
"2021-07-01-preview"
2958+
"2021-07-01-preview",
2959+
"2021-07-02",
2960+
"2021-07-02-preview"
29452961
],
29462962
"Microsoft.Devices/IotHubs/eventHubEndpoints/ConsumerGroups": [
29472963
"2016-02-03",
@@ -2965,7 +2981,9 @@
29652981
"2021-03-03-preview",
29662982
"2021-03-31",
29672983
"2021-07-01",
2968-
"2021-07-01-preview"
2984+
"2021-07-01-preview",
2985+
"2021-07-02",
2986+
"2021-07-02-preview"
29692987
],
29702988
"Microsoft.Devices/iotHubs/privateEndpointConnections": [
29712989
"2020-03-01",
@@ -2979,27 +2997,32 @@
29792997
"2021-03-03-preview",
29802998
"2021-03-31",
29812999
"2021-07-01",
2982-
"2021-07-01-preview"
3000+
"2021-07-01-preview",
3001+
"2021-07-02",
3002+
"2021-07-02-preview"
29833003
],
29843004
"Microsoft.Devices/provisioningServices": [
29853005
"2017-08-21-preview",
29863006
"2017-11-15",
29873007
"2018-01-22",
29883008
"2020-01-01",
29893009
"2020-03-01",
2990-
"2020-09-01-preview"
3010+
"2020-09-01-preview",
3011+
"2021-10-15"
29913012
],
29923013
"Microsoft.Devices/provisioningServices/certificates": [
29933014
"2017-08-21-preview",
29943015
"2017-11-15",
29953016
"2018-01-22",
29963017
"2020-01-01",
29973018
"2020-03-01",
2998-
"2020-09-01-preview"
3019+
"2020-09-01-preview",
3020+
"2021-10-15"
29993021
],
30003022
"Microsoft.Devices/provisioningServices/privateEndpointConnections": [
30013023
"2020-03-01",
3002-
"2020-09-01-preview"
3024+
"2020-09-01-preview",
3025+
"2021-10-15"
30033026
],
30043027
"Microsoft.DigitalTwins/digitalTwinsInstances": [
30053028
"2020-03-01-preview",
@@ -3845,7 +3868,8 @@
38453868
"2020-10-20-preview",
38463869
"2020-12-08",
38473870
"2020-12-08-preview",
3848-
"2021-06-10"
3871+
"2021-06-10",
3872+
"2021-08-24"
38493873
],
38503874
"Microsoft.HealthcareApis/services": [
38513875
"2018-08-20-preview",
@@ -4026,7 +4050,8 @@
40264050
"Microsoft.Insights/scheduledQueryRules": [
40274051
"2018-04-16",
40284052
"2020-05-01-preview",
4029-
"2021-02-01-preview"
4053+
"2021-02-01-preview",
4054+
"2021-08-01"
40304055
],
40314056
"Microsoft.Insights/webtests": [
40324057
"2014-04-01",
@@ -4062,12 +4087,6 @@
40624087
"Microsoft.IoTSecurity/locations/deviceGroups": [
40634088
"2021-02-01-preview"
40644089
],
4065-
"Microsoft.IoTSecurity/locations/sites": [
4066-
"2021-09-01-preview"
4067-
],
4068-
"Microsoft.IoTSecurity/locations/sites/sensors": [
4069-
"2021-09-01-preview"
4070-
],
40714090
"Microsoft.IoTSecurity/onPremiseSensors": [
40724091
"2021-02-01-preview"
40734092
],
@@ -4547,12 +4566,14 @@
45474566
"2018-05-01",
45484567
"2020-02-01-preview",
45494568
"2021-02-01",
4550-
"2021-07-01-preview"
4569+
"2021-07-01-preview",
4570+
"2021-12-01-preview"
45514571
],
45524572
"Microsoft.Maps/accounts/creators": [
45534573
"2020-02-01-preview",
45544574
"2021-02-01",
4555-
"2021-07-01-preview"
4575+
"2021-07-01-preview",
4576+
"2021-12-01-preview"
45564577
],
45574578
"Microsoft.Maps/accounts/privateAtlases": [
45584579
"2020-02-01-preview"
@@ -6481,7 +6502,10 @@
64816502
"2018-07-01-preview",
64826503
"2019-07-01",
64836504
"2019-07-01",
6484-
"2019-07-01"
6505+
"2019-07-01",
6506+
"2021-10-01",
6507+
"2021-10-01",
6508+
"2021-10-01"
64856509
],
64866510
"Microsoft.Portal/dashboards": [
64876511
"2015-08-01-preview",
@@ -7323,33 +7347,39 @@
73237347
"2020-01-01-preview",
73247348
"2021-01-01-preview",
73257349
"2021-05-01",
7326-
"2021-07-01-preview"
7350+
"2021-07-01-preview",
7351+
"2021-11-01-preview"
73277352
],
73287353
"Microsoft.ServiceFabric/managedClusters/nodeTypes": [
73297354
"2020-01-01-preview",
73307355
"2021-01-01-preview",
73317356
"2021-05-01",
7332-
"2021-07-01-preview"
7357+
"2021-07-01-preview",
7358+
"2021-11-01-preview"
73337359
],
73347360
"Microsoft.ServiceFabric/managedclusters/applicationTypes": [
73357361
"2021-01-01-preview",
73367362
"2021-05-01",
7337-
"2021-07-01-preview"
7363+
"2021-07-01-preview",
7364+
"2021-11-01-preview"
73387365
],
73397366
"Microsoft.ServiceFabric/managedclusters/applicationTypes/versions": [
73407367
"2021-01-01-preview",
73417368
"2021-05-01",
7342-
"2021-07-01-preview"
7369+
"2021-07-01-preview",
7370+
"2021-11-01-preview"
73437371
],
73447372
"Microsoft.ServiceFabric/managedclusters/applications": [
73457373
"2021-01-01-preview",
73467374
"2021-05-01",
7347-
"2021-07-01-preview"
7375+
"2021-07-01-preview",
7376+
"2021-11-01-preview"
73487377
],
73497378
"Microsoft.ServiceFabric/managedclusters/applications/services": [
73507379
"2021-01-01-preview",
73517380
"2021-05-01",
7352-
"2021-07-01-preview"
7381+
"2021-07-01-preview",
7382+
"2021-11-01-preview"
73537383
],
73547384
"Microsoft.ServiceFabricMesh/applications": [
73557385
"2018-07-01-preview",
@@ -8296,31 +8326,40 @@
82968326
"Microsoft.StreamAnalytics/streamingjobs": [
82978327
"2016-03-01",
82988328
"2017-04-01-preview",
8299-
"2020-03-01"
8329+
"2020-03-01",
8330+
"2021-10-01-preview"
83008331
],
83018332
"Microsoft.StreamAnalytics/streamingjobs/functions": [
83028333
"2016-03-01",
83038334
"2017-04-01-preview",
8304-
"2020-03-01"
8335+
"2020-03-01",
8336+
"2021-10-01-preview"
83058337
],
83068338
"Microsoft.StreamAnalytics/streamingjobs/inputs": [
83078339
"2016-03-01",
83088340
"2017-04-01-preview",
8309-
"2020-03-01"
8341+
"2020-03-01",
8342+
"2021-10-01-preview"
83108343
],
83118344
"Microsoft.StreamAnalytics/streamingjobs/outputs": [
83128345
"2016-03-01",
83138346
"2017-04-01-preview",
8314-
"2020-03-01"
8347+
"2020-03-01",
8348+
"2021-10-01-preview"
83158349
],
83168350
"Microsoft.StreamAnalytics/streamingjobs/transformations": [
83178351
"2016-03-01",
83188352
"2017-04-01-preview",
8319-
"2020-03-01"
8353+
"2020-03-01",
8354+
"2021-10-01-preview"
83208355
],
83218356
"Microsoft.Subscription/aliases": [
83228357
"2019-10-01-preview",
8323-
"2020-09-01"
8358+
"2020-09-01",
8359+
"2021-10-01"
8360+
],
8361+
"Microsoft.Subscription/policies": [
8362+
"2021-10-01"
83248363
],
83258364
"Microsoft.Subscription/subscriptionDefinitions": [
83268365
"2017-11-01-preview"
@@ -8696,7 +8735,8 @@
86968735
"2019-08-09-preview"
86978736
],
86988737
"Microsoft.VideoIndexer/accounts": [
8699-
"2021-10-18-preview"
8738+
"2021-10-18-preview",
8739+
"2021-10-27-preview"
87008740
],
87018741
"Microsoft.VirtualMachineImages/imageTemplates": [
87028742
"2018-02-01-preview",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,10 +1344,10 @@
13441344
"$ref": "https://schema.management.azure.com/schemas/2019-05-01/Microsoft.Resources.json#/resourceDefinitions/deployments"
13451345
},
13461346
{
1347-
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/applianceDefinitions"
1347+
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/applianceDefinitions"
13481348
},
13491349
{
1350-
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/appliances"
1350+
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/appliances"
13511351
},
13521352
{
13531353
"$ref": "https://schema.management.azure.com/schemas/2016-07-07/Microsoft.ApiManagement.json#/resourceDefinitions/service"

schemas/2015-01-01/deploymentTemplate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,10 +1576,10 @@
15761576
"$ref": "https://schema.management.azure.com/schemas/2017-05-10/Microsoft.Resources.json#/resourceDefinitions/deployments"
15771577
},
15781578
{
1579-
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/applianceDefinitions"
1579+
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/applianceDefinitions"
15801580
},
15811581
{
1582-
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/appliances"
1582+
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/appliances"
15831583
},
15841584
{
15851585
"$ref": "https://schema.management.azure.com/schemas/2016-07-07/Microsoft.ApiManagement.json#/resourceDefinitions/service"

schemas/2015-07-01/Microsoft.Authorization.Authz.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"name": {
1818
"type": "string",
19-
"description": "The name of the role assignment to create. It can be any valid GUID."
19+
"description": "A GUID for the role assignment to create. The name must be unique and different for each role assignment."
2020
},
2121
"properties": {
2222
"oneOf": [

schemas/2016-09-01-preview/Microsoft.Solutions.json renamed to schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#",
2+
"id": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#",
33
"$schema": "http://json-schema.org/draft-04/schema#",
44
"title": "Microsoft.Solutions",
55
"description": "Microsoft Solutions Resource Types",

schemas/2017-09-01/Microsoft.Solutions.json renamed to schemas/2017-09-01/Microsoft.Solutions.resourcesolutions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Solutions.json#",
2+
"id": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Solutions.resourcesolutions.json#",
33
"$schema": "http://json-schema.org/draft-04/schema#",
44
"title": "Microsoft.Solutions",
55
"description": "Microsoft Solutions Resource Types",

schemas/2017-10-01-preview/Microsoft.Authorization.Authz.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"name": {
1818
"type": "string",
19-
"description": "The name of the role assignment to create. It can be any valid GUID."
19+
"description": "A GUID for the role assignment to create. The name must be unique and different for each role assignment."
2020
},
2121
"properties": {
2222
"oneOf": [

schemas/2018-01-01-preview/Microsoft.Authorization.Authz.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"name": {
1818
"type": "string",
19-
"description": "The name of the role assignment to create. It can be any valid GUID."
19+
"description": "A GUID for the role assignment to create. The name must be unique and different for each role assignment."
2020
},
2121
"properties": {
2222
"oneOf": [

0 commit comments

Comments
 (0)