Merge branch 'main' into merge-back/2.164.1

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

@@ -17,4 +17,4 @@ jobs:
           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,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,ashishdhingra,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,michelle-wangg,jiayiwang7,1kaileychen,aws-cdk-automation,dependabot[bot],mergify[bot]]'
+          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,HBobertz,sumupitchayan,colifran,khushail,moelasmar,paulhcsun,GavinZZ,aaythapa,xazhao,gracelu0,jfuss,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,michelle-wangg,jiayiwang7,1kaileychen,aws-cdk-automation,dependabot[bot],mergify[bot]]'

.mergify.yml

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

package.json

@@ -15,21 +15,21 @@
     "build-all": "tsc -b"
   },
   "devDependencies": {
-    "@nx/workspace": "^19.7.2",
+    "@nx/workspace": "^19.8.6",
     "@types/node": "18.11.19",
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "aws-sdk-js-codemod": "^0.28.2",
-    "cdk-generate-synthetic-examples": "^0.2.14",
+    "cdk-generate-synthetic-examples": "^0.2.17",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.103.1",
-    "jsii-pacmak": "1.103.1",
-    "jsii-reflect": "1.103.1",
+    "jsii-diff": "1.104.0",
+    "jsii-pacmak": "1.104.0",
+    "jsii-reflect": "1.104.0",
     "lerna": "^8.1.8",
-    "nx": "^19.7.2",
+    "nx": "^19.8.6",
     "patch-package": "^6.5.1",
     "semver": "^7.6.3",
     "standard-version": "^9.5.0",

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

@@ -14,21 +14,19 @@ export async function shell(command: string[], options: ShellOptions = {}): Prom
     throw new Error('Use either env or modEnv but not both');
   }
 
+  const outputs = new Set(options.outputs);
+  const writeToOutputs = (x: string) => {
+    for (const outputStream of outputs) {
+      outputStream.write(x);
+    }
+  };
+
   // Always output the command
-  (options.output ?? process.stdout).write(`💻 ${command.join(' ')}\n`);
-
-  let output: NodeJS.WritableStream | undefined = options.output ?? process.stdout;
-  switch (options.show ?? 'always') {
-    case 'always':
-      break;
-    case 'never':
-    case 'error':
-      output = undefined;
-      break;
-  }
+  writeToOutputs(`💻 ${command.join(' ')}\n`);
+  const show = options.show ?? 'always';
 
   if (process.env.VERBOSE) {
-    output = process.stdout;
+    outputs.add(process.stdout);
   }
 
   const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : process.env);
