Merge branch 'main' into automation/yarn-upgrade

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/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/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