Skip to content

Commit

Permalink
Merge pull request #1362 from Azure/autogenerate
Browse files Browse the repository at this point in the history
Merge Autogenerate
  • Loading branch information
anthony-c-martin authored Nov 20, 2020
2 parents 8e56d13 + 191fedb commit db80c5d
Show file tree
Hide file tree
Showing 35 changed files with 7,856 additions and 909 deletions.
68 changes: 68 additions & 0 deletions .github/workflows/autogenerateBatch0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# This is a basic workflow to help you get started with Actions

name: Autogenerate (Batch 0)

on:
push:
branches: [ autogenerate ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Configure Git
run: |
git config user.name "Autogenerator Pipeline"
git config user.email "azure-resource-manager-schemas@noreply.github.com"
- name: Integrate main branch
run: |
git checkout autogenerate
git pull
git merge --no-commit --no-ff --strategy-option=theirs origin/master --allow-unrelated-histories
if ! git diff-index --quiet HEAD --; then
git commit -m "Merge remote-tracking branch 'origin/master' into autogenerate"
git push origin autogenerate
fi
- name: Setup Node.js
uses: actions/setup-node@v2.1.2
with:
node-version: 10.x

- name: Install packages
run: npm install
working-directory: ./generator

- name: Generate Schemas
run: |
npm run generate-all '{"batchCount": 4, "batchIndex": 0}'
working-directory: ./generator

- name: Commit autogenerated schemas
run: |
git add --all schemas
if ! git diff-index --quiet HEAD --; then
git commit -m "Autogenerate schemas"
git push origin autogenerate
fi
- name: List resources
run: |
npm run list-resources resources.json
- name: Commit resource list
run: |
git add generator/resources.json
if ! git diff-index --quiet HEAD --; then
git commit -m "Update resource list"
git push origin autogenerate
fi
6 changes: 5 additions & 1 deletion azure-pipelines-autogen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
timeoutInMinutes: 180

pool:
vmImage: 'Ubuntu-16.04'
vmImage: 'ubuntu-latest'

steps:
- checkout: self
Expand All @@ -24,6 +24,10 @@ jobs:
inputs:
secureFile: schemas_rsa
displayName: "Download GitHub Deploy Key"

- task: NodeTool@0
inputs:
versionSpec: '10.x'

- script: |
set -Eeuxo pipefail
Expand Down
125 changes: 79 additions & 46 deletions generator/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,36 @@
],
"Microsoft.AVS/privateClouds": [
"2019-08-09-preview",
"2020-03-20"
"2020-03-20",
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/authorizations": [
"2020-03-20"
"2020-03-20",
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/clusters": [
"2019-08-09-preview",
"2020-03-20"
"2020-03-20",
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/globalReachConnections": [
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/hcxEnterpriseSites": [
"2020-03-20"
"2020-03-20",
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/workloadNetworks/dhcpConfigurations": [
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/workloadNetworks/portMirroringProfiles": [
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/workloadNetworks/segments": [
"2020-07-17-preview"
],
"Microsoft.AVS/privateClouds/workloadNetworks/vmGroups": [
"2020-07-17-preview"
],
"Microsoft.Aad/domainServices/ouContainer": [
"2017-06-01",
Expand All @@ -41,9 +60,6 @@
"Microsoft.AlertsManagement/actionRules": [
"2019-05-05-preview"
],
"Microsoft.AlertsManagement/resourceHealthAlerts": [
"2020-08-04-preview"
],
"Microsoft.AnalysisServices/servers": [
"2016-05-16",
"2017-07-14",
Expand Down Expand Up @@ -529,39 +545,22 @@
"2020-07-01"
],
"Microsoft.Attestation/attestationProviders": [
"2018-09-01-preview"
"2018-09-01-preview",
"2020-10-01"
],
"Microsoft.Authorization/locks": [
"2015-01-01",
"2016-09-01"
],
"Microsoft.Authorization/policyAssignments": [
"2018-03-01",
"2018-05-01",
"2019-01-01",
"2019-06-01",
"2019-09-01"
],
"Microsoft.Authorization/policyDefinitions": [
"2018-03-01",
"2018-05-01",
"2019-01-01",
"2019-06-01",
"2019-09-01"
],
"Microsoft.Authorization/policySetDefinitions": [
"2018-03-01",
"2018-05-01",
"2019-01-01",
"2019-06-01",
"2019-09-01"
],
"Microsoft.Authorization/roleAssignments": [
"2014-10-01-preview",
"2017-09-01"
"2015-07-01",
"2017-10-01-preview",
"2018-01-01-preview",
"2018-09-01-preview",
"2020-04-01-preview"
],
"Microsoft.Authorization/roleDefinitions": [
"2017-09-01"
"2015-07-01",
"2018-01-01-preview"
],
"Microsoft.Automation/automationAccounts": [
"2015-10-31"
Expand Down Expand Up @@ -1146,7 +1145,8 @@
"2020-04-01",
"2020-06-01",
"2020-07-01",
"2020-09-01"
"2020-09-01",
"2020-11-01"
],
"Microsoft.ContainerService/managedClusters/agentPools": [
"2019-02-01",
Expand All @@ -1161,12 +1161,14 @@
"2020-04-01",
"2020-06-01",
"2020-07-01",
"2020-09-01"
"2020-09-01",
"2020-11-01"
],
"Microsoft.ContainerService/managedClusters/privateEndpointConnections": [
"2020-06-01",
"2020-07-01",
"2020-09-01"
"2020-09-01",
"2020-11-01"
],
"Microsoft.ContainerService/openShiftManagedClusters": [
"2018-09-30-preview",
Expand Down Expand Up @@ -1477,32 +1479,37 @@
"2019-09-24-preview",
"2019-12-10-preview",
"2020-09-21-preview",
"2020-10-19-preview"
"2020-10-19-preview",
"2020-11-02-preview"
],
"Microsoft.DesktopVirtualization/applicationGroups/applications": [
"2019-01-23-preview",
"2019-09-24-preview",
"2019-12-10-preview",
"2020-09-21-preview",
"2020-10-19-preview"
"2020-10-19-preview",
"2020-11-02-preview"
],
"Microsoft.DesktopVirtualization/hostPools": [
"2019-01-23-preview",
"2019-09-24-preview",
"2019-12-10-preview",
"2020-09-21-preview",
"2020-10-19-preview"
"2020-10-19-preview",
"2020-11-02-preview"
],
"Microsoft.DesktopVirtualization/hostPools/msixPackages": [
"2020-09-21-preview",
"2020-10-19-preview"
"2020-10-19-preview",
"2020-11-02-preview"
],
"Microsoft.DesktopVirtualization/workspaces": [
"2019-01-23-preview",
"2019-09-24-preview",
"2019-12-10-preview",
"2020-09-21-preview",
"2020-10-19-preview"
"2020-10-19-preview",
"2020-11-02-preview"
],
"Microsoft.DevOps/pipelines": [
"2019-07-01-preview"
Expand Down Expand Up @@ -2389,7 +2396,8 @@
"2020-09-01-preview"
],
"Microsoft.MachineLearningServices/workspaces/connections": [
"2020-06-01"
"2020-06-01",
"2020-09-01-preview"
],
"Microsoft.MachineLearningServices/workspaces/datasets": [
"2020-05-01-preview"
Expand Down Expand Up @@ -3913,12 +3921,14 @@
"Microsoft.OperationalInsights/clusters": [
"2019-08-01-preview",
"2020-03-01-preview",
"2020-08-01"
"2020-08-01",
"2020-10-01"
],
"Microsoft.OperationalInsights/workspaces": [
"2015-11-01-preview",
"2020-03-01-preview",
"2020-08-01"
"2020-08-01",
"2020-10-01"
],
"Microsoft.OperationalInsights/workspaces/dataExports": [
"2019-08-01-preview",
Expand Down Expand Up @@ -4484,8 +4494,7 @@
"2017-03-01-preview"
],
"Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies": [
"2017-10-01-preview",
"2020-02-02-preview"
"2017-10-01-preview"
],
"Microsoft.Sql/servers/databases/connectionPolicies": [
"2014-04-01"
Expand Down Expand Up @@ -4723,6 +4732,9 @@
"2019-06-01",
"2020-08-01-preview"
],
"Microsoft.Storage/storageAccounts/inventoryPolicies": [
"2020-08-01-preview"
],
"Microsoft.Storage/storageAccounts/managementPolicies": [
"2018-03-01-preview",
"2018-11-01",
Expand Down Expand Up @@ -4872,9 +4884,15 @@
"Microsoft.Synapse/workspaces/administrators": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/auditingSettings": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/bigDataPools": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/extendedAuditingSettings": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/firewallRules": [
"2019-06-01-preview"
],
Expand All @@ -4887,6 +4905,12 @@
"Microsoft.Synapse/workspaces/privateEndpointConnections": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/securityAlertPolicies": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/sqlAdministrators": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/sqlDatabases": [
"2020-04-01-preview"
],
Expand Down Expand Up @@ -4924,6 +4948,15 @@
"Microsoft.Synapse/workspaces/sqlPools/vulnerabilityAssessments/rules/baselines": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/sqlPools/workloadGroups": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/sqlPools/workloadGroups/workloadClassifiers": [
"2019-06-01-preview"
],
"Microsoft.Synapse/workspaces/vulnerabilityAssessments": [
"2019-06-01-preview"
],
"Microsoft.TimeSeriesInsights/environments": [
"2017-02-28-preview",
"2017-11-15",
Expand Down
15 changes: 15 additions & 0 deletions schemas/2017-04-01-preview/Microsoft.StreamAnalytics.json
Original file line number Diff line number Diff line change
Expand Up @@ -2541,6 +2541,21 @@
],
"description": "Controls certain runtime behaviors of the streaming job."
},
"contentStoragePolicy": {
"oneOf": [
{
"type": "string",
"enum": [
"SystemAccount",
"JobStorageAccount"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Valid values are JobStorageAccount and SystemAccount. If set to JobStorageAccount, this requires the user to also specify jobStorageAccount property."
},
"dataLocale": {
"type": "string",
"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."
Expand Down
Loading

0 comments on commit db80c5d

Please sign in to comment.