Skip to content
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

fix(CLI): bootstrap shows no hotswap changes when there are no changes #29877

Merged
merged 4 commits into from
Apr 19, 2024
Merged

fix(CLI): bootstrap shows no hotswap changes when there are no changes #29877

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19a4dbd
fix
comcalvi Apr 17, 2024
881857b
Merge branch 'main' into comcalvi/bootstrap-hotswap
mergify[bot] Apr 18, 2024
525a676
Merge branch 'main' into comcalvi/bootstrap-hotswap
mergify[bot] Apr 19, 2024
c82630f
Merge branch 'main' into comcalvi/bootstrap-hotswap
mergify[bot] Apr 19, 2024
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
7 changes: 4 additions & 3 deletions packages/aws-cdk/lib/api/deploy-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,13 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
? templateParams.updateExisting(finalParameterValues, cloudFormationStack.parameters)
: templateParams.supplyAll(finalParameterValues);

const hotswapMode = options.hotswap ?? HotswapMode.FULL_DEPLOYMENT;

if (await canSkipDeploy(options, cloudFormationStack, stackParams.hasChanges(cloudFormationStack.parameters))) {
debug(`${deployName}: skipping deployment (use --force to override)`);
// if we can skip deployment and we are performing a hotswap, let the user know
// that no hotswap deployment happened
if (options.hotswap !== HotswapMode.FULL_DEPLOYMENT) {
if (hotswapMode !== HotswapMode.FULL_DEPLOYMENT) {
print(`\n ${ICON} %s\n`, chalk.bold('hotswap deployment skipped - no changes were detected (use --force to override)'));
}
return {
Expand All @@ -289,8 +291,7 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
parallel: options.assetParallelism,
});

const hotswapMode = options.hotswap;
if (hotswapMode && hotswapMode !== HotswapMode.FULL_DEPLOYMENT) {
if (hotswapMode !== HotswapMode.FULL_DEPLOYMENT) {
// attempt to short-circuit the deployment if possible
try {
const hotswapDeploymentResult = await tryHotswapDeployment(
Expand Down
Loading