Skip to content

Commit db80c5d

Browse files
anthony-c-martinanthony-c-martin
authored
Merge pull request #1362 from Azure/autogenerate
Merge Autogenerate
2 parents 8e56d13 + 191fedb commit db80c5d

File tree

35 files changed

+7856
-909
lines changed

35 files changed

+7856
-909
lines changed

‎.github/workflows/autogenerateBatch0.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Autogenerate (Batch 0)
4+
5+
on:
6+
push:
7+
branches: [ autogenerate ]
8+
9+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
10+
jobs:
11+
# This workflow contains a single job called "build"
12+
build:
13+
# The type of runner that the job will run on
14+
runs-on: ubuntu-latest
15+
16+
# Steps represent a sequence of tasks that will be executed as part of the job
17+
steps:
18+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
19+
- uses: actions/checkout@v2
20+
21+
- name: Configure Git
22+
run: |
23+
git config user.name "Autogenerator Pipeline"
24+
git config user.email "azure-resource-manager-schemas@noreply.github.com"
25+
26+
- name: Integrate main branch
27+
run: |
28+
git checkout autogenerate
29+
git pull
30+
git merge --no-commit --no-ff --strategy-option=theirs origin/master --allow-unrelated-histories
31+
if ! git diff-index --quiet HEAD --; then
32+
git commit -m "Merge remote-tracking branch 'origin/master' into autogenerate"
33+
git push origin autogenerate
34+
fi
35+
36+
- name: Setup Node.js
37+
uses: actions/setup-node@v2.1.2
38+
with:
39+
node-version: 10.x
40+
41+
- name: Install packages
42+
run: npm install
43+
working-directory: ./generator
44+
45+
- name: Generate Schemas
46+
run: |
47+
npm run generate-all '{"batchCount": 4, "batchIndex": 0}'
48+
working-directory: ./generator
49+
50+
- name: Commit autogenerated schemas
51+
run: |
52+
git add --all schemas
53+
if ! git diff-index --quiet HEAD --; then
54+
git commit -m "Autogenerate schemas"
55+
git push origin autogenerate
56+
fi
57+
58+
- name: List resources
59+
run: |
60+
npm run list-resources resources.json
61+
62+
- name: Commit resource list
63+
run: |
64+
git add generator/resources.json
65+
if ! git diff-index --quiet HEAD --; then
66+
git commit -m "Update resource list"
67+
git push origin autogenerate
68+
fi

‎azure-pipelines-autogen.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
timeoutInMinutes: 180
1414

1515
pool:
16-
vmImage: 'Ubuntu-16.04'
16+
vmImage: 'ubuntu-latest'
1717

1818
steps:
1919
- checkout: self
@@ -24,6 +24,10 @@ jobs:
2424
inputs:
2525
secureFile: schemas_rsa
2626
displayName: "Download GitHub Deploy Key"
27+
28+
- task: NodeTool@0
29+
inputs:
30+
versionSpec: '10.x'
2731

2832
- script: |
2933
set -Eeuxo pipefail

‎generator/resources.json‎

