Skip to content

Commit 321f073

Browse files
committed
fixup
1 parent 05df617 commit 321f073

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

packages/@aws-cdk/toolkit/lib/actions/deploy/index.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,6 @@ export interface BaseDeployOptions {
115115
*/
116116
readonly stacks?: StackSelector;
117117

118-
/**
119-
* @deprecated set on toolkit
120-
* Name of the toolkit stack to use/deploy
121-
*
122-
* @default CDKToolkit
123-
*/
124-
readonly toolkitStackName?: string;
125-
126118
/**
127119
* Role to pass to CloudFormation for deployment
128120
*/

packages/@aws-cdk/toolkit/lib/api/aws-cdk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export { Deployments, type SuccessfulDeployStackResult } from '../../../../aws-c
77
export { Settings } from '../../../../aws-cdk/lib/api/settings';
88
export { tagsForStack } from '../../../../aws-cdk/lib/api/tags';
99
export { DEFAULT_TOOLKIT_STACK_NAME } from '../../../../aws-cdk/lib/api/toolkit-info';
10+
export { ResourceMigrator } from '../../../../aws-cdk/lib/api/resource-import';
1011

1112
// Context Providers
1213
export * as contextproviders from '../../../../aws-cdk/lib/context-providers';
@@ -19,7 +20,6 @@ export { formatTime } from '../../../../aws-cdk/lib/api/util/string-manipulation
1920

2021
// @todo Not yet API probably should be
2122
export { formatErrorMessage } from '../../../../aws-cdk/lib/util/error';
22-
export { ResourceMigrator } from '../../../../aws-cdk/lib/migrator';
2323
export { obscureTemplate, serializeStructure } from '../../../../aws-cdk/lib/serialize';
2424
export { loadTree, some } from '../../../../aws-cdk/lib/tree';
2525
export { splitBySize } from '../../../../aws-cdk/lib/util';

packages/@aws-cdk/toolkit/lib/toolkit/toolkit.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,12 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
256256
}
257257

258258
const deployments = await this.deploymentsForAction('deploy');
259-
const migrator = new ResourceMigrator({ deployments });
259+
const migrator = new ResourceMigrator({ deployments, ioHost, action });
260260

261-
await migrator.tryMigrateResources(stackCollection, options);
261+
await migrator.tryMigrateResources(stackCollection, {
262+
toolkitStackName: this.toolkitStackName,
263+
...options,
264+
});
262265

263266
const requireApproval = options.requireApproval ?? RequireApproval.NEVER;
264267

0 commit comments

Comments
 (0)