diff --git a/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts b/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts index 13710b6c53b09..3ad02171d750f 100644 --- a/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts +++ b/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); } diff --git a/packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js b/packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js index dd2797823198f..6ac252b4ac5aa 100755 --- a/packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js +++ b/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') { diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts index a38580d10714a..6e98a1a7e6654 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts +++ b/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) => { diff --git a/packages/aws-cdk/lib/api/util/cloudformation.ts b/packages/aws-cdk/lib/api/util/cloudformation.ts index 27822ca4c8378..85a2742449da0 100644 --- a/packages/aws-cdk/lib/api/util/cloudformation.ts +++ b/packages/aws-cdk/lib/api/util/cloudformation.ts @@ -305,6 +305,7 @@ export type PrepareChangeSetOptions = { sdkProvider: SdkProvider; stream: NodeJS.WritableStream; parameters: { [name: string]: string | undefined }; + toolkitStackName?: string; resourcesToImport?: ResourcesToImport; } @@ -375,9 +376,11 @@ async function uploadBodyParameterAndCreateChangeSet(options: PrepareChangeSetOp for (const entry of file_entries) { await options.deployments.buildSingleAsset(artifact, assetManifest, entry, { stack: options.stack, + toolkitStackName: options.toolkitStackName, }); await options.deployments.publishSingleAsset(assetManifest, entry, { stack: options.stack, + toolkitStackName: options.toolkitStackName, }); } } diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index b0af703770d3f..4f07c3ed7a4ff 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -186,6 +186,7 @@ export class CdkToolkit { parameters: Object.assign({}, parameterMap['*'], parameterMap[stack.stackName]), resourcesToImport, stream, + toolkitStackName: options.toolkitStackName, }); } else { debug(`the stack '${stack.stackName}' has not been deployed to CloudFormation or describeStacks call failed, skipping changeset creation.`); @@ -1062,6 +1063,13 @@ export interface DiffOptions { */ stackNames: string[]; + /** + * Name of the toolkit stack, if not the default name + * + * @default 'CDKToolkit' + */ + readonly toolkitStackName?: string; + /** * Only select the given stack * diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 9d61a448c9a91..ea2ae08c013cb 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -505,6 +505,7 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise