Skip to content

Commit

Permalink
Merge pull request #2051 from Azure/autogenerate
Browse files Browse the repository at this point in the history
Merge Autogenerate
  • Loading branch information
jorgecotillo authored Nov 12, 2021
2 parents ef45423 + 9b7ec3b commit 5fdbc39
Show file tree
Hide file tree
Showing 43 changed files with 9,773 additions and 473 deletions.
4 changes: 2 additions & 2 deletions azure-pipelines-autogen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- script: |
set -Eeuxo pipefail
cd generator
npm install
npm ci
displayName: 'Install packages'
- script: |
Expand Down Expand Up @@ -87,4 +87,4 @@ jobs:
git commit -m "Update resource list"
git push origin $(Build.SourceBranchName)
fi
displayName: Commit resource list
displayName: Commit resource list
10 changes: 10 additions & 0 deletions generator/autogenlist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,16 @@ const autoGenList: AutoGenConfig[] = [
namespace: 'Microsoft.StorSimple',
suffix: '1200'
},
{
basePath: 'resources/resource-manager',
namespace: 'Microsoft.Solutions',
suffix: 'resourcesolutions'
},
{
basePath: 'solutions/resource-manager',
namespace: 'Microsoft.Solutions',
suffix: 'solutions'
},
{
basePath: 'storage/resource-manager',
namespace: 'Microsoft.Storage',
Expand Down
120 changes: 80 additions & 40 deletions generator/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -890,11 +890,7 @@
"2020-05-01"
],
"Microsoft.Authorization/policyExemptions": [
"2020-07-01-preview",
"2021-07-01"
],
"Microsoft.Authorization/policyPricings": [
"2021-07-01"
"2020-07-01-preview"
],
"Microsoft.Authorization/policySetDefinitions": [
"2017-06-01-preview",
Expand Down Expand Up @@ -992,6 +988,12 @@
"Microsoft.Automanage/configurationProfilePreferences": [
"2020-06-30-preview"
],
"Microsoft.Automanage/configurationProfiles": [
"2021-04-30-preview"
],
"Microsoft.Automanage/configurationProfiles/versions": [
"2021-04-30-preview"
],
"Microsoft.Automation/automationAccounts": [
"2015-10-31",
"2019-06-01",
Expand Down Expand Up @@ -1544,11 +1546,19 @@
"Microsoft.CognitiveServices/accounts": [
"2016-02-01-preview",
"2017-04-18",
"2021-04-30"
"2021-04-30",
"2021-10-01"
],
"Microsoft.CognitiveServices/accounts/commitmentPlans": [
"2021-10-01"
],
"Microsoft.CognitiveServices/accounts/deployments": [
"2021-10-01"
],
"Microsoft.CognitiveServices/accounts/privateEndpointConnections": [
"2017-04-18",
"2021-04-30"
"2021-04-30",
"2021-10-01"
],
"Microsoft.Communication/communicationServices": [
"2020-08-20",
Expand Down Expand Up @@ -1857,12 +1867,14 @@
"Microsoft.Confluent/agreements": [
"2020-03-01",
"2020-03-01-preview",
"2021-03-01-preview"
"2021-03-01-preview",
"2021-09-01-preview"
],
"Microsoft.Confluent/organizations": [
"2020-03-01",
"2020-03-01-preview",
"2021-03-01-preview"
"2021-03-01-preview",
"2021-09-01-preview"
],
"Microsoft.ConnectedVMwarevSphere/clusters": [
"2020-10-01-preview"
Expand Down Expand Up @@ -2919,7 +2931,9 @@
"2021-03-03-preview",
"2021-03-31",
"2021-07-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-07-02",
"2021-07-02-preview"
],
"Microsoft.Devices/IotHubs/certificates": [
"2017-07-01",
Expand All @@ -2941,7 +2955,9 @@
"2021-03-03-preview",
"2021-03-31",
"2021-07-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-07-02",
"2021-07-02-preview"
],
"Microsoft.Devices/IotHubs/eventHubEndpoints/ConsumerGroups": [
"2016-02-03",
Expand All @@ -2965,7 +2981,9 @@
"2021-03-03-preview",
"2021-03-31",
"2021-07-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-07-02",
"2021-07-02-preview"
],
"Microsoft.Devices/iotHubs/privateEndpointConnections": [
"2020-03-01",
Expand All @@ -2979,27 +2997,32 @@
"2021-03-03-preview",
"2021-03-31",
"2021-07-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-07-02",
"2021-07-02-preview"
],
"Microsoft.Devices/provisioningServices": [
"2017-08-21-preview",
"2017-11-15",
"2018-01-22",
"2020-01-01",
"2020-03-01",
"2020-09-01-preview"
"2020-09-01-preview",
"2021-10-15"
],
"Microsoft.Devices/provisioningServices/certificates": [
"2017-08-21-preview",
"2017-11-15",
"2018-01-22",
"2020-01-01",
"2020-03-01",
"2020-09-01-preview"
"2020-09-01-preview",
"2021-10-15"
],
"Microsoft.Devices/provisioningServices/privateEndpointConnections": [
"2020-03-01",
"2020-09-01-preview"
"2020-09-01-preview",
"2021-10-15"
],
"Microsoft.DigitalTwins/digitalTwinsInstances": [
"2020-03-01-preview",
Expand Down Expand Up @@ -3845,7 +3868,8 @@
"2020-10-20-preview",
"2020-12-08",
"2020-12-08-preview",
"2021-06-10"
"2021-06-10",
"2021-08-24"
],
"Microsoft.HealthcareApis/services": [
"2018-08-20-preview",
Expand Down Expand Up @@ -4026,7 +4050,8 @@
"Microsoft.Insights/scheduledQueryRules": [
"2018-04-16",
"2020-05-01-preview",
"2021-02-01-preview"
"2021-02-01-preview",
"2021-08-01"
],
"Microsoft.Insights/webtests": [
"2014-04-01",
Expand Down Expand Up @@ -4062,12 +4087,6 @@
"Microsoft.IoTSecurity/locations/deviceGroups": [
"2021-02-01-preview"
],
"Microsoft.IoTSecurity/locations/sites": [
"2021-09-01-preview"
],
"Microsoft.IoTSecurity/locations/sites/sensors": [
"2021-09-01-preview"
],
"Microsoft.IoTSecurity/onPremiseSensors": [
"2021-02-01-preview"
],
Expand Down Expand Up @@ -4547,12 +4566,14 @@
"2018-05-01",
"2020-02-01-preview",
"2021-02-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-12-01-preview"
],
"Microsoft.Maps/accounts/creators": [
"2020-02-01-preview",
"2021-02-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-12-01-preview"
],
"Microsoft.Maps/accounts/privateAtlases": [
"2020-02-01-preview"
Expand Down Expand Up @@ -6481,7 +6502,10 @@
"2018-07-01-preview",
"2019-07-01",
"2019-07-01",
"2019-07-01"
"2019-07-01",
"2021-10-01",
"2021-10-01",
"2021-10-01"
],
"Microsoft.Portal/dashboards": [
"2015-08-01-preview",
Expand Down Expand Up @@ -7323,33 +7347,39 @@
"2020-01-01-preview",
"2021-01-01-preview",
"2021-05-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-11-01-preview"
],
"Microsoft.ServiceFabric/managedClusters/nodeTypes": [
"2020-01-01-preview",
"2021-01-01-preview",
"2021-05-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-11-01-preview"
],
"Microsoft.ServiceFabric/managedclusters/applicationTypes": [
"2021-01-01-preview",
"2021-05-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-11-01-preview"
],
"Microsoft.ServiceFabric/managedclusters/applicationTypes/versions": [
"2021-01-01-preview",
"2021-05-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-11-01-preview"
],
"Microsoft.ServiceFabric/managedclusters/applications": [
"2021-01-01-preview",
"2021-05-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-11-01-preview"
],
"Microsoft.ServiceFabric/managedclusters/applications/services": [
"2021-01-01-preview",
"2021-05-01",
"2021-07-01-preview"
"2021-07-01-preview",
"2021-11-01-preview"
],
"Microsoft.ServiceFabricMesh/applications": [
"2018-07-01-preview",
Expand Down Expand Up @@ -8296,31 +8326,40 @@
"Microsoft.StreamAnalytics/streamingjobs": [
"2016-03-01",
"2017-04-01-preview",
"2020-03-01"
"2020-03-01",
"2021-10-01-preview"
],
"Microsoft.StreamAnalytics/streamingjobs/functions": [
"2016-03-01",
"2017-04-01-preview",
"2020-03-01"
"2020-03-01",
"2021-10-01-preview"
],
"Microsoft.StreamAnalytics/streamingjobs/inputs": [
"2016-03-01",
"2017-04-01-preview",
"2020-03-01"
"2020-03-01",
"2021-10-01-preview"
],
"Microsoft.StreamAnalytics/streamingjobs/outputs": [
"2016-03-01",
"2017-04-01-preview",
"2020-03-01"
"2020-03-01",
"2021-10-01-preview"
],
"Microsoft.StreamAnalytics/streamingjobs/transformations": [
"2016-03-01",
"2017-04-01-preview",
"2020-03-01"
"2020-03-01",
"2021-10-01-preview"
],
"Microsoft.Subscription/aliases": [
"2019-10-01-preview",
"2020-09-01"
"2020-09-01",
"2021-10-01"
],
"Microsoft.Subscription/policies": [
"2021-10-01"
],
"Microsoft.Subscription/subscriptionDefinitions": [
"2017-11-01-preview"
Expand Down Expand Up @@ -8696,7 +8735,8 @@
"2019-08-09-preview"
],
"Microsoft.VideoIndexer/accounts": [
"2021-10-18-preview"
"2021-10-18-preview",
"2021-10-27-preview"
],
"Microsoft.VirtualMachineImages/imageTemplates": [
"2018-02-01-preview",
Expand Down
4 changes: 2 additions & 2 deletions schemas/2014-04-01-preview/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -1344,10 +1344,10 @@
"$ref": "https://schema.management.azure.com/schemas/2019-05-01/Microsoft.Resources.json#/resourceDefinitions/deployments"
},
{
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/applianceDefinitions"
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/applianceDefinitions"
},
{
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/appliances"
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/appliances"
},
{
"$ref": "https://schema.management.azure.com/schemas/2016-07-07/Microsoft.ApiManagement.json#/resourceDefinitions/service"
Expand Down
4 changes: 2 additions & 2 deletions schemas/2015-01-01/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -1576,10 +1576,10 @@
"$ref": "https://schema.management.azure.com/schemas/2017-05-10/Microsoft.Resources.json#/resourceDefinitions/deployments"
},
{
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/applianceDefinitions"
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/applianceDefinitions"
},
{
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#/resourceDefinitions/appliances"
"$ref": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#/resourceDefinitions/appliances"
},
{
"$ref": "https://schema.management.azure.com/schemas/2016-07-07/Microsoft.ApiManagement.json#/resourceDefinitions/service"
Expand Down
2 changes: 1 addition & 1 deletion schemas/2015-07-01/Microsoft.Authorization.Authz.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"name": {
"type": "string",
"description": "The name of the role assignment to create. It can be any valid GUID."
"description": "A GUID for the role assignment to create. The name must be unique and different for each role assignment."
},
"properties": {
"oneOf": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.json#",
"id": "https://schema.management.azure.com/schemas/2016-09-01-preview/Microsoft.Solutions.resourcesolutions.json#",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Microsoft.Solutions",
"description": "Microsoft Solutions Resource Types",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Solutions.json#",
"id": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Solutions.resourcesolutions.json#",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Microsoft.Solutions",
"description": "Microsoft Solutions Resource Types",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"name": {
"type": "string",
"description": "The name of the role assignment to create. It can be any valid GUID."
"description": "A GUID for the role assignment to create. The name must be unique and different for each role assignment."
},
"properties": {
"oneOf": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"name": {
"type": "string",
"description": "The name of the role assignment to create. It can be any valid GUID."
"description": "A GUID for the role assignment to create. The name must be unique and different for each role assignment."
},
"properties": {
"oneOf": [
Expand Down
Loading

0 comments on commit 5fdbc39

Please sign in to comment.