Merge branch 'main' into 29131

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

@@ -11,7 +11,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: rix0rrr/close-stale-prs@main
+      - uses: cdklabs/close-stale-prs@main
         with:
           # Required
           # Must be PROJEN_GITHUB_TOKEN because the default GHA GitHub token will not have permissions to

.github/workflows/github-merit-badger.yml

@@ -10,11 +10,11 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: aws-github-ops/github-merit-badger@main
+      - uses: cdklabs/github-merit-badger@main
         id: merit-badger
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
           thresholds: '[0,3,6,13,25,50]'
           badge-type: 'achievement'
-          ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,aws-cdk-automation,dependabot[bot],mergify[bot]]'
+          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,shikha372,kirtishrinkhala,godwingrs22,aws-cdk-automation,dependabot[bot],mergify[bot]]'

.github/workflows/issue-reprioritization.yml

@@ -11,7 +11,7 @@ jobs:
       repository-projects: write
     runs-on: ubuntu-latest
     steps:
-      - uses: kaizencc/issue-reprioritization-manager@main
+      - uses: cdklabs/issue-reprioritization-manager@main
         id: reprioritization-manager
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr-labeler.yml

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

.github/workflows/pr-linter-exemption-labeler.yml

@@ -12,6 +12,6 @@ jobs:
     if: ${{ (github.event.issue.pull_request) && (github.event.issue.state == 'open') }}
     runs-on: ubuntu-latest
     steps:
-      - uses: TheRealAmazonKendra/pr-linter-exemption-labeler@main
+      - uses: cdklabs/pr-linter-exemption-labeler@main
         with:
           github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }}

.mergify.yml

@@ -11,7 +11,7 @@ pull_request_rules:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore)$
+      - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore|shikha372|kirtishrinkhala|godwingrs22)$
       - -label~="contribution/core"
   - name: automatic merge
     actions:

CONTRIBUTORS.md

