From d86170d5e7fe204777c298305a6f75d73c777c12 Mon Sep 17 00:00:00 2001
From: notgitika <gitijh@gmail.com>
Date: Wed, 13 May 2026 10:51:04 -0400
Subject: [PATCH] fix(deploy): restore stack selection strategy for deploy and
 diff

Adds StackSelectionStrategy.PATTERN_MUST_MATCH with targetStackName to
toolkitWrapper.deploy() and toolkitWrapper.diff() calls. Without this,
the CDK toolkit fails with "NoStack: CloudFormationStack object does not
hold a stack" when deploying projects with HTTP gateways.

Also fixes multi-target consistency: uses targetStackName (derived from
project name + target name) as the canonical stackName throughout the
function, and scopes checkStackDeployability to the target stack only.
Adds a guard that fails early if the target stack isn't found in the
synthesized assembly.
---
 src/cli/commands/deploy/actions.ts | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/cli/commands/deploy/actions.ts b/src/cli/commands/deploy/actions.ts
index 803cc2852..f7210a9b2 100644
--- a/src/cli/commands/deploy/actions.ts
+++ b/src/cli/commands/deploy/actions.ts
@@ -43,7 +43,9 @@ import {
 } from '../../operations/deploy/post-deploy-config-bundles';
 import { setupHttpGateways } from '../../operations/deploy/post-deploy-http-gateways';
 import { enableOnlineEvalConfigs } from '../../operations/deploy/post-deploy-online-evals';
+import { toStackName } from '../import/import-utils';
 import type { DeployResult } from './types';
+import { StackSelectionStrategy } from '@aws-cdk/toolkit-lib';
 
 export interface ValidatedDeployOptions {
   target: string;
@@ -248,7 +250,13 @@ export async function handleDeploy(options: ValidatedDeployOptions): Promise<Dep
       logger.finalize(false);
       return { success: false, error: 'No stacks found to deploy', logPath: logger.getRelativeLogPath() };
     }
-    const stackName = stackNames[0]!;
+    const targetStackName = toStackName(context.projectSpec.name, target.name);
+    if (!stackNames.includes(targetStackName)) {
+      endStep('error', `Stack "${targetStackName}" not found in synthesized stacks`);
+      logger.finalize(false);
+      return { success: false, error: `Stack "${targetStackName}" not found`, logPath: logger.getRelativeLogPath() };
+    }
+    const stackName = targetStackName;
     endStep('success');
 
     // Check if bootstrap needed
@@ -272,7 +280,7 @@ export async function handleDeploy(options: ValidatedDeployOptions): Promise<Dep
 
     // Check stack deployability
     startStep('Check stack status');
-    const deployabilityCheck = await checkStackDeployability(target.region, stackNames);
+    const deployabilityCheck = await checkStackDeployability(target.region, [stackName]);
     if (!deployabilityCheck.canDeploy) {
       endStep('error', deployabilityCheck.message);
       logger.finalize(false);
@@ -311,7 +319,9 @@ export async function handleDeploy(options: ValidatedDeployOptions): Promise<Dep
         }
       });
       diffIoHost.setVerbose(true);
-      await toolkitWrapper.diff();
+      await toolkitWrapper.diff({
+        stacks: { strategy: StackSelectionStrategy.PATTERN_MUST_MATCH, patterns: [targetStackName] },
+      });
       if (!hasDiffContent) {
         console.log('No stack differences detected.');
       }
@@ -349,7 +359,9 @@ export async function handleDeploy(options: ValidatedDeployOptions): Promise<Dep
       switchableIoHost.setVerbose(true);
     }
 
-    await toolkitWrapper.deploy();
+    await toolkitWrapper.deploy({
+      stacks: { strategy: StackSelectionStrategy.PATTERN_MUST_MATCH, patterns: [targetStackName] },
+    });
 
     // Disable verbose output
     if (switchableIoHost) {