Lines changed: 79 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,36 @@
66
],
77
"Microsoft.AVS/privateClouds": [
88
"2019-08-09-preview",
9-
"2020-03-20"
9+
"2020-03-20",
10+
"2020-07-17-preview"
1011
],
1112
"Microsoft.AVS/privateClouds/authorizations": [
12-
"2020-03-20"
13+
"2020-03-20",
14+
"2020-07-17-preview"
1315
],
1416
"Microsoft.AVS/privateClouds/clusters": [
1517
"2019-08-09-preview",
16-
"2020-03-20"
18+
"2020-03-20",
19+
"2020-07-17-preview"
20+
],
21+
"Microsoft.AVS/privateClouds/globalReachConnections": [
22+
"2020-07-17-preview"
1723
],
1824
"Microsoft.AVS/privateClouds/hcxEnterpriseSites": [
19-
"2020-03-20"
25+
"2020-03-20",
26+
"2020-07-17-preview"
27+
],
28+
"Microsoft.AVS/privateClouds/workloadNetworks/dhcpConfigurations": [
29+
"2020-07-17-preview"
30+
],
31+
"Microsoft.AVS/privateClouds/workloadNetworks/portMirroringProfiles": [
32+
"2020-07-17-preview"
33+
],
34+
"Microsoft.AVS/privateClouds/workloadNetworks/segments": [
35+
"2020-07-17-preview"
36+
],
37+
"Microsoft.AVS/privateClouds/workloadNetworks/vmGroups": [
38+
"2020-07-17-preview"
2039
],
2140
"Microsoft.Aad/domainServices/ouContainer": [
2241
"2017-06-01",
@@ -41,9 +60,6 @@
4160
"Microsoft.AlertsManagement/actionRules": [
4261
"2019-05-05-preview"
4362
],
44-
"Microsoft.AlertsManagement/resourceHealthAlerts": [
45-
"2020-08-04-preview"
46-
],
4763
"Microsoft.AnalysisServices/servers": [
4864
"2016-05-16",
4965
"2017-07-14",
@@ -529,39 +545,22 @@
529545
"2020-07-01"
530546
],
531547
"Microsoft.Attestation/attestationProviders": [
532-
"2018-09-01-preview"
548+
"2018-09-01-preview",
549+
"2020-10-01"
533550
],
534551
"Microsoft.Authorization/locks": [
535-
"2015-01-01",
536552
"2016-09-01"
537553
],
538-
"Microsoft.Authorization/policyAssignments": [
539-
"2018-03-01",
540-
"2018-05-01",
541-
"2019-01-01",
542-
"2019-06-01",
543-
"2019-09-01"
544-
],
545-
"Microsoft.Authorization/policyDefinitions": [
546-
"2018-03-01",
547-
"2018-05-01",
548-
"2019-01-01",
549-
"2019-06-01",
550-
"2019-09-01"
551-
],
552-
"Microsoft.Authorization/policySetDefinitions": [
553-
"2018-03-01",
554-
"2018-05-01",
555-
"2019-01-01",
556-
"2019-06-01",
557-
"2019-09-01"
558-
],
559554
"Microsoft.Authorization/roleAssignments": [
560-
"2014-10-01-preview",
561-
"2017-09-01"
555+
"2015-07-01",
556+
"2017-10-01-preview",
557+
"2018-01-01-preview",
558+
"2018-09-01-preview",
559+
"2020-04-01-preview"
562560
],
563561
"Microsoft.Authorization/roleDefinitions": [
564-
"2017-09-01"
562+
"2015-07-01",
563+
"2018-01-01-preview"
565564
],
566565
"Microsoft.Automation/automationAccounts": [
567566
"2015-10-31"
@@ -1146,7 +1145,8 @@
11461145
"2020-04-01",
11471146
"2020-06-01",
11481147
"2020-07-01",
1149-
"2020-09-01"
1148+
"2020-09-01",
1149+
"2020-11-01"
11501150
],
11511151
"Microsoft.ContainerService/managedClusters/agentPools": [
11521152
"2019-02-01",
@@ -1161,12 +1161,14 @@
11611161
"2020-04-01",
11621162
"2020-06-01",
11631163
"2020-07-01",
1164-
"2020-09-01"
1164+
"2020-09-01",
1165+
"2020-11-01"
11651166
],
11661167
"Microsoft.ContainerService/managedClusters/privateEndpointConnections": [
11671168
"2020-06-01",
11681169
"2020-07-01",
1169-
"2020-09-01"
1170+
"2020-09-01",
1171+
"2020-11-01"
11701172
],
11711173
"Microsoft.ContainerService/openShiftManagedClusters": [
11721174
"2018-09-30-preview",
@@ -1477,32 +1479,37 @@
14771479
"2019-09-24-preview",
14781480
"2019-12-10-preview",
14791481
"2020-09-21-preview",
1480-
"2020-10-19-preview"
1482+
"2020-10-19-preview",
1483+
"2020-11-02-preview"
14811484
],
14821485
"Microsoft.DesktopVirtualization/applicationGroups/applications": [
14831486
"2019-01-23-preview",
14841487
"2019-09-24-preview",
14851488
"2019-12-10-preview",
14861489
"2020-09-21-preview",
1487-
"2020-10-19-preview"
1490+
"2020-10-19-preview",
1491+
"2020-11-02-preview"
14881492
],
14891493
"Microsoft.DesktopVirtualization/hostPools": [
14901494
"2019-01-23-preview",
14911495
"2019-09-24-preview",
14921496
"2019-12-10-preview",
14931497
"2020-09-21-preview",
1494-
"2020-10-19-preview"
1498+
"2020-10-19-preview",
1499+
"2020-11-02-preview"
14951500
],
14961501
"Microsoft.DesktopVirtualization/hostPools/msixPackages": [
14971502
"2020-09-21-preview",
1498-
"2020-10-19-preview"
1503+
"2020-10-19-preview",
1504+
"2020-11-02-preview"
14991505
],
15001506
"Microsoft.DesktopVirtualization/workspaces": [
15011507
"2019-01-23-preview",
15021508
"2019-09-24-preview",
15031509
"2019-12-10-preview",
15041510
"2020-09-21-preview",
1505-
"2020-10-19-preview"
1511+
"2020-10-19-preview",
1512+
"2020-11-02-preview"
15061513
],
15071514
"Microsoft.DevOps/pipelines": [
15081515
"2019-07-01-preview"
@@ -2389,7 +2396,8 @@
23892396
"2020-09-01-preview"
23902397
],
23912398
"Microsoft.MachineLearningServices/workspaces/connections": [
2392-
"2020-06-01"
2399+
"2020-06-01",
2400+
"2020-09-01-preview"
23932401
],
23942402
"Microsoft.MachineLearningServices/workspaces/datasets": [
23952403
"2020-05-01-preview"
@@ -3913,12 +3921,14 @@
39133921
"Microsoft.OperationalInsights/clusters": [
39143922
"2019-08-01-preview",
39153923
"2020-03-01-preview",
3916-
"2020-08-01"
3924+
"2020-08-01",
3925+
"2020-10-01"
39173926
],
39183927
"Microsoft.OperationalInsights/workspaces": [
39193928
"2015-11-01-preview",
39203929
"2020-03-01-preview",
3921-
"2020-08-01"
3930+
"2020-08-01",
3931+
"2020-10-01"
39223932
],
39233933
"Microsoft.OperationalInsights/workspaces/dataExports": [
39243934
"2019-08-01-preview",
@@ -4484,8 +4494,7 @@
44844494
"2017-03-01-preview"
44854495
],
44864496
"Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies": [
4487-
"2017-10-01-preview",
4488-
"2020-02-02-preview"
4497+
"2017-10-01-preview"
44894498
],
44904499
"Microsoft.Sql/servers/databases/connectionPolicies": [
44914500
"2014-04-01"
@@ -4723,6 +4732,9 @@
47234732
"2019-06-01",
47244733
"2020-08-01-preview"
47254734
],
4735+
"Microsoft.Storage/storageAccounts/inventoryPolicies": [
4736+
"2020-08-01-preview"
4737+
],
47264738
"Microsoft.Storage/storageAccounts/managementPolicies": [
47274739
"2018-03-01-preview",
47284740
"2018-11-01",
@@ -4872,9 +4884,15 @@
48724884
"Microsoft.Synapse/workspaces/administrators": [
48734885
"2019-06-01-preview"
48744886
],
4887+
"Microsoft.Synapse/workspaces/auditingSettings": [
4888+
"2019-06-01-preview"
4889+
],
48754890
"Microsoft.Synapse/workspaces/bigDataPools": [
48764891
"2019-06-01-preview"
48774892
],
4893+
"Microsoft.Synapse/workspaces/extendedAuditingSettings": [
4894+
"2019-06-01-preview"
4895+
],
48784896
"Microsoft.Synapse/workspaces/firewallRules": [
48794897
"2019-06-01-preview"
48804898
],
@@ -4887,6 +4905,12 @@
48874905
"Microsoft.Synapse/workspaces/privateEndpointConnections": [
48884906
"2019-06-01-preview"
48894907
],
4908+
"Microsoft.Synapse/workspaces/securityAlertPolicies": [
4909+
"2019-06-01-preview"
4910+
],
4911+
"Microsoft.Synapse/workspaces/sqlAdministrators": [
4912+
"2019-06-01-preview"
4913+
],
48904914
"Microsoft.Synapse/workspaces/sqlDatabases": [
48914915
"2020-04-01-preview"
48924916
],
@@ -4924,6 +4948,15 @@
49244948
"Microsoft.Synapse/workspaces/sqlPools/vulnerabilityAssessments/rules/baselines": [
49254949
"2019-06-01-preview"
49264950
],
4951+
"Microsoft.Synapse/workspaces/sqlPools/workloadGroups": [
4952+
"2019-06-01-preview"
4953+
],
4954+
"Microsoft.Synapse/workspaces/sqlPools/workloadGroups/workloadClassifiers": [
4955+
"2019-06-01-preview"
4956+
],
4957+
"Microsoft.Synapse/workspaces/vulnerabilityAssessments": [
4958+
"2019-06-01-preview"
4959+
],
49274960
"Microsoft.TimeSeriesInsights/environments": [
49284961
"2017-02-28-preview",
49294962
"2017-11-15",

‎schemas/2017-04-01-preview/Microsoft.StreamAnalytics.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,6 +2541,21 @@
25412541
],
25422542
"description": "Controls certain runtime behaviors of the streaming job."
25432543
},
2544+
"contentStoragePolicy": {
2545+
"oneOf": [
2546+
{
2547+
"type": "string",
2548+
"enum": [
2549+
"SystemAccount",
2550+
"JobStorageAccount"
2551+
]
2552+
},
2553+
{
2554+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2555+
}
2556+
],
2557+
"description": "Valid values are JobStorageAccount and SystemAccount. If set to JobStorageAccount, this requires the user to also specify jobStorageAccount property."
2558+
},
25442559
"dataLocale": {
25452560
"type": "string",
25462561
"description": "The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx. Defaults to 'en-US' if none specified."

0 commit comments

Comments
 (0)