Merge branch 'master' into codeBuildStepActionRole

.devcontainer.json

@@ -4,5 +4,6 @@
     "postCreateCommand": "yarn build --skip-test --no-bail --skip-prereqs --skip-compat",
     "extensions": [
         "dbaeumer.vscode-eslint@2.1.5"
-    ]
+    ],
+    "remoteUser": "superchain"
 }

.github/ISSUE_TEMPLATE/documentation.yml

@@ -1,7 +1,7 @@
 ---
 name: "📕 Documentation Issue"
 description: Report an issue in the API Reference documentation or Developer Guide
-title: "(short issue description)"
+title: "(module name): (short issue description)"
 labels: [documentation, needs-triage]
 assignees: []
 body:

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,7 +1,7 @@
 ---
 name: 🚀 Feature Request
 description: Suggest an idea for this project
-title: "(short issue description)"
+title: "(module name): (short issue description)"
 labels: [feature-request, needs-triage]
 assignees: []
 body:

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,6 +12,6 @@
 ### New Features
 
 * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
-	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?
+	* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)?
 
 *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

.github/dependabot.yml

@@ -18,3 +18,26 @@ updates:
     labels:
       - "auto-approve"
     open-pull-requests-limit: 5
+
+  # Non-TypeScript init template dependency updates
+  - package-ecosystem: "pip"
+    directory: "/packages/aws-cdk/lib/init-templates"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "auto-approve"
+    open-pull-requests-limit: 5
+  - package-ecosystem: "maven"
+    directory: "/packages/aws-cdk/lib/init-templates"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "auto-approve"
+    open-pull-requests-limit: 5
+  - package-ecosystem: "nuget"
+    directory: "/packages/aws-cdk/lib/init-templates"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "auto-approve"
+    open-pull-requests-limit: 5

.github/workflows/auto-approve.yml

@@ -12,6 +12,6 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-    - uses: hmarr/auto-approve-action@v2.2.0
+    - uses: hmarr/auto-approve-action@v2.2.1
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/close-stale-issues.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Stale issue job
     steps:
-    - uses: aws-actions/stale-issue-cleanup@v3
+    - uses: aws-actions/stale-issue-cleanup@v5
       with:
         # Setting messages to an empty string will cause the automation to skip
         # that category

.github/workflows/close-stale-prs.yml

@@ -0,0 +1,23 @@
+on:
+  schedule:
+    # Cron format: min hr day month dow
+    - cron: "0 0 * * *"
+jobs:
+  close-stale-prs:
+    permissions:
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: rix0rrr/close-stale-prs@main
+        with:
+          # Required
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-days: 21
+          response-days: 7
+
+          # Optional
+          important-checks-regex: AutoBuildProject89A8053A
+          warn-message: This PR has been in the STATE state for 3 weeks, and looks abandoned. To keep this PR from being closed, please continue work on it. If not, it will automatically be closed in a week.
+          close-message: This PR has been deemed to be abandoned, and will be automatically closed. Please create a new PR for these changes if you think this decision has been made in error.
+          skip-labels: contribution/core
+          close-label: closed-for-staleness

.github/workflows/issue-reprioritization.yml

@@ -0,0 +1,24 @@
+name: issue-reprioritization
+on: 
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  issue-reprioritization:
+    permissions:
+      issues: write
+      repository-projects: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: kaizencc/issue-reprioritization-manager@main
+        id: reprioritization-manager
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          original-label: p2
+          new-label: p1
+          reprioritization-threshold: 20
+          project-column-url: https://github.com/aws/aws-cdk/projects/13#column-18002436
+      - uses: kaizencc/pr-triage-manager@main
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          on-pulls: ${{ steps.reprioritization-manager.outputs.linked-pulls }}

.github/workflows/pr-labeler.yml

@@ -24,7 +24,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: kaizen3031593/pr-triage-manager@main
+      - uses: kaizencc/pr-triage-manager@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/yarn-upgrade.yml

@@ -40,6 +40,8 @@ jobs:
           npm -g install lerna npm-check-updates@^9.0.0
       - name: Build CLI
         run: cd packages/aws-cdk && ../../scripts/buildup
+      - name: Build Integ Runner
+        run: cd packages/@aws-cdk/integ-runner && ../../../scripts/buildup
       - name: List Mono-Repo Packages
         id: list-packages
         # These need to be ignored from the `ncu` runs!
@@ -63,16 +65,22 @@ jobs:
           lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
           lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
           lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}'  --target=minor
-          
+          # Upgrade package.jsons in init templates
+          for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
+            (cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
+          done
+
       # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
       - name: Run "yarn install"
         run: yarn install
 
       - name: Run "yarn upgrade"
         run: yarn upgrade
-        
+
       - name: Regenerate CLI attributions
         run: cd packages/aws-cdk && yarn pkglint
+      - name: Regenerate Integ Runner attributions
+        run: cd packages/@aws-cdk/integ-runner && yarn pkglint
 
       # Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
       # Creating a pull request requires write permissions and it's best to keep write privileges isolated.
@@ -81,7 +89,7 @@ jobs:
           git add .
           git diff --patch --staged > ${{ runner.temp }}/upgrade.patch
       - name: Upload Patch
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: upgrade.patch
           path: ${{ runner.temp }}/upgrade.patch
@@ -98,7 +106,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download patch
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: upgrade.patch
           path: ${{ runner.temp }}
@@ -112,6 +120,7 @@ jobs:
         with:
           # Git commit details
           branch: automation/yarn-upgrade
+          author: aws-cdk-automation <aws-cdk-automation@users.noreply.github.com>
           commit-message: |-
             chore: npm-check-updates && yarn upgrade
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.

.mergify.yml

@@ -10,7 +10,7 @@ pull_request_rules:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|NetaNir|iliapolo|njlynch|ericzbeard|ccfife|fulghum|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|BenChaimberg|madeline-k|BryanPan342|kaizen3031593|comcalvi|Chriscbr|corymhall|peterwoodworth|ryparker|TheRealAmazonKendra|yuth)$
+      - author~=^(RomainMuller|garnaat|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|iliapolo|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|madeline-k|kaizencc|comcalvi|Chriscbr|corymhall|peterwoodworth|ryparker|TheRealAmazonKendra|yuth|vinayak-kukreja)$
       - -label~="contribution/core"
   - name: automatic merge
     actions: