@go-to-k/cdkd 0.284.83 → 0.284.85

package/dist/{deploy-engine-BES1Z20a.js → deploy-engine-BoDdOfCO.js}

@@ -1,5 +1,5 @@
 import { d as generateResourceName, f as generateResourceNameWithFallback, g as withStackName, m as looksLikeCdkdGeneratedName, n as getLogger, o as getLiveRenderer, p as getCurrentStackName, u as applyDefaultNameForFallback } from "./logger-C9-E73FI.js";
-import { t as getCdkdVersion } from "./version-DI03miJ9.js";
+import { t as getCdkdVersion } from "./version-cNxTfzBH.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomUUID } from "node:crypto";
 import { CreateBucketCommand, DeleteObjectCommand, DeleteObjectsCommand, GetBucketLocationCommand, GetObjectCommand, HeadBucketCommand, HeadObjectCommand, ListObjectVersionsCommand, ListObjectsV2Command, NoSuchKey, PutBucketEncryptionCommand, PutBucketPolicyCommand, PutObjectCommand, PutPublicAccessBlockCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
@@ -4257,6 +4257,85 @@ function isListParameterType(type) {
 	if (type === "CommaDelimitedList") return true;
 	return type.length > 6 && type.startsWith("List<") && type.endsWith(">");
 }
+/**
+* The literal prefix of the Systems Manager parameter form. Declared ABOVE the
+* docblock below so that docblock attaches to {@link ssmResolvedValueType}
+* rather than to this constant.
+*/
+const SSM_PARAMETER_VALUE_PREFIX = "AWS::SSM::Parameter::Value<";
+/**
+* ONE definition of "peel the inner shape out of
+* `AWS::SSM::Parameter::Value<...>`", returning `undefined` when `type` is not
+* that form.
+*
+* It lives beside {@link isListParameterType} for the reason that predicate
+* exists at all: this file was created by issue
+* [#2347](https://github.com/go-to-k/cdkd/issues/2347) after cdkd was found
+* holding TWO answers to one type question in these same two modules, and
+* issue [#2367](https://github.com/go-to-k/cdkd/issues/2367) then wrote a
+* SECOND peel in `src/deployment/intrinsic-function-resolver.ts` next to the
+* one already in `src/synthesis/macro-expander.ts` -- reproducing the exact
+* shape #2347 had just deleted, one question with two spellings in one file
+* pair. Both now call this.
+*
+* ## The two callers, and the one deliberate difference between them
+*
+* The peel is shared; the handling of a MALFORMED spelling is not, and that is
+* a call-site policy rather than a second answer:
+*
+*  - `resolveParameters` (deployment) treats `undefined` as "do not coerce" and
+*    keeps the resolved string verbatim -- the safe direction on a path that
+*    writes state.
+*  - `stringifyParamDefault` (synthesis) keeps its own pre-existing behaviour
+*    of emitting the SCALAR placeholder for anything carrying the prefix,
+*    including a malformed one, rather than falling through to its generic
+*    warn + `PARAMETER_PLACEHOLDER`. Routing a malformed spelling to that
+*    fallback would change the emitted placeholder text (`placeholder` ->
+*    `cdkd-macro-expand-placeholder`) and add a warn line, which is a
+*    behaviour change unrelated to #2367.
+*
+* The STRICTNESS here is the stricter of the two originals: a closing `>` is
+* required and the inner shape must be non-empty, so `Value<` and `Value<>`
+* peel to `undefined`. The synthesis site never required either, but it also
+* never distinguished the cases -- `''` is not list-shaped, so it took the
+* scalar arm, which is what its `undefined` branch now does explicitly.
+*
+* ## WHAT THE SUPPLIED VALUE IS -- AN OPEN DISAGREEMENT INSIDE THIS REPO
+*
+* This function answers only "what shape does `Value<...>` WRAP". It
+* deliberately does NOT settle what the value SUPPLIED for such a parameter
+* means, because cdkd currently holds two incompatible readings and this
+* function's callers do not need the answer:
+*
+*  - **Read from the AWS documentation** (`cloudformation-supplied-parameter-types.html`,
+*    2026-08-29): the supplied value is ONE Parameter Store key, phrased in the
+*    singular throughout ("you must specify a Parameter Store key", "you must
+*    provide the parameter name"), with `Value<List<String>>` /
+*    `Value<CommaDelimitedList>` described as "a Systems Manager parameter
+*    whose value is a list of strings". `aws-cdk-lib`'s own
+*    `StringListParameter.fromListParameterAttributes` agrees: it emits
+*    `{type: 'AWS::SSM::Parameter::Value<List<String>>', default:
+*    attrs.parameterName}` -- a single name.
+*  - **A LIVE CloudFormation OBSERVATION** recorded at
+*    `src/synthesis/macro-expander.ts` (the CR-MJ3 fix): a single-string
+*    placeholder against a `Value<List<*>>` type "would reject the changeset
+*    with `Parameter ... must be a list`", which is why that site emits a
+*    2-element comma-joined placeholder. Someone watched CloudFormation do
+*    that, and a live observation outranks a documentation read.
+*
+* THESE MAY BOTH BE TRUE OF DIFFERENT THINGS -- CloudFormation's pre-macro
+* changeset VALIDATOR may demand a list-shaped literal while the runtime
+* resolves one key -- and that reconciliation is plausible but UNMEASURED. It
+* is recorded as unresolved rather than decided, and neither caller depends on
+* it: the synthesis site is choosing a placeholder for a validator, and the
+* deployment site is coercing a value `GetParameter` ALREADY returned, which is
+* downstream of whatever the supplied key meant.
+*/
+function ssmResolvedValueType(type) {
+	if (!type.startsWith("AWS::SSM::Parameter::Value<") || !type.endsWith(">")) return void 0;
+	const inner = type.slice(27, -1);
+	return inner.length > 0 ? inner : void 0;
+}
 
 //#endregion
 //#region src/synthesis/macro-expander.ts
@@ -4531,7 +4610,8 @@ function stringifyParamDefault(value, type, paramKey, logger) {
 		const known = PARAMETER_TYPE_PLACEHOLDERS[type];
 		if (known !== void 0) return known;
 		if (type.startsWith("AWS::SSM::Parameter::Value<")) {
-			if (isListParameterType(type.slice(27, -1))) return "placeholder,placeholder";
+			const inner = ssmResolvedValueType(type);
+			if (inner !== void 0 && isListParameterType(inner)) return "placeholder,placeholder";
 			return "placeholder";
 		}
 		logger.warn(`Parameter '${paramKey}' has unrecognized CFn Type '${type}'; using a generic string placeholder for the transient macro-expansion changeset. If CFn rejects the changeset with a type error, file an issue with the offending Type.`);
@@ -14972,8 +15052,10 @@ function describe(value) {
 //#region src/provisioning/region-check.ts
 /**
 * Verify that the AWS client's region matches the region the resource is
-* expected to live in before treating a `NotFound` error as idempotent
-* delete success.
+* expected to live in — before treating a `NotFound` error as idempotent
+* delete success (`phase: 'not-found'`), or before issuing a mutating call
+* against a state-recorded physical id at all (`'pre-delete'` /
+* `'pre-update'`, issue #2301).
 *
 * Why: a destroy run with the wrong region would otherwise receive
 * `*NotFound` for every resource and silently strip them all from state,
@@ -14982,13 +15064,24 @@ function describe(value) {
 * `us-west-2` removed from state by a destroy that ran with a `us-east-1`
 * client.
 *
-* Behavior:
+* And a `NotFound` is not the only way that ends badly, which is what the
+* pre-flight phases add: many physical ids are names rather than ARNs, so the
+* same name usually EXISTS in the client's region too (the same stack deployed
+* twice, or cdkd's own `resource-name.ts` deriving an identical name from an
+* identical stack + logical id). Then the wrong-region call never errors — it
+* succeeds against the wrong resource. That path is unrecoverable on delete
+* and a misapplied configuration on update, and neither ever reaches the
+* `NotFound` branch this helper originally lived on.
+*
+* Behavior (identical in every phase):
 * - If `expectedRegion` is unset, this is a no-op (back-compat: existing
 *   idempotent semantics preserved for callers that have not been
-*   threaded with state region).
+*   threaded with state region). An EMPTY string counts as unset — a caller
+*   typed `region: string` can hand one over, and refusing on it would make
+*   this guard reject its own default.
 * - If `clientRegion` matches `expectedRegion`, returns silently.
 * - Otherwise throws `ProvisioningError` so the caller surfaces the
-*   mismatch instead of swallowing the NotFound.
+*   mismatch instead of swallowing the NotFound / issuing the call.
 *
 * @param clientRegion Region resolved from the AWS SDK client config
 *   (typically `await client.config.region()`).
@@ -14998,13 +15091,27 @@ function describe(value) {
 *   message and on the thrown ProvisioningError.
 * @param logicalId Logical ID of the resource, used in the error message
 *   and on the thrown ProvisioningError.
-* @param physicalId Optional physical ID, used in the error message and
-*   on the thrown ProvisioningError.
+* @param physicalId Optional physical ID, carried on the thrown
+*   ProvisioningError.
+* @param phase Which call is being guarded — see {@link RegionCheckPhase}.
+*   Defaults to the historical `'not-found'` so every pre-#2301 call site
+*   keeps its exact wording.
 */
-function assertRegionMatch(clientRegion, expectedRegion, resourceType, logicalId, physicalId) {
+function assertRegionMatch(clientRegion, expectedRegion, resourceType, logicalId, physicalId, phase = "not-found") {
 	if (!expectedRegion) return;
-	if (!clientRegion) throw new ProvisioningError(`Refusing to treat NotFound as idempotent delete success for ${logicalId} (${resourceType}): AWS client region is unknown but stack state expects ${expectedRegion}. The resource may exist in ${expectedRegion} and would be silently removed from state if this NotFound were trusted.`, resourceType, logicalId, physicalId);
-	if (clientRegion !== expectedRegion) throw new ProvisioningError(`Refusing to treat NotFound as idempotent delete success for ${logicalId} (${resourceType}): AWS client region ${clientRegion} does not match stack state region ${expectedRegion}. The resource likely still exists in ${expectedRegion}; rerun the destroy with the correct region (e.g. --region ${expectedRegion}).`, resourceType, logicalId, physicalId);
+	if (!clientRegion) throw new ProvisioningError(phase === "not-found" ? `Refusing to treat NotFound as idempotent delete success for ${logicalId} (${resourceType}): AWS client region is unknown but stack state expects ${expectedRegion}. The resource may exist in ${expectedRegion} and would be silently removed from state if this NotFound were trusted.` : `Refusing to ${phaseVerb(phase)} ${logicalId} (${resourceType}): AWS client region is unknown but stack state records the resource in ${expectedRegion}. cdkd cannot confirm that the physical id recorded in state names the resource this client would act on, so the ${phaseVerb(phase)} is not issued. Point the AWS client at ${expectedRegion} (AWS_REGION or your AWS profile) and re-run.`, resourceType, logicalId, physicalId);
+	if (clientRegion !== expectedRegion) throw new ProvisioningError(phase === "not-found" ? `Refusing to treat NotFound as idempotent delete success for ${logicalId} (${resourceType}): AWS client region ${clientRegion} does not match stack state region ${expectedRegion}. The resource likely still exists in ${expectedRegion}; rerun the destroy with the correct region (e.g. --region ${expectedRegion}).` : `Refusing to ${phaseVerb(phase)} ${logicalId} (${resourceType}): AWS client region ${clientRegion} does not match stack state region ${expectedRegion}. The physical id recorded in cdkd state names a resource in ${expectedRegion}, so this ${phaseVerb(phase)} would act on whatever carries that id in ${clientRegion} instead — which for a name-shaped physical id is a different resource that usually exists. Point the AWS client at ${expectedRegion} (AWS_REGION or your AWS profile) and re-run; when the run spans several regions at once (cdkd drift --all), select the stacks in one region per run, because no single client region is correct for all of them. If the recorded region is the wrong one, correct the state record (cdkd state show).`, resourceType, logicalId, physicalId);
+}
+/**
+* The operation a pre-flight phase is about to issue, for the message.
+*
+* `'not-found'` is EXCLUDED from the parameter type rather than mapped to a
+* verb: both call sites already sit in the `else` of a
+* `phase === 'not-found' ? ... : ...`, so an arm answering for it would be
+* unreachable, and an unreachable arm is a claim no test can hold to account.
+*/
+function phaseVerb(phase) {
+	return phase === "pre-update" ? "update" : "delete";
 }
 
 //#endregion
@@ -16722,6 +16829,62 @@ function coerceParameterTypedValue(value, type) {
 	return value;
 }
 /**
+* Bind a template-declared `Default` the way the USER-SUPPLIED path binds a
+* value (issue
+* [#2367](https://github.com/go-to-k/cdkd/issues/2367)).
+*
+* `resolveParameters` writes `parameters[name]` at three sites and only the
+* user-supplied one asked the coercion anything, so a parameter declared
+* `Type: CommaDelimitedList` with `Default: "a,b,c"` and no CLI override
+* reached every consumer as the raw string -- `Fn::Select` over it threw
+* `Fn::Select: list must be an array, got string`, and a bare `Ref` handed the
+* provider a comma-joined scalar where the resource schema declares a list.
+* The defect predates the #2347 widening: it hits `CommaDelimitedList` and
+* `List<Number>`, the two list types the `switch` has recognised all along.
+*
+* CloudFormation's own documentation is written in exactly these terms --
+* `parameters-section-structure.html`'s worked example declares
+* `VpcAzs: {Type: CommaDelimitedList, Default: "us-west-2a, us-west-2b,
+* us-west-2c"}` and then reads it with `Fn::Select`, which is the case that
+* threw.
+*
+* ONLY A STRING IS COERCED, and that is the whole of the rule. `Default` is
+* typed `unknown` because it is whatever the template parser produced, and the
+* shapes are not hypothetical -- measured 2026-08-29 on both parsers cdkd
+* feeds this from:
+*
+*  - `aws-cdk-lib`'s `CfnParameter._toCloudFormation` emits `Default:
+*    this.default` with no conversion, so `{type: 'Number', default: 42}`
+*    synthesizes the JSON NUMBER `42`, and `{type: 'CommaDelimitedList',
+*    default: ['a','b','c']}` synthesizes a JSON ARRAY;
+*  - `parseCfnTemplate` (`src/cli/yaml-cfn.ts`), on the `cdkd import
+*    --migrate-from-cloudformation` / `cdkd export` path, resolves `Default:
+*    42` to a number, `Default: "42"` to a string, a YAML sequence to an array
+*    and `Default: true` to a boolean.
+*
+* FOR THE SHAPES MEASURED ABOVE, a non-string default is already what the
+* declared type calls for -- `42` for a `Number`, `['a','b']` for a
+* `CommaDelimitedList` -- so coercing it could only damage it.
+* `String(['a,b','c'])` is `'a,b,c'`, which the split would then shred into
+* THREE elements, and `String(true)` would turn a boolean a consumer sees today
+* into text. Stringifying first is therefore not a harmless normalization, and
+* `coerceParameterTypedValue` takes a `string` precisely because parsing the
+* wire text is its whole job.
+*
+* THE CLAIM IS SCOPED TO THOSE SHAPES ON PURPOSE, because a mismatched pairing
+* is reachable and is NOT in it: YAML admits `Type: CommaDelimitedList` with
+* `Default: 42` or `Default: true`, and such a default is passed through as the
+* scalar it parsed to rather than becoming a one-element list. That is the
+* PRE-EXISTING behaviour, unchanged here and deliberately so -- a template
+* pairing a list type with a scalar default is malformed CloudFormation, and
+* inventing a coercion for it on a path that writes state is a bigger decision
+* than this fix.
+*/
+function coerceParameterDefault(defaultValue, type) {
+	if (typeof defaultValue !== "string") return defaultValue;
+	return coerceParameterTypedValue(defaultValue, type);
+}
+/**
 * The inherited `plaintext -> expression` pairs that `value` CARRIES.
 *
 * ONE definition, shared by the RECORDING side
@@ -17229,11 +17392,12 @@ var IntrinsicFunctionResolver = class IntrinsicFunctionResolver {
 					const ssmPath = String(paramDef.Default);
 					this.logger.debug(`Parameter ${name}: resolving SSM parameter path ${ssmPath}`);
 					const resolved = await this.resolveSSMParameter(ssmPath);
-					parameters[name] = resolved;
+					const resolvedType = ssmResolvedValueType(paramDef.Type);
+					parameters[name] = resolvedType === void 0 ? resolved : this.coerceParameterValue(resolved, resolvedType);
 					this.logger.debug(`Parameter ${name}: resolved SSM value ${maskInherited(stringifyParameterForLog(paramDef, resolved))}`);
 					continue;
 				}
-				parameters[name] = paramDef.Default;
+				parameters[name] = coerceParameterDefault(paramDef.Default, paramDef.Type);
 				this.logger.debug(`Parameter ${name}: using default value ${maskInherited(stringifyParameterForLog(paramDef, paramDef.Default))}`);
 				continue;
 			}
@@ -20478,8 +20642,9 @@ var CloudControlProvider = class {
 	/**
 	* Update a resource using Cloud Control API
 	*/
-	async update(logicalId, physicalId, resourceType, properties, previousProperties) {
+	async update(logicalId, physicalId, resourceType, properties, previousProperties, context) {
 		this.logger.debug(`Updating resource ${logicalId} (${resourceType}), physical ID: ${physicalId}`);
+		await this.assertRecordedRegionAgainstClient("pre-update", context?.expectedRegion, resourceType, logicalId, physicalId);
 		try {
 			const cleanPreviousProperties = stringifyJsonProperties(resourceType, stripNullValues(previousProperties));
 			const cleanProperties = stringifyJsonProperties(resourceType, stripNullValues(properties));
@@ -20538,10 +20703,11 @@ var CloudControlProvider = class {
 	async delete(logicalId, physicalId, resourceType, _properties, context) {
 		this.logger.debug(`Deleting resource ${logicalId} (${resourceType}), physical ID: ${physicalId}`);
 		if (context?.finalSnapshotIdentifier !== void 0) throw new ProvisioningError(`${logicalId} (${resourceType}) requires a final snapshot (DeletionPolicy: Snapshot), but the Cloud Control API delete route has no final-snapshot parameter. Re-run with --skip-final-snapshot after snapshotting manually, or retain the resource.`, resourceType, logicalId, physicalId);
+		await this.assertRecordedRegionAgainstClient("pre-delete", context?.expectedRegion, resourceType, logicalId, physicalId);
 		await this.confirmDeleteTargetIdentity(logicalId, resourceType, physicalId, context);
 		if (context?.removeProtection === true && resourceType === "AWS::AutoScaling::AutoScalingGroup") {
 			this.logger.debug(`Delegating protected AutoScalingGroup ${logicalId} delete to the SDK ASGProvider (Cloud Control cannot force-delete a protected ASG)`);
-			const { ASGProvider } = await import("./asg-provider-B-KONBYk.js").then((n) => n.n);
+			const { ASGProvider } = await import("./asg-provider-CnpxfVci.js").then((n) => n.n);
 			return await new ASGProvider().delete(logicalId, physicalId, resourceType, _properties, context);
 		}
 		const isProtectedEc2Instance = context?.removeProtection === true && resourceType === "AWS::EC2::Instance";
@@ -20564,7 +20730,7 @@ var CloudControlProvider = class {
 		} catch (error) {
 			const err = error;
 			if (error instanceof CloudControlOperationFailedError && error.ccOperation === "DELETE" && error.ccErrorCode === "NotFound" || err.name === "ResourceNotFoundException" || err.message?.includes("does not exist") || err.message?.includes("not found") || err.message?.includes("NotFound")) {
-				assertRegionMatch(await this.cloudControlClient.config.region(), context?.expectedRegion, resourceType, logicalId, physicalId);
+				await this.assertRecordedRegionAgainstClient("not-found", context?.expectedRegion, resourceType, logicalId, physicalId);
 				this.logger.debug(`Resource ${logicalId} already deleted (not found), treating as success`);
 				return;
 			}
@@ -20578,15 +20744,77 @@ var CloudControlProvider = class {
 		}
 	}
 	/**
+	* Refuse a Cloud Control call whose target region cannot be shown to be the
+	* one the state record was written in (issue #2301).
+	*
+	* The ONE place this comparison happens, for all three phases: the
+	* pre-flights at the top of `delete()` and `update()`, and the reactive
+	* `not-found` arm inside `delete()`'s catch block. They can therefore never
+	* disagree about what "unknown region" means, nor about how a region is
+	* SPELLED -- the second one was live before this became shared: the reactive
+	* arm compared raw while the pre-flight folded case, so one correct call
+	* could pass the first and be refused by the second. THREE inputs, THREE outcomes, and they are
+	* deliberately not two:
+	*
+	*  - NO recorded region (`undefined`, or an empty / whitespace-only string)
+	*    -> PROCEED, and do not even resolve the client region. This is the
+	*    guard's OWN default: a `version: 1` state record predates the
+	*    region-scoped key layout and carries no region at all, and callers
+	*    typed `region: string` (`deploy-engine.ts`'s `stackRegion`) can hand
+	*    over `''`. Refusing on the absence would break every ordinary
+	*    destroy / update of a pre-v2 record, which is the over-tightening
+	*    failure a one-directional fence never sees.
+	*  - A recorded region that MATCHES the client -> proceed silently. This is
+	*    the ordinary path and it must stay free of new refusals: the whole
+	*    fleet of same-region deletes and updates runs through here.
+	*  - A recorded region that DIFFERS, or a client region that cannot be
+	*    resolved at all -> REFUSE before issuing anything.
+	*
+	* The unresolvable-client-region arm is the one asymmetry worth naming:
+	* {@link CloudControlProvider.confirmDeleteTargetIdentity} PROCEEDS when it
+	* cannot establish a region, and this helper refuses. The two are answering
+	* different questions. That probe asks a remote service where a globally
+	* unique NAME lives, and a least-privilege role that was never granted
+	* `s3:GetBucketLocation` would be stranded by a refusal. Here the caller has
+	* positively recorded a region, the comparison is local and free, and a
+	* client that cannot say where it points cannot be shown to point at that
+	* region -- the same answer `assertRegionMatch` has always given on its
+	* `not-found` phase.
+	*
+	* The refusal is marked non-retryable because it is deterministic: both
+	* loops that wrap these calls -- the destroy runner's own attempt loop and
+	* the deploy engine's / rollback executor's `withRetry` -- would otherwise
+	* spend their full budget re-deriving the same verdict, which reads to a
+	* user as flaky AWS rather than as a refusal.
+	*/
+	async assertRecordedRegionAgainstClient(phase, expectedRegion, resourceType, logicalId, physicalId) {
+		const recordedRegion = canonicalizeRegion(expectedRegion?.trim());
+		if (recordedRegion === void 0 || recordedRegion === "") return;
+		let clientRegion;
+		try {
+			clientRegion = canonicalizeRegion((await this.cloudControlClient.config.region())?.trim());
+		} catch (error) {
+			this.logger.debug(`Could not resolve the Cloud Control client region before the ${phase} region check for ${logicalId} (${resourceType}): ${error instanceof Error ? error.message : String(error)}`);
+			clientRegion = void 0;
+		}
+		try {
+			assertRegionMatch(clientRegion, recordedRegion, resourceType, logicalId, physicalId, phase);
+		} catch (error) {
+			throw markNonRetryable(error);
+		}
+	}
+	/**
 	* Confirm that the resource `physicalId` names actually lives in the region
 	* this destroy is targeting, for the types in
 	* {@link CC_DELETE_IDENTITY_CHECKED_TYPES}. No-op for every other type.
 	*
 	* WHAT THIS GUARDS THAT `assertRegionMatch` DOES NOT
 	* ---------------------------------------------------
-	* The existing `assertRegionMatch` in the catch block below compares the
-	* CLIENT's region against the state's region, and only on the `NotFound`
-	* branch. Both halves miss this hazard. An `AWS::S3::Bucket` physical id is
+	* The `assertRegionMatch` comparison — which since issue #2301 runs both as
+	* an unconditional pre-flight and on the `NotFound` arm below — compares the
+	* CLIENT's region against the STATE's. That misses this hazard however often
+	* it runs: both of its inputs can agree while the bucket the physical id
+	* names sits somewhere else entirely. An `AWS::S3::Bucket` physical id is
 	* a GLOBALLY unique name, so a state record written before the issue #2227 /
 	* #2245 guards existed can name a bucket that is ours but lives elsewhere --
 	* a cdkd-GENERATED bucket name carries no region or account: for a name cdkd
@@ -29498,7 +29726,10 @@ async function replaySingle(op, stateResources, stackName, ctx, resolver, orphan
 					op.resourceType,
 					desiredProps ?? {},
 					currentProps ?? {},
-					{ maskSecrets: createSecretMasker(secrets) }
+					{
+						maskSecrets: createSecretMasker(secrets),
+						expectedRegion: ctx.region
+					}
 				], op.logicalId, logger, isInterrupted, secrets);
 				stateResources[op.logicalId] = redactRollbackRecord(recordAfterRollbackUpdate(previousState, revertResult), secrets, previousState.properties);
 				const rollbackPartial = updatePartialReason(revertResult);
@@ -29651,7 +29882,10 @@ async function replayFailedOperations(failedOps, stateResources, stackName, ctx,
 						op.resourceType,
 						desiredProps ?? {},
 						attemptedProps ?? {},
-						{ maskSecrets: createSecretMasker(secrets) }
+						{
+							maskSecrets: createSecretMasker(secrets),
+							expectedRegion: ctx.region
+						}
 					], op.logicalId, logger, options.isInterrupted, secrets);
 					stateResources[op.logicalId] = redactRollbackRecord(recordAfterRollbackUpdate(prev, revertFailedResult), secrets, prev.properties);
 					const revertFailedPartial = updatePartialReason(revertFailedResult);
@@ -31957,7 +32191,10 @@ var DeployEngine = class {
 					let result;
 					let resultProvisionedBy = updateDecision.provisionedBy;
 					try {
-						result = await this.withRetry(() => withCurrentResourceSecrets(updateSecrets, () => updateProvider.update(logicalId, currentResource.physicalId, resourceType, updateProps, currentProps, { maskSecrets: createSecretMasker(updateSecrets) })), logicalId, void 0, void 0, updateProvider);
+						result = await this.withRetry(() => withCurrentResourceSecrets(updateSecrets, () => updateProvider.update(logicalId, currentResource.physicalId, resourceType, updateProps, currentProps, {
+							maskSecrets: createSecretMasker(updateSecrets),
+							expectedRegion: this.stackRegion
+						})), logicalId, void 0, void 0, updateProvider);
 					} catch (updateError) {
 						const msg = updateError instanceof Error ? updateError.message : String(updateError);
 						const ccUnsupported = msg.includes("UnsupportedActionException") || msg.includes("does not support UPDATE");
@@ -32050,7 +32287,7 @@ var DeployEngine = class {
 					}), logicalId, 3, 5e3, deleteProvider);
 				} catch (deleteError) {
 					const msg = deleteError instanceof Error ? deleteError.message : String(deleteError);
-					if (!isInterruptedWaitError(deleteError) && (msg.includes("does not exist") || msg.includes("was not found") || msg.includes("not found") || msg.includes("No policy found") || msg.includes("NoSuchEntity") || msg.includes("NotFoundException") || msg.includes("ResourceNotFoundException"))) this.logger.debug(`Resource ${logicalId} already deleted (${msg}), removing from state`);
+					if (!isInterruptedWaitError(deleteError) && !isMarkedNonRetryable(deleteError) && (msg.includes("does not exist") || msg.includes("was not found") || msg.includes("not found") || msg.includes("No policy found") || msg.includes("NoSuchEntity") || msg.includes("NotFoundException") || msg.includes("ResourceNotFoundException"))) this.logger.debug(`Resource ${logicalId} already deleted (${msg}), removing from state`);
 					else throw deleteError;
 				}
 				const deleteSkipped = deleteSkipReason(deleteResult);
@@ -32459,4 +32696,4 @@ var DeployEngine = class {
 
 //#endregion
 export { maskerOrIdentity as $, CFN_TEMPLATE_BODY_LIMIT as $n, maskSecretsInText as $t, renderStatefulReason as A, describeAwsFailure as An, PartialFailureError as Ar, requireConfigString as At, exportAliasCollisionScrubWarning as B, Synthesizer as Bn, normalizeAwsError as Br, INTRINSIC_KEYS as Bt, isFinalSnapshotError as C, getBootstrapMarkerKey as Cn, DynamicReferenceRegionAmbiguousError as Cr, coerceCfnBoolean as Ct, extractDeploymentEventError as D, validateAssetBucketName as Dn, LockError as Dr, replayWarn as Dt, makeCanonicalizePropertiesFn as E, readBootstrapMarkerBody as En, LocalStartServiceError as Er, readConfigString as Et, green as F, partitionSensitiveEnv as Fn, StackTerminationProtectionError as Fr, s3BucketDualStackDomainName as Ft, IAMRoleProvider as G, resolveAutoAssetStorage as Gn, markNonRetryable as Gr, STATE_SOURCED_CROSS_GENERATION_RULES as Gt, secretBearingStateKeyWarning as H, getDefaultStateBucketName as Hn, isMarkedNonRetryable as Hr, withRetry as Ht, red as I, runDockerForeground as In, StateError as Ir, s3BucketRegionalDomainName as It, ProviderRegistry as J, resolveStateBucketWithDefault as Jn, __exportAll as Jr, createSecretMasker as Jt, collectInlinePolicyNamesManagedBySiblings as K, resolveCaptureObservedState as Kn, markRedactedCause as Kr, STATE_SOURCED_READBACK_RULES as Kt, yellow as L, runDockerStreaming as Ln, SynthesisError as Lr, s3BucketWebsiteUrl as Lt, bold as M, dockerSpawnEnvWithSensitive as Mn, ResourceTimeoutError as Mr, producerRegionsFromState as Mt, cyan as N, formatDockerLoginError as Nn, ResourceUpdateNotSupportedError as Nr, s3BucketArn as Nt, MULTI_REGION_RECREATE_BLOCKED_TYPES as O, validateContainerRepoName as On, MissingCdkCliError as Or, requireConfigArray as Ot, gray as P, getDockerCmd as Pn, StackHasActiveImportsError as Pr, s3BucketDomainName as Pt, maskDeep as Q, warnDeprecatedNoPrefixCliFlag as Qn, maskSecretsInError as Qt, collectDeclaredOutputNames as R, AssetManifestLoader as Rn, formatError as Rr, applyRoleArnIfSet as Rt, createPreDeleteFinalSnapshot as S, ensureAssetStorage as Sn, DeployCancelledError as Sr, assertRegionMatch as St, unsupportedFinalSnapshotError as T, parseBootstrapMarker as Tn, LocalMigrateError as Tr, configStringRefusal as Tt, stateKeySecretExposure as U, getLegacyStateBucketName as Un, isRetryableTransientError as Ur, DagBuilder as Ut, isExportAliasCollision as V, synthesisStatusMessage as Vn, withErrorHandling as Vr, describeTypeWithThrottleRetry as Vt, getCurrentResourceSecrets as W, resolveApp as Wn, isThrottlingError as Wr, TemplateParser as Wt, findSilentDropProperties as X, resolveUseCdkBootstrapAssets as Xn, errorCauseChain as Xt, findActionableSilentDrops as Y, resolveStateBucketWithDefaultAndSource as Yn, dynamicReferenceTokens as Yt, createMaskedRetryLogger as Z, stateBucketExistenceConfirmed as Zn, isSingleDynamicReferenceToken as Zt, computeImplicitDeleteEdges as _, escapeRegExp$1 as _n, AssetError as _r, parameterTypeMayLoseSecretIdentity as _t, DeploymentEventsStore as a, rebuildClientForBucketRegion as an, expectedOwnerParam as ar, isInterruptedWaitError as at, buildFinalSnapshotIdentifier as b, BOOTSTRAP_MARKER_PREFIX as bn, CrossAccountSecretRefusalError as br, normalizeAwsTagsToCfn as bt, replayFailedOperations as c, importableOutputs as cn, derivePartitionAndUrlSuffix as cr, slowCcOperationTimeoutMs as ct, updatePartialReason as d, stringifyValue as dn, clearBucketRegionCache as dr, IntrinsicFunctionResolver as dt, redactSecretsForState as en, CFN_TEMPLATE_URL_LIMIT as er, CUSTOM_RESOURCE_RESPONSE_PREFIX as et, UNSPECIFIED_SKIP_REASON as f, WorkGraph as fn, resolveBucketRegion as fr, carriesDynamicReference as ft, IMPLICIT_DELETE_DEPENDENCIES as g, rewriteTemplateAssetReferences as gn, setAwsClients as gr, isUnboundTemplateParameter as gt, maskingRetryLogger as h, loadPublishableAssetManifest as hn, resetAwsClients as hr, getAccountInfo as ht, DeploymentEventsReader as i, S3StateBackend as in, CUSTOM_RESOURCE_RESPONSE_OBJECT_DESCRIPTION as ir, interruptWatchListenerCount as it, formatResourceLine as j, buildDockerImage as jn, ProvisioningError as jr, classifyReplaySecretRegion as jt, isStatefulRecreateTargetSync as k, buildDenyExternalAccessPolicy as kn, NestedStackChildDirectDestroyError as kr, requireConfigObject as kt, replayRollback as l, shouldRetainResource as ln, AssemblyReader as lr, disableInstanceApiTermination as lt, withResourceDeadline as m, createAssetRedirectResolver as mn, getAwsClients as mr, coerceParameterTypedValue as mt, DEFAULT_RESOURCE_WARN_AFTER_MS as n, LockManager as nn, findLargeInlineResources as nr, beginCommandInterruptScope as nt, planFailedOps as o, exportNamesCarriedFrom as on, PARTITION_TABLE as or, startInterruptWatch as ot, deleteSkipReason as p, buildAssetRedirectMap as pn, AwsClients as pr, cfnRefValueFromPhysicalId as pt, clearOnUpdateRemoval as q, resolveSkipPrefix as qn, retryClassificationText as qr, TEMPLATE_SOURCED_RULES as qt, DeployEngine as r, displaySafe as rn, uploadCfnTemplate as rr, endCommandInterruptScope as rt, planRollback as s, importableOutputKeys as sn, canonicalizeRegion as sr, CloudControlProvider as st, DEFAULT_RESOURCE_TIMEOUT_MS as t, scrubResourceRecord as tn, MIGRATE_TMP_PREFIX as tr, DEFAULT_STATE_PREFIX as tt, updatePartialMessage as u, AssetPublisher as un, processStackMessages as ur, isTerminationProtectionPropagationError as ut, ATOMIC_FINAL_SNAPSHOT_TYPES as v, stripControlChars as vn, CdkdError as vr, refStateLookupFromResource as vt, refusesFinalSnapshot as w, isCrossRegionRedirect as wn, LocalInvokeBuildError as wr, configBooleanRefusal as wt, ccRoutedFinalSnapshotError as x, assertAssetBucketRegion as xn, DependencyError as xr, resolveExplicitPhysicalId as xt, PRE_DELETE_SNAPSHOT_TYPES as y, AssetModeResolver as yn, ConfigError as yr, WAFv2WebACLProvider as yt, collectPublishedOutputNames as z, getDockerImageBySourceHash as zn, isCdkdError as zr, DiffCalculator as zt };
-//# sourceMappingURL=deploy-engine-BES1Z20a.js.map
+//# sourceMappingURL=deploy-engine-BoDdOfCO.js.map