@@ -16,11 +16,11 @@ Shout out to our top contributors!
 - [NetaNir](https://github.com/NetaNir)
 - [comcalvi](https://github.com/comcalvi)
 - [robertd](https://github.com/robertd)
-- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
 - [pahud](https://github.com/pahud)
+- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
-- [peterwoodworth](https://github.com/peterwoodworth)
 - [lpizzinidev](https://github.com/lpizzinidev)
+- [peterwoodworth](https://github.com/peterwoodworth)
 - [go-to-k](https://github.com/go-to-k)
 - [colifran](https://github.com/colifran)
 - [nija-at](https://github.com/nija-at)
@@ -29,4 +29,4 @@ Shout out to our top contributors!
 - [jumic](https://github.com/jumic)
 
 
-_Last updated: Thu, 01 Feb 24 00:09:34 +0000_
+_Last updated: Fri, 01 Mar 24 00:09:32 +0000_

packages/@aws-cdk-testing/cli-integ/.gitignore

@@ -17,4 +17,4 @@ nyc.config.js
 
 .DS_Store
 
-junit.xml
+junit.xml

packages/@aws-cdk-testing/cli-integ/bin/apply-patches

@@ -14,6 +14,9 @@ fi
 
 candidate_dir="${scriptdir}/../resources/cli-regression-patches/v${version}"
 
-if [[ -f "$candidate_dir" ]]; then
-  cp -R "${candidate_dir}/"* "$2"
-fi
+if [[ -d "$candidate_dir" ]]; then
+  echo "Found patch directory: ${candidate_dir}"
+  cp -vR "${candidate_dir}/"* "$2"
+else
+  echo "No patch directory named: ${candidate_dir}"
+fi

packages/@aws-cdk-testing/cli-integ/lib/integ-test.ts

@@ -2,7 +2,14 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { MemoryStream } from './corking';
 
-const SKIP_TESTS = fs.readFileSync(path.join(__dirname, '..', 'skip-tests.txt'), { encoding: 'utf-8' }).split('\n');
+const SKIP_TESTS = fs.readFileSync(path.join(__dirname, '..', 'skip-tests.txt'), { encoding: 'utf-8' })
+  .split('\n')
+  .map(x => x.trim())
+  .filter(x => x && !x.startsWith('#'));
+
+if (SKIP_TESTS) {
+  process.stderr.write(`ℹ️ Skipping tests: ${JSON.stringify(SKIP_TESTS)}\n`);
+}
 
 export interface TestContext {
   readonly randomString: string;
@@ -11,7 +18,7 @@ export interface TestContext {
 };
 
 if (process.env.JEST_TEST_CONCURRENT === 'true') {
-  process.stderr.write('ℹ️ JEST_TEST_CONCURRENT is true: tests will run concurrently and filters have no effect!');
+  process.stderr.write('ℹ️ JEST_TEST_CONCURRENT is true: tests will run concurrently and filters have no effect!\n0');
 }
 
 /**

packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/sam_cdk_integ_app/lib/nested-stack.js

@@ -10,7 +10,7 @@ class NestedStack1 extends NestedStack {
   constructor(scope, id, props) {
     super(scope, id, props);
     new Function(this, 'FunctionPythonRuntime', {
-      runtime: Runtime.PYTHON_3_7,
+      runtime: Runtime.PYTHON_3_12,
       code: Code.fromAsset('./src/python/Function'),
       handler: 'app.lambda_handler',
     });

packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/sam_cdk_integ_app/lib/test-stack.js

@@ -29,19 +29,19 @@ class CDKSupportDemoRootStack extends Stack{
     // Layers
     new PythonLayerVersion(this, 'PythonLayerVersion', {
       compatibleRuntimes: [
-        Runtime.PYTHON_3_7,
+        Runtime.PYTHON_3_12,
       ],
       entry: './src/python/Layer',
     });
     new LayerVersion(this, 'LayerVersion', {
       compatibleRuntimes: [
-        Runtime.PYTHON_3_7,
+        Runtime.PYTHON_3_12,
       ],
       code: Code.fromAsset('./src/python/Layer'),
     });
     new LayerVersion(this, 'BundledLayerVersionPythonRuntime', {
       compatibleRuntimes: [
-        Runtime.PYTHON_3_7,
+        Runtime.PYTHON_3_12,
       ],
       code: Code.fromAsset('./src/python/Layer', {
         bundling: {
@@ -50,7 +50,7 @@ class CDKSupportDemoRootStack extends Stack{
             '-c',
             'rm -rf /tmp/asset-input && mkdir /tmp/asset-input && cp * /tmp/asset-input && cd /tmp/asset-input && pip install -r requirements.txt -t . && mkdir /asset-output/python && cp -R /tmp/asset-input/* /asset-output/python',
           ],
-          image: Runtime.PYTHON_3_7.bundlingImage,
+          image: Runtime.PYTHON_3_12.bundlingImage,
           user: 'root',
         }
       }),
@@ -61,25 +61,25 @@ class CDKSupportDemoRootStack extends Stack{
       entry: './src/python/Function',
       index: 'app.py',
       handler: 'lambda_handler',
-      runtime: Runtime.PYTHON_3_7,
+      runtime: Runtime.PYTHON_3_12,
       functionName: 'pythonFunc',
       logRetention: RetentionDays.THREE_MONTHS,
     });
     new Function(this, 'FunctionPythonRuntime', {
-      runtime: Runtime.PYTHON_3_7,
+      runtime: Runtime.PYTHON_3_12,
       code: Code.fromAsset('./src/python/Function'),
       handler: 'app.lambda_handler',
     });
     new Function(this, 'BundledFunctionPythonRuntime', {
-      runtime: Runtime.PYTHON_3_7,
+      runtime: Runtime.PYTHON_3_12,
       code: Code.fromAsset('./src/python/Function/', {
         bundling: {
           command: [
             '/bin/sh',
             '-c',
             'rm -rf /tmp/asset-input && mkdir /tmp/asset-input && cp * /tmp/asset-input && cd /tmp/asset-input && pip install -r requirements.txt -t . && cp -R /tmp/asset-input/* /asset-output',
           ],
-          image: Runtime.PYTHON_3_7.bundlingImage,
+          image: Runtime.PYTHON_3_12.bundlingImage,
           user: 'root',
         }
       }),

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.130.0/NOTES.md

@@ -0,0 +1 @@
+This patch brings the [fix](https://github.com/aws/aws-cdk/pull/29305) into the regression suite.

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.130.0/skip-tests.txt

@@ -0,0 +1,5 @@
+# The fix for upgrading lambda runtimes from python 3.7 to 3.12 is not relased yet: https://github.com/aws/aws-cdk/pull/29305
+# Skipping the bootstrapping test as it is flakey; only doing so to get the 2.131.0 release out this week.
+
+sam can locally test the synthesized cdk application
+switch on termination protection, switch is left alone on re-bootstrap