Merge remote-tracking branch 'origin/main' into Kusto/auto-generate

Author: anthony-c-martin

.github/workflows/autogenerateBatch0.yml

@@ -0,0 +1,71 @@
+name: Generate Types
+
+on:
+  workflow_dispatch:
+    inputs:
+      api_specs_ref:
+        description: 'Git ref or full SHA for https://github.com/Azure/azure-rest-api-specs.'
+        required: true
+        default: 'main'
+      single_path:
+        description: 'The path to generate types for (e.g. "compute", or "keyvault"). Leave blank to generate all types.'
+        required: false
+
+jobs:
+  update-types:
+    name: Update Types
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+
+      - name: Clone azure-rest-api-specs
+        uses: actions/checkout@v2.3.4
+        with:
+          repository: Azure/azure-rest-api-specs
+          path: workflow-temp/azure-rest-api-specs
+          ref: ${{ github.event.inputs.api_specs_ref }}
+      
+      - name: Install generator npm packages
+        run: npm ci
+        working-directory: generator
+      
+      - id: generate
+        name: Run generator
+        run: |
+          if [ -z "${{ github.event.inputs.single_path }}" ]
+          then
+            npm run generate-all -- '{"localPath": "$GITHUB_WORKSPACE/workflow-temp/azure-rest-api-specs"}'
+          else
+            npm run generate-single -- '${{ github.event.inputs.single_path }}/resource-manager' '$GITHUB_WORKSPACE/workflow-temp/azure-rest-api-specs'
+          fi
+        working-directory: generator
+
+      - id: get_swagger_gh_uri
+        name: Get GitHub URI for azure-rest-api-specs
+        run: |
+          git_sha=`git rev-parse HEAD`
+          echo "::set-output name=gh_uri::https://github.com/Azure/azure-rest-api-specs/tree/$git_sha"
+        working-directory: workflow-temp/azure-rest-api-specs
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3.10.1
+        with:
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          signoff: false
+          branch: autogenerate
+          branch-suffix: short-commit-hash
+          delete-branch: true
+          title: |
+            Update Generated Types ${{ github.event.inputs.single_path && format('(single path: {0})', github.event.inputs.single_path) || '' }}
+          body:  |
+            Update Generated Types ${{ github.event.inputs.single_path && format('(single path: {0})', github.event.inputs.single_path) || '' }}
+
+            Generate types for ${{ steps.get_swagger_gh_uri.outputs.gh_uri }}
+          commit-message: |
+            Update Generated Types ${{ github.event.inputs.single_path && format('(single path: {0})', github.event.inputs.single_path) || '' }}
+
+            Generate types for ${{ steps.get_swagger_gh_uri.outputs.gh_uri }}
+          labels: autogenerate
+          draft: false

.github/workflows/generate-types.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/main.yml

@@ -8,4 +8,7 @@ schemas/code-model-v1
 Debug
 Release
 obj
-bin
+bin
+
+# Temporary directory for GitHub workflows to use
+/workflow-temp

.gitignore

@@ -78,4 +78,4 @@ Once this is running, you can create a basic template with the following structu
 To get quickly notified on GitHub issues for your RP's schema, please update the [rp-label-to-contact.md](/rp-label-to-contact.md) by submitting a PR with the desired GitHub handle(s) and label for your RP.
 
 ---
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

README.md

@@ -46,12 +46,12 @@ jobs:
       set -Eeuxo pipefail
       git checkout $(Build.SourceBranchName)
       git pull
-      git merge --no-commit --no-ff --strategy-option=theirs origin/master
+      git merge --no-commit --no-ff --strategy-option=theirs origin/main
       if ! git diff-index --quiet HEAD --; then
-        git commit -m "Merge remote-tracking branch 'origin/master' into $(Build.SourceBranchName)"
+        git commit -m "Merge remote-tracking branch 'origin/main' into $(Build.SourceBranchName)"
         git push origin $(Build.SourceBranchName)
       fi
-    displayName: Integrate master branch
+    displayName: Integrate main branch
 
   - script: |
       set -Eeuxo pipefail

azure-pipelines-autogen.yml

@@ -28,15 +28,19 @@ View the Pipeline Configuration [here](/azure-pipelines-autogen.yml).
 #### Merging Pipeline-generated schemas
 
 1. Review the status badge on this page to ensure the latest run was successful.
-2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`master`](https://github.com/Azure/azure-resource-manager-schemas/tree/master).
+2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`main`](https://github.com/Azure/azure-resource-manager-schemas/tree/main).
 3. If there are any modifications to [schemas/common/autogeneratedResources.json](/schemas/common/autogeneratedResources.json), push a commit to the autogenerate branch to make any corresponding changes to [schemas/2014-04-01-preview/deploymentTemplate.json](/schemas/2014-04-01-preview/deploymentTemplate.json) and [schemas/2015-01-01/deploymentTemplate.json](/schemas/2015-01-01/deploymentTemplate.json).
 
 #### Onboarding to the autogeneration pipeline
-
-1. Follow the steps listed under [Getting Started](#getting-started). The following commands assume you are running in the `generator` directory.
-3. Run `npm run list-basepaths` to discover the specs repo path containing the swagger definitions.
-4. Run `npm run generate-single {basePath}` to generate schemas for them. Save the console output to file.
-5. Manually remove any existing references to your provider namespace (if any) from [schemas/2019-04-01/deploymentTemplate.json](/schemas/2019-04-01/deploymentTemplate.json).
-6. Add the {basePath} to the autogenlist array in [autogenlist.ts](./autogenlist.ts).
-7. Commit all the changed files, and submit a PR to this repo with title "Onboarding {provider} for autogeneration". Include the full output saved in step 2 as a comment.
-8. Ensure all CI tests pass, and ask the team to review the PR (including tool output) to ensure that all expected resources have been detected and generated as expected.
+New resource providers are onboarded for autogeneration by default, so the only providers which have been opted out are listed in [autogenlist.ts](./autogenlist.ts) with `disabledForAutogen` set.
+
+If your team has been opted out, and you would like to opt in, please raise an issue in this repo, and we will assist.
+
+> The following steps are no longer necessary for onboarding, but listed here for reference:
+> 1. Follow the steps listed under [Getting Started](#getting-started). The following commands assume you are running in the > `generator` directory.
+> 3. Run `npm run list-basepaths` to discover the specs repo path containing the swagger definitions.
+> 4. Run `npm run generate-single {basePath}` to generate schemas for them. Save the console output to file.
+> 5. Manually remove any existing references to your provider namespace (if any) from [schemas/2019-04-01/deploymentTemplate.> json](/schemas/2019-04-01/deploymentTemplate.json).
+> 6. Add the {basePath} to the autogenlist array in [autogenlist.ts](./autogenlist.ts).
+> 7. Commit all the changed files, and submit a PR to this repo with title "Onboarding {provider} for autogeneration". Include > the full output saved in step 2 as a comment.
+> 8. Ensure all CI tests pass, and ask the team to review the PR (including tool output) to ensure that all expected resources > have been detected and generated as expected.