Skip to content

chore(toolkit-lib): recommend to use drift aware change sets when deploying to Cloudformation after hotswapping #1467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aws-cdk-automation merged 8 commits into from
May 4, 2026
Merged

chore(toolkit-lib): recommend to use drift aware change sets when deploying to Cloudformation after hotswapping #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
befd356
recommend drift aware
May 1, 2026
15ff841
phrasing
May 1, 2026
ae87331
Merge branch 'main' into use-drift-aware-after-hotswap
ShadowCat567 May 1, 2026
3d6ef1d
chore: self mutation
github-actions[bot] May 1, 2026
454b245
fix
May 1, 2026
b0bad58
Merge branch 'use-drift-aware-after-hotswap' of github.com:aws/aws-cd…
May 1, 2026
e3d00ef
updates
May 1, 2026
ef181ff
fix when message appears - should not just be when fallback is config…
May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/@aws-cdk/toolkit-lib/lib/api/deployments/deploy-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ export async function deployStack(options: DeployStackOptions, ioHelper: IoHelpe
);

if (hotswapDeploymentResult) {
await ioHelper.defaults.info(
`Your next non-hotswap deployment with ${stackEnv.name} should include '--revert-drift' to resolve the drift that was introduced while hotswapping.`,
);
return hotswapDeploymentResult;
}

Expand Down
18 changes: 18 additions & 0 deletions packages/@aws-cdk/toolkit-lib/test/api/deployments/deploy-stack.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,24 @@ test('correctly passes SSM parameters when hotswapping', async () => {
);
});

test('prints revert-drift recommendation on successful hotswap deployment', async () => {
givenStackExists();
(tryHotswapDeployment as jest.Mock).mockResolvedValue({
type: 'did-deploy-stack', noOp: false, stackArn: 'arn:stack', outputs: {},
});

// WHEN
await testDeployStack({
...standardDeployStackArguments(),
deploymentMethod: { method: 'hotswap' },
});

// THEN
expect(ioHost.notifySpy).toHaveBeenCalledWith(expect.objectContaining({
message: expect.stringMatching(/should include '--revert-drift' to resolve the drift that was introduced while hotswapping/),
}));
});

describe('hotswap template cache', () => {
test('writeHotswapTemplateCache is called on a successful hotswap deployment', async () => {
// GIVEN
Expand Down
Loading