chore: merge 10.x from master

Forward merge latest code from `master` to `10.x`.

.eslintrc.json

@@ -12,7 +12,7 @@
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module",
-    "project": "./tsconfig.jest.json"
+    "project": "./tsconfig.eslint.json"
   },
   "extends": [
     "plugin:import/typescript"
@@ -27,7 +27,7 @@
     "import/resolver": {
       "node": {},
       "typescript": {
-        "directory": "./tsconfig.json"
+        "project": "./tsconfig.eslint.json"
       }
     }
   },
@@ -124,8 +124,8 @@
       "error",
       {
         "devDependencies": [
-          "**/build-tools/**",
-          "**/test/**"
+          "**/test/**",
+          "**/build-tools/**"
         ],
         "optionalDependencies": false,
         "peerDependencies": true
@@ -227,4 +227,4 @@
       }
     }
   ]
-}
+}

.github/workflows/build.yml

@@ -1,4 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+
 name: Build
 on:
   pull_request: {}
@@ -11,6 +12,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
@@ -19,15 +23,14 @@ jobs:
         run: yarn install --check-files --frozen-lockfile
       - name: Synthesize project files
         run: npx projen
-      - name: Anti-tamper check
-        run: git diff --exit-code
       - name: Set git identity
         run: |-
           git config user.name "Auto-bump"
           git config user.email "github-actions@github.com"
       - name: Build
         run: npx projen build
-      - name: Anti-tamper check
-        run: git diff --exit-code
+      - name: Commit and push changes (if any)
+        run: 'git diff --exit-code || (git commit -am "chore: self mutation" && git push
+          origin HEAD:${{ github.event.pull_request.head.ref }})'
     container:
       image: jsii/superchain

.github/workflows/projenupgrade.yml

@@ -1,4 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+
 name: ProjenUpgrade
 on:
   schedule:

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+
 name: Release
 on:
   push:
@@ -15,6 +16,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
@@ -29,15 +32,16 @@ jobs:
         run: |-
           git config user.name "Auto-bump"
           git config user.email "github-actions@github.com"
-      - run: npx projen bump
+      - name: Bump to next version
+        run: npx projen bump
       - name: Build
         run: npx projen build
       - name: Anti-tamper check
         run: git diff --exit-code
-      - name: Push changes
-        run: git push --follow-tags origin $BRANCH
-        env:
-          BRANCH: ${{ github.ref }}
+      - name: Push commits
+        run: git push origin HEAD:${{ github.ref }}
+      - name: Push tags
+        run: git push --follow-tags origin ${{ github.ref }}
       - name: Upload artifact
         uses: actions/upload-artifact@v2.1.1
         with:
@@ -53,11 +57,12 @@ jobs:
       image: jsii/superchain
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
           name: dist
+          path: dist
       - name: Release
-        run: npx -p jsii-release jsii-release-npm
+        run: npx -p jsii-release@latest jsii-release-npm
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_DIST_TAG: next
@@ -70,11 +75,12 @@ jobs:
       image: jsii/superchain
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
           name: dist
+          path: dist
       - name: Release
-        run: npx -p jsii-release jsii-release-maven
+        run: npx -p jsii-release@latest jsii-release-maven
         env:
           MAVEN_GPG_PRIVATE_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           MAVEN_GPG_PRIVATE_KEY_PASSPHRASE: ${{ secrets.MAVEN_GPG_PRIVATE_KEY_PASSPHRASE }}
@@ -89,11 +95,12 @@ jobs:
       image: jsii/superchain
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
           name: dist
+          path: dist
       - name: Release
-        run: npx -p jsii-release jsii-release-pypi
+        run: npx -p jsii-release@latest jsii-release-pypi
         env:
           TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
@@ -105,10 +112,29 @@ jobs:
       image: jsii/superchain
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
           name: dist
+          path: dist
       - name: Release
-        run: npx -p jsii-release jsii-release-nuget
+        run: npx -p jsii-release@latest jsii-release-nuget
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+  release_golang:
+    name: Release to Go
+    needs: build
+    runs-on: ubuntu-latest
+    container:
+      image: jsii/superchain
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: dist
+          path: dist
+      - name: Release
+        run: npx -p jsii-release@latest jsii-release-golang
+        env:
+          GITHUB_TOKEN: ${{ secrets.GO_GITHUB_TOKEN }}
+          GIT_USER_NAME: AWS CDK Team
+          GIT_USER_EMAIL: aws-cdk-dev@amazon.com

.gitignore

@@ -1,64 +1,51 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-# Logs
-logs
+*.lcov
 *.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-# Runtime data
-pids
 *.pid
-*.seed
 *.pid.lock
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-# nyc test coverage
-.nyc_output
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-# Dependency directories
-node_modules/
-jspm_packages/
-# TypeScript cache
+*.seed
+*.tgz
 *.tsbuildinfo
-# Optional eslint cache
+.cache
 .eslintcache
-# Output of 'npm pack'
-*.tgz
-# Yarn Integrity file
+.jsii
+.nyc_output
 .yarn-integrity
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-# jest-junit artifacts
-/test-reports/
-junit.xml
 /coverage
-/lib
 /dist
-.jsii
+/lib
+/test-reports/
+build/Release
+coverage
+jspm_packages/
+junit.xml
+lerna-debug.log*
+lib-cov
+logs
+node_modules/
+npm-debug.log*
+pids
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 tsconfig.json
-!/.projen/tasks.json
-!/package.json
-!/.npmignore
-!/LICENSE
-!/.projenrc.js
-!version.json
-!/.versionrc.json
-!/test
+yarn-debug.log*
+yarn-error.log*
+!/.eslintrc.json
+!/.github/dependabot.yml
+!/.github/pull_request_template.md
 !/.github/workflows/build.yml
+!/.github/workflows/projenupgrade.yml
 !/.github/workflows/release.yml
 !/.mergify.yml
-!/.github/dependabot.yml
-!/.github/workflows/projenupgrade.yml
-!/.github/pull_request_template.md
-!/.github/workflows/rebuild-bot.yml
+!/.npmignore
+!/.projen/deps.json
+!/.projen/tasks.json
+!/.projenrc.js
+!/.versionrc.json
+!/API.md
+!/LICENSE
+!/package.json
 !/src
+!/test
+!/tsconfig.eslint.json
 !/tsconfig.jest.json
-!/.eslintrc.json
-!/API.md
+!version.json

.mergify.yml

@@ -29,5 +29,7 @@ pull_request_rules:
       - status-success=build
     actions:
       merge:
-        method: merge
+        method: squash
         commit_message: title+body
+        strict: smart
+        strict_method: merge