@@ -46,12 +44,16 @@ export async function shell(command: string[], options: ShellOptions = {}): Prom
     const stderr = new Array<Buffer>();
 
     child.stdout!.on('data', chunk => {
-      output?.write(chunk);
+      if (show === 'always') {
+        writeToOutputs(chunk);
+      }
       stdout.push(chunk);
     });
 
     child.stderr!.on('data', chunk => {
-      output?.write(chunk);
+      if (show === 'always') {
+        writeToOutputs(chunk);
+      }
       if (options.captureStderr ?? true) {
         stderr.push(chunk);
       }
@@ -66,8 +68,8 @@ export async function shell(command: string[], options: ShellOptions = {}): Prom
       if (code === 0 || options.allowErrExit) {
         resolve(out);
       } else {
-        if (options.show === 'error') {
-          (options.output ?? process.stdout).write(out + '\n');
+        if (show === 'error') {
+          writeToOutputs(`${out}\n`);
         }
         reject(new Error(`'${command.join(' ')}' exited with error code ${code}.`));
       }
@@ -97,10 +99,8 @@ export interface ShellOptions extends child_process.SpawnOptions {
 
   /**
    * Pass output here
-   *
-   * @default stdout unless quiet=true
    */
-  readonly output?: NodeJS.WritableStream;
+  readonly outputs?: NodeJS.WritableStream[];
 
   /**
    * Only return stderr. For example, this is used to validate
@@ -127,9 +127,9 @@ export class ShellHelper {
     private readonly _cwd: string,
     private readonly _output: NodeJS.WritableStream) { }
 
-  public async shell(command: string[], options: Omit<ShellOptions, 'cwd' | 'output'> = {}): Promise<string> {
+  public async shell(command: string[], options: Omit<ShellOptions, 'cwd' | 'outputs'> = {}): Promise<string> {
     return shell(command, {
-      output: this._output,
+      outputs: [this._output],
       cwd: this._cwd,
       ...options,
     });

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

@@ -42,7 +42,7 @@ export async function uploadJavaPackages(packages: string[], login: LoginInforma
       `-Dfile=${pkg.replace(/.pom$/, '.jar')}`,
       ...await pathExists(sourcesFile) ? [`-Dsources=${sourcesFile}`] : [],
       ...await pathExists(javadocFile) ? [`-Djavadoc=${javadocFile}`] : []], {
-      output,
+      outputs: [output],
       modEnv: {
         // Do not try to JIT the Maven binary
         MAVEN_OPTS: `${NO_JIT} ${process.env.MAVEN_OPTS ?? ''}`.trim(),

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

@@ -31,7 +31,7 @@ export async function uploadNpmPackages(packages: string[], login: LoginInformat
     await shell(['node', require.resolve('npm'), 'publish', path.resolve(pkg)], {
       modEnv: npmEnv(usageDir, login),
       show: 'error',
-      output,
+      outputs: [output],
     });
 
     console.log(`✅ ${pkg}`);

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

@@ -25,7 +25,7 @@ export async function uploadDotnetPackages(packages: string[], usageDir: UsageDi
       '--disable-buffering',
       '--timeout', '600',
       '--skip-duplicate'], {
-      output,
+      outputs: [output],
     });
 
     console.log(`✅ ${pkg}`);

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

@@ -32,7 +32,7 @@ export async function uploadPythonPackages(packages: string[], login: LoginInfor
         TWINE_REPOSITORY_URL: login.pypiEndpoint,
       },
       show: 'error',
-      output,
+      outputs: [output],
     });
 
     console.log(`✅ ${pkg}`);

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

@@ -242,9 +242,9 @@ export interface CdkCliOptions extends ShellOptions {
  * Prepare a target dir byreplicating a source directory
  */
 export async function cloneDirectory(source: string, target: string, output?: NodeJS.WritableStream) {
-  await shell(['rm', '-rf', target], { output });
-  await shell(['mkdir', '-p', target], { output });
-  await shell(['cp', '-R', source + '/*', target], { output });
+  await shell(['rm', '-rf', target], { outputs: output ? [output] : [] });
+  await shell(['mkdir', '-p', target], { outputs: output ? [output] : [] });
+  await shell(['cp', '-R', source + '/*', target], { outputs: output ? [output] : [] });
 }
 
 interface CommonCdkBootstrapCommandOptions {

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

@@ -119,7 +119,7 @@ export function withSamIntegrationFixture(block: (context: SamIntegrationTestFix
 export class SamIntegrationTestFixture extends TestFixture {
   public async samShell(command: string[], filter?: string, action?: () => any, options: Omit<ShellOptions, 'cwd' | 'output'> = {}): Promise<ActionOutput> {
     return shellWithAction(command, filter, action, {
-      output: this.output,
+      outputs: [this.output],
       cwd: path.join(this.integTestDir, 'cdk.out').toString(),
       ...options,
     });
@@ -182,7 +182,12 @@ export async function shellWithAction(
     throw new Error('Use either env or modEnv but not both');
   }
 
-  options.output?.write(`💻 ${command.join(' ')}\n`);
+  const writeToOutputs = (x: string) => {
+    for (const output of options.outputs ?? []) {
+      output.write(x);
+    }
+  };
+  writeToOutputs(`💻 ${command.join(' ')}\n`);
 
   const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : undefined);
 
@@ -206,17 +211,17 @@ export async function shellWithAction(
       out.push(Buffer.from(chunk));
       if (!actionExecuted && typeof filter === 'string' && Buffer.concat(out).toString('utf-8').includes(filter) && typeof action === 'function') {
         actionExecuted = true;
-        options.output?.write('before executing action');
+        writeToOutputs('before executing action');
         action().then((output) => {
-          options.output?.write(`action output is ${output}`);
+          writeToOutputs(`action output is ${output}`);
           actionOutput = output;
           actionSucceeded = true;
         }).catch((error) => {
-          options.output?.write(`action error is ${error}`);
+          writeToOutputs(`action error is ${error}`);
           actionSucceeded = false;
           actionOutput = error;
         }).finally(() => {
-          options.output?.write('terminate sam sub process');
+          writeToOutputs('terminate sam sub process');
           killSubProcess(child, command.join(' '));
         });
       }
@@ -235,13 +240,13 @@ export async function shellWithAction(
     }
 
     child.stdout!.on('data', chunk => {
-      options.output?.write(chunk);
+      writeToOutputs(chunk);
       stdout.push(chunk);
       executeAction(chunk);
     });
 
     child.stderr!.on('data', chunk => {
-      options.output?.write(chunk);
+      writeToOutputs(chunk);
       if (options.captureStderr ?? true) {
         stderr.push(chunk);
       }

packages/@aws-cdk-testing/cli-integ/package.json

@@ -50,8 +50,8 @@
     "@aws-sdk/client-sso": "3.632.0",
     "@aws-sdk/client-sts": "3.632.0",
     "@aws-sdk/credential-providers": "3.632.0",
-    "@smithy/util-retry": "3.0.7",
-    "@smithy/types": "3.5.0",
+    "@smithy/util-retry": "3.0.8",
+    "@smithy/types": "3.6.0",
     "axios": "^1.7.7",
     "chalk": "^4",
     "fs-extra": "^9.1.0",

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -1662,7 +1662,7 @@ integTest(
         const targetName = template.replace(/.js$/, '');
         await shell([process.execPath, template, '>', targetName], {
           cwd: cxAsmDir,
-          output: fixture.output,
+          outputs: [fixture.output],
           modEnv: {
             TEST_ACCOUNT: await fixture.aws.account(),
             TEST_REGION: fixture.aws.region,

packages/@aws-cdk-testing/framework-integ/package.json

@@ -44,7 +44,7 @@
     "@aws-cdk/lambda-layer-kubectl-v30": "^2.0.1",
     "@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0",
     "aws-cdk-lib": "0.0.0",
-    "cdk8s": "2.69.0",
+    "cdk8s": "2.69.10",
     "cdk8s-plus-27": "2.9.5",
     "constructs": "^10.0.0"
   },

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json

@@ -164,7 +164,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "3322b7049fb0ed2b7cbb644a2ada8d1116ff80c32dca89e6ada846b5de26f961.zip"
+     "S3Key": "f24ba5e516d9d80b64bc7b0f406eedd12c36b20e7461f3e7719b7ffbdad72410.zip"
     },
     "Description": "/opt/awscli/aws"
    }
@@ -450,7 +450,7 @@
       "Value": "AWSServiceRoleForElasticBeanstalkManagedUpdates"
      }
     ],
-    "SolutionStackName": "64bit Amazon Linux 2023 v6.2.1 running Node.js 20"
+    "SolutionStackName": "64bit Amazon Linux 2023 v6.2.2 running Node.js 20"
    },
    "DependsOn": [
     "beastalkapp",