Merge branch 'main' into iotAuditConfiguration

package.json

@@ -41,7 +41,8 @@
     "colors": "1.4.0",
     "markdown-it": "^12.3.2",
     "string-width": "^4.2.3",
-    "@types/babel__traverse": "7.18.2"
+    "@types/babel__traverse": "7.18.2",
+    "@smithy/types": "3.5.0"
   },
   "repository": {
     "type": "git",

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

@@ -3,7 +3,7 @@ import {
   DeleteStackCommand,
   DescribeStacksCommand,
   UpdateTerminationProtectionCommand,
-  Stack,
+  type Stack,
 } from '@aws-sdk/client-cloudformation';
 import { DeleteRepositoryCommand, ECRClient } from '@aws-sdk/client-ecr';
 import { ECSClient } from '@aws-sdk/client-ecs';
@@ -13,14 +13,14 @@ import {
   S3Client,
   DeleteObjectsCommand,
   ListObjectVersionsCommand,
-  ObjectIdentifier,
+  type ObjectIdentifier,
   DeleteBucketCommand,
 } from '@aws-sdk/client-s3';
 import { SNSClient } from '@aws-sdk/client-sns';
 import { SSOClient } from '@aws-sdk/client-sso';
 import { STSClient, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
 import { fromIni } from '@aws-sdk/credential-providers';
-import { AwsCredentialIdentityProvider } from '@smithy/types';
+import type { AwsCredentialIdentityProvider } from '@smithy/types';
 import { ConfiguredRetryStrategy } from '@smithy/util-retry';
 interface ClientConfig {
   readonly credentials?: AwsCredentialIdentityProvider;
@@ -75,7 +75,7 @@ export class AwsClients {
       maxAttempts: 2,
     });
 
-    return (await stsClient.send(new GetCallerIdentityCommand())).Account!;
+    return (await stsClient.send(new GetCallerIdentityCommand({}))).Account!;
   }
 
   public async deleteStacks(...stackNames: string[]) {

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

@@ -258,6 +258,11 @@ interface CommonCdkBootstrapCommandOptions {
    * @default - none
    */
   readonly tags?: string;
+
+  /**
+   * @default - the default CDK qualifier
+   */
+  readonly qualifier?: string;
 }
 
 export interface CdkLegacyBootstrapCommandOptions extends CommonCdkBootstrapCommandOptions {
@@ -408,7 +413,7 @@ export class TestFixture extends ShellHelper {
     if (options.bootstrapBucketName) {
       args.push('--bootstrap-bucket-name', options.bootstrapBucketName);
     }
-    args.push('--qualifier', this.qualifier);
+    args.push('--qualifier', options.qualifier ?? this.qualifier);
     if (options.cfnExecutionPolicy) {
       args.push('--cloudformation-execution-policies', options.cfnExecutionPolicy);
     }

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

@@ -39,19 +39,19 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "@aws-sdk/client-codeartifact": "3.637.0",
-    "@aws-sdk/client-cloudformation": "3.637.0",
-    "@aws-sdk/client-ecr": "3.637.0",
-    "@aws-sdk/client-ecs": "3.637.0",
-    "@aws-sdk/client-iam": "3.637.0",
-    "@aws-sdk/client-lambda": "3.637.0",
-    "@aws-sdk/client-s3": "3.637.0",
-    "@aws-sdk/client-sns": "3.637.0",
-    "@aws-sdk/client-sso": "3.637.0",
-    "@aws-sdk/client-sts": "3.637.0",
-    "@aws-sdk/credential-providers": "3.637.0",
-    "@smithy/util-retry": "3.0.4",
-    "@smithy/types": "3.4.0",
+    "@aws-sdk/client-codeartifact": "3.632.0",
+    "@aws-sdk/client-cloudformation": "3.632.0",
+    "@aws-sdk/client-ecr": "3.632.0",
+    "@aws-sdk/client-ecs": "3.632.0",
+    "@aws-sdk/client-iam": "3.632.0",
+    "@aws-sdk/client-lambda": "3.632.0",
+    "@aws-sdk/client-s3": "3.632.0",
+    "@aws-sdk/client-sns": "3.632.0",
+    "@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",
     "axios": "^1.7.7",
     "chalk": "^4",
     "fs-extra": "^9.1.0",

packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js

@@ -438,9 +438,17 @@ class IamRolesStack extends cdk.Stack {
     // Environment variabile is used to create a bunch of roles to test
     // that large diff templates are uploaded to S3 to create the changeset.
     for(let i = 1; i <= Number(process.env.NUMBER_OF_ROLES) ; i++) {
-      new iam.Role(this, `Role${i}`, {
+      const role = new iam.Role(this, `Role${i}`, {
         assumedBy: new iam.ServicePrincipal('lambda.amazonaws.com'),
       });
+      const cfnRole = role.node.defaultChild;
+
+      // For any extra IAM roles created, add a ton of metadata so that the template size is > 50 KiB.
+      if (i > 1) {
+        for(let i = 1; i <= 30 ; i++) {
+          cfnRole.addMetadata('a'.repeat(1000), 'v');
+        }
+      }
     }
   }
 }
@@ -792,6 +800,7 @@ switch (stackSet) {
 
     new LambdaStack(app, `${stackPrefix}-lambda`);
 
+    // This stack is used to test diff with large templates by creating a role with a ton of metadata
     new IamRolesStack(app, `${stackPrefix}-iam-roles`);
 
     if (process.env.ENABLE_VPC_TESTING == 'IMPORT') {

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

@@ -1034,18 +1034,18 @@ integTest(
 integTest(
   'cdk diff with large changeset does not fail',
   withDefaultFixture(async (fixture) => {
-    // GIVEN - small initial stack with only ane IAM role
+    // GIVEN - small initial stack with only one IAM role
     await fixture.cdkDeploy('iam-roles', {
       modEnv: {
         NUMBER_OF_ROLES: '1',
       },
     });
 
-    // WHEN - adding 200 roles to the same stack to create a large diff
+    // WHEN - adding an additional role with a ton of metadata to create a large diff
     const diff = await fixture.cdk(['diff', fixture.fullStackName('iam-roles')], {
       verbose: true,
       modEnv: {
-        NUMBER_OF_ROLES: '200',
+        NUMBER_OF_ROLES: '2',
       },
     });
 
@@ -1055,6 +1055,40 @@ integTest(
   }),
 );
 
+integTest('cdk diff with large changeset and custom toolkit stack name and qualifier does not fail', withoutBootstrap(async (fixture) => {
+  // Bootstrapping with custom toolkit stack name and qualifier
+  const qualifier = 'abc1111';
+  const toolkitStackName = 'custom-stack2';
+  await fixture.cdkBootstrapModern({
+    verbose: true,
+    toolkitStackName: toolkitStackName,
+    qualifier: qualifier,
+  });
+
+  // Deploying small initial stack with only one IAM role
+  await fixture.cdkDeploy('iam-roles', {
+    modEnv: {
+      NUMBER_OF_ROLES: '1',
+    },
+    options: [
+      '--toolkit-stack-name', toolkitStackName,
+      '--context', `@aws-cdk/core:bootstrapQualifier=${qualifier}`,
+    ],
+  });
+
+  // WHEN - adding a role with a ton of metadata to create a large diff
+  const diff = await fixture.cdk(['diff', '--toolkit-stack-name', toolkitStackName, '--context', `@aws-cdk/core:bootstrapQualifier=${qualifier}`, fixture.fullStackName('iam-roles')], {
+    verbose: true,
+    modEnv: {
+      NUMBER_OF_ROLES: '2',
+    },
+  });
+
+  // Assert that the CLI assumes the file publishing role:
+  expect(diff).toMatch(/Assuming role .*file-publishing-role/);
+  expect(diff).toContain('success: Published');
+}));
+
 integTest(
   'cdk diff --security-only successfully outputs sso-permission-set-without-managed-policy information',
   withDefaultFixture(async (fixture) => {

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

@@ -32,9 +32,9 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/integ-runner": "^0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@aws-sdk/client-acm": "3.421.0",
-    "@aws-sdk/client-rds": "3.421.0",
-    "@aws-sdk/client-s3": "3.421.0",
+    "@aws-sdk/client-acm": "3.632.0",
+    "@aws-sdk/client-rds": "3.632.0",
+    "@aws-sdk/client-s3": "3.632.0",
     "delay": "5.0.0"
   },
   "dependencies": {
@@ -43,7 +43,6 @@
     "@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
     "@aws-cdk/lambda-layer-kubectl-v30": "^2.0.1",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk-mock": "5.6.0",
     "cdk8s": "2.69.0",
     "cdk8s-plus-27": "2.9.5",
     "constructs": "^10.0.0"

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.delete-existing-record-set.js.snapshot/cdk-route53-integ-delete-existing-record-set.template.json

@@ -151,7 +151,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "e0e799a729f2e647a95d0ba4e1b63e93839a8f3034bfcb17ba52ea561cafba19.zip"
+     "S3Key": "782a34c2ce2f5bc5e5b90304f41348680a6f9ba7a0eb2de6f03658640f67ff15.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

packages/@aws-cdk-testing/framework-integ/test/triggers/test/integ.triggers.js.snapshot/MyStack.template.json

@@ -238,7 +238,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "ac5727a1b8e23c42dabba9ff5155c8fb26ae68568e083beac0908af8e70fc606.zip"
+     "S3Key": "6e5c0f63875937fea22d274138fc297c2a753e7516d437661017ee38ced6816c.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,