From 5b10bde8560b12450484e36d9f0013d4593c760b Mon Sep 17 00:00:00 2001 From: Ian Hou <45278651+iankhou@users.noreply.github.com> Date: Wed, 19 Feb 2025 11:12:09 -0500 Subject: [PATCH] toolkitStackName is passed to Bootstrapper from Toolkit --- .../@aws-cdk/toolkit-lib/lib/actions/bootstrap/index.ts | 3 +-- packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/@aws-cdk/toolkit-lib/lib/actions/bootstrap/index.ts b/packages/@aws-cdk/toolkit-lib/lib/actions/bootstrap/index.ts index 89d30795..ebb8583f 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/actions/bootstrap/index.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/actions/bootstrap/index.ts @@ -4,7 +4,6 @@ import { Tag, StringWithoutPlaceholders } from '../../api/aws-cdk'; * Options for the bootstrapEnvironment operation(s) */ export interface BootstrapOptions { - readonly toolkitStackName?: string; readonly roleArn?: StringWithoutPlaceholders; readonly parameters?: BootstrappingParameters; readonly force?: boolean; @@ -134,4 +133,4 @@ export interface BootstrappingParameters { readonly customPermissionsBoundary?: string; } -export type BootstrapSource = { source: 'legacy' } | { source: 'default' } | { source: 'custom'; templateFile: string }; \ No newline at end of file +export type BootstrapSource = { source: 'legacy' } | { source: 'default' } | { source: 'custom'; templateFile: string }; diff --git a/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts b/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts index abeee222..74cd2c23 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts @@ -166,7 +166,11 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab strategy: StackSelectionStrategy.ALL_STACKS, }); - const bootstrapper = new Bootstrapper(options.source, { ioHost: withAction(this.ioHost, 'bootstrap'), action: 'bootstrap' }); + const bootstrapper = new Bootstrapper( + options.source, + { ioHost: withAction(this.ioHost, 'bootstrap'), action: 'bootstrap' }, + this.toolkitStackName, + ); const environments = stackCollection.stackArtifacts.map(stack => stack.environment); const sdkProvider = await this.sdkProvider('bootstrap');