@go-to-k/cdkd 0.267.4 → 0.267.6

package/dist/{deploy-engine-DYrhAO-0.js → deploy-engine-COX8YJsC.js}

@@ -7733,9 +7733,13 @@ const MAX_THROTTLE_RETRIES = 4;
 * Issue `DescribeType` for a resource type, retrying throttle-shaped failures
 * with exponential backoff. Any other failure (or a throttle persisting past
 * the retry budget) is thrown to the caller unchanged.
+*
+* `client` defaults to the shared `AwsClients.cloudFormation`; callers that
+* carry their own injected client (`cdkd export`'s primary-identifier
+* resolution) pass it so test doubles keep intercepting.
 */
-function describeTypeWithThrottleRetry(resourceType) {
-	return withRetry(() => getAwsClients().cloudFormation.send(new DescribeTypeCommand({
+function describeTypeWithThrottleRetry(resourceType, client) {
+	return withRetry(() => (client ?? getAwsClients().cloudFormation).send(new DescribeTypeCommand({
 		Type: "RESOURCE",
 		TypeName: resourceType
 	})), resourceType, {
@@ -11608,7 +11612,7 @@ var CloudControlProvider = class {
 		this.logger.debug(`Deleting resource ${logicalId} (${resourceType}), physical ID: ${physicalId}`);
 		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-C8yQ0Br2.js").then((n) => n.n);
+			const { ASGProvider } = await import("./asg-provider-D5GSbDk-.js").then((n) => n.n);
 			await new ASGProvider().delete(logicalId, physicalId, resourceType, _properties, context);
 			return;
 		}
@@ -17311,7 +17315,7 @@ const FLUSH_INTERVAL_MS = 2e3;
 const FLUSH_EVENT_THRESHOLD = 50;
 /** Build-time cdkd version, with a dev fallback for non-built contexts. */
 function getCdkdVersion() {
-	return "0.267.4";
+	return "0.267.6";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -18790,6 +18794,35 @@ var DeployEngine = class {
 		throw new ProvisioningError(`Unrewritten asset reference on '${logicalId}' (${resourceType}): this region uses cdkd-owned asset storage, but the following resolved properties still point at the CDK bootstrap storage that 'cdk gc' may garbage-collect:\n${findings.map((f) => `  - ${f.path}: still references '${f.source}'`).join("\n")}\nThis is a template shape cdkd's asset-reference rewrite did not cover — deploying it would split-brain the stack (assets in cdkd storage, properties reading the CDK bucket). Please report this at https://github.com/go-to-k/cdkd/issues with the property shape. Workaround: deploy with --use-cdk-bootstrap-assets to pin the legacy destinations for this app.`, resourceType, logicalId);
 	}
 	/**
+	* `--replace` delete-first fallback for a property-driven replacement of a
+	* custom-named resource: delete the old name holder, then re-create it
+	* under the same name. Shared by the create-first collision catch (issue
+	* #960 follow-up) and the name-idempotent same-id guard (issue #1238) so
+	* the two --replace escape hatches cannot drift apart.
+	*/
+	async replaceDeleteFirstAndRecreate(logicalId, resourceType, currentResource, oldDeleteProvider, replaceProvider, replaceProps) {
+		try {
+			await oldDeleteProvider.delete(logicalId, currentResource.physicalId, resourceType, currentResource.properties, { expectedRegion: this.stackRegion });
+		} catch (deleteError) {
+			throw new Error(`Failed to delete old resource ${logicalId} (${currentResource.physicalId}) during the --replace delete-first fallback: ${deleteError instanceof Error ? deleteError.message : String(deleteError)}`);
+		}
+		this.logger.info(`  ${green("✓")} Old resource deleted`);
+		this.logger.info(`  Re-creating ${logicalId}...`);
+		try {
+			return await withRetry(() => this.withRetry(() => replaceProvider.create(logicalId, resourceType, replaceProps), logicalId, void 0, void 0, replaceProvider), logicalId, {
+				maxRetries: 8,
+				initialDelayMs: 2e3,
+				maxDelayMs: 1e4,
+				logger: this.logger,
+				isInterrupted: () => this.interrupted,
+				onInterrupted: () => new InterruptedError(this.interruptCause ?? "user"),
+				isRetryable: isRecreateRetryableError
+			});
+		} catch (recreateError) {
+			throw new Error(`Failed to re-create ${logicalId} after the --replace delete-first fallback already deleted the old resource (${currentResource.physicalId}): ${recreateError instanceof Error ? recreateError.message : String(recreateError)}. Re-run the deploy to create it fresh.`);
+		}
+	}
+	/**
 	* Inner body of provisionResource, extracted so the outer wrapper can
 	* apply the per-resource deadline (`withResourceDeadline`) without
 	* having the timeout / warn timer code dwarf the real provisioning
@@ -18926,6 +18959,7 @@ var DeployEngine = class {
 							onInterrupted: () => new InterruptedError(this.interruptCause ?? "user"),
 							isRetryable: isRecreateRetryableError
 						});
+						if (updateReplacePolicy === "Retain" && createResult.physicalId === currentResource.physicalId) throw new CdkdError(`${logicalId} (${resourceType}) recreate returned the existing resource (${currentResource.physicalId}) instead of creating a new one — its Create API is name-idempotent — and UpdateReplacePolicy: Retain means the old resource was never destroyed, so the new properties were not applied. Rename the resource in your CDK code (or remove the explicit physical name) so the recreate can produce a genuinely new resource.`, "NAMED_REPLACEMENT_IDEMPOTENT_CREATE");
 					} else {
 						this.logger.info(`  Creating new ${logicalId}...`);
 						let deletedOldFirst = false;
@@ -18937,27 +18971,15 @@ var DeployEngine = class {
 							if (updateReplacePolicy === "Retain") throw new CdkdError(`${logicalId} (${resourceType}) requires replacement, but its user-supplied physical name is still held by the existing resource AND UpdateReplacePolicy: Retain pins that resource in place. Rename the resource in your CDK code — with Retain, the old resource keeps the name, so a same-name replacement can never proceed.`, "NAMED_REPLACEMENT_COLLISION");
 							if (this.options.replace !== true) throw new CdkdError(`${logicalId} (${resourceType}) requires replacement, but the create-first attempt collided with the existing resource: ${createMsg}. The resource has a user-supplied physical name, so the CloudFormation-style safe replacement order (create the new resource before deleting the old) cannot reuse the occupied name — CloudFormation refuses this shape with "cannot update a stack when a custom-named resource requires replacing". Either rename the resource in your CDK code (a fresh name lets the safe create-first order proceed), or re-run with \`cdkd deploy --replace\` to delete the old resource FIRST and recreate it under the same name (the resource is briefly unavailable while it is recreated).`, "NAMED_REPLACEMENT_COLLISION");
 							this.logger.info(`  Create-first collided with the custom-named resource and --replace is set — deleting old ${logicalId} (${currentResource.physicalId}) first...`);
-							try {
-								await oldDeleteProvider.delete(logicalId, currentResource.physicalId, resourceType, currentResource.properties, { expectedRegion: this.stackRegion });
-							} catch (deleteError) {
-								throw new Error(`Failed to delete old resource ${logicalId} (${currentResource.physicalId}) during the --replace delete-first fallback: ${deleteError instanceof Error ? deleteError.message : String(deleteError)}`);
-							}
-							this.logger.info(`  ${green("✓")} Old resource deleted`);
 							deletedOldFirst = true;
-							this.logger.info(`  Re-creating ${logicalId}...`);
-							try {
-								createResult = await withRetry(() => this.withRetry(() => replaceProvider.create(logicalId, resourceType, replaceProps), logicalId, void 0, void 0, replaceProvider), logicalId, {
-									maxRetries: 8,
-									initialDelayMs: 2e3,
-									maxDelayMs: 1e4,
-									logger: this.logger,
-									isInterrupted: () => this.interrupted,
-									onInterrupted: () => new InterruptedError(this.interruptCause ?? "user"),
-									isRetryable: isRecreateRetryableError
-								});
-							} catch (recreateError) {
-								throw new Error(`Failed to re-create ${logicalId} after the --replace delete-first fallback already deleted the old resource (${currentResource.physicalId}): ${recreateError instanceof Error ? recreateError.message : String(recreateError)}. Re-run the deploy to create it fresh.`);
-							}
+							createResult = await this.replaceDeleteFirstAndRecreate(logicalId, resourceType, currentResource, oldDeleteProvider, replaceProvider, replaceProps);
+						}
+						if (!deletedOldFirst && createResult.physicalId === currentResource.physicalId) {
+							if (updateReplacePolicy === "Retain") throw new CdkdError(`${logicalId} (${resourceType}) requires replacement, but its Create API is name-idempotent: the create-first attempt returned the existing resource (${currentResource.physicalId}) instead of creating a new one, and UpdateReplacePolicy: Retain pins that resource in place. Rename the resource in your CDK code — with Retain, the old resource keeps the name, so a same-name replacement can never proceed.`, "NAMED_REPLACEMENT_IDEMPOTENT_CREATE");
+							if (this.options.replace !== true) throw new CdkdError(`${logicalId} (${resourceType}) requires replacement, but its Create API is name-idempotent: the create-first attempt returned the EXISTING resource (${currentResource.physicalId}) instead of creating a new one, so deleting the "old" resource would silently destroy the resource the deploy just reported as created. The resource has a user-supplied physical name; either change or remove the explicit name in your CDK code (a fresh or generated name lets the safe create-first order proceed), or re-run with \`cdkd deploy --replace\` to delete the old resource FIRST and recreate it under the same name (the resource is briefly unavailable while it is recreated). Note: this branch is also reached when the old resource was deleted out-of-band and the physical id is name-derived — there the create was a genuine fresh create; \`--replace\` converges that case too.`, "NAMED_REPLACEMENT_IDEMPOTENT_CREATE");
+							this.logger.info(`  Create-first returned the existing resource (name-idempotent Create API) and --replace is set — deleting old ${logicalId} (${currentResource.physicalId}) first...`);
+							deletedOldFirst = true;
+							createResult = await this.replaceDeleteFirstAndRecreate(logicalId, resourceType, currentResource, oldDeleteProvider, replaceProvider, replaceProps);
 						}
 						if (deletedOldFirst) {} else if (updateReplacePolicy === "Retain") this.logger.info(`  Retaining old ${logicalId} (${currentResource.physicalId}) - UpdateReplacePolicy: Retain`);
 						else {
@@ -19298,5 +19320,5 @@ var DeployEngine = class {
 };
 
 //#endregion
-export { buildAssetRedirectMap as $, PartialFailureError as $t, slowCcOperationTimeoutMs as A, CFN_TEMPLATE_URL_LIMIT as At, applyRoleArnIfSet as B, getAwsClients as Bt, yellow as C, resolveCaptureObservedState as Ct, ProviderRegistry as D, resolveUseCdkBootstrapAssets as Dt, clearOnUpdateRemoval as E, resolveStateBucketWithDefaultAndSource as Et, refStateLookupFromResource as F, AssemblyReader as Ft, TemplateParser as G, ConfigError as Gt, withRetry as H, setAwsClients as Ht, WAFv2WebACLProvider as I, processStackMessages as It, rebuildClientForBucketRegion as J, LocalMigrateError as Jt, LockManager as K, DependencyError as Kt, normalizeAwsTagsToCfn as L, clearBucketRegionCache as Lt, isTerminationProtectionPropagationError as M, findLargeInlineResources as Mt, IntrinsicFunctionResolver as N, uploadCfnTemplate as Nt, findActionableSilentDrops as O, warnDeprecatedNoPrefixCliFlag as Ot, cfnRefValueFromPhysicalId as P, expectedOwnerParam as Pt, WorkGraph as Q, NestedStackChildDirectDestroyError as Qt, resolveExplicitPhysicalId as R, resolveBucketRegion as Rt, red as S, resolveAutoAssetStorage as St, collectInlinePolicyNamesManagedBySiblings as T, resolveStateBucketWithDefault as Tt, isRetryableTransientError as U, AssetError as Ut, DiffCalculator as V, resetAwsClients as Vt, DagBuilder as W, CdkdError as Wt, AssetPublisher as X, LockError as Xt, shouldRetainResource as Y, LocalStartServiceError as Yt, stringifyValue as Z, MissingCdkCliError as Zt, formatResourceLine as _, Synthesizer as _t, DeploymentEventsStore as a, StateError as an, ensureAssetStorage as at, gray as b, getLegacyStateBucketName as bt, replayFailedOperations as c, isCdkdError as cn, validateAssetBucketName as ct, IMPLICIT_DELETE_DEPENDENCIES as d, __exportAll as dn, formatDockerLoginError as dt, ProvisioningError as en, createAssetRedirectResolver as et, computeImplicitDeleteEdges as f, getDockerCmd as ft, renderStatefulReason as g, getDockerImageBySourceHash as gt, isStatefulRecreateTargetSync as h, AssetManifestLoader as ht, DeploymentEventsReader as i, StackTerminationProtectionError as in, BOOTSTRAP_MARKER_PREFIX as it, disableInstanceApiTermination as j, MIGRATE_TMP_PREFIX as jt, CloudControlProvider as k, CFN_TEMPLATE_BODY_LIMIT as kt, replayRollback as l, normalizeAwsError as ln, validateContainerRepoName as lt, MULTI_REGION_RECREATE_BLOCKED_TYPES as m, runDockerStreaming as mt, DEFAULT_RESOURCE_WARN_AFTER_MS as n, ResourceUpdateNotSupportedError as nn, rewriteTemplateAssetReferences as nt, planFailedOps as o, SynthesisError as on, getBootstrapMarkerKey as ot, extractDeploymentEventError as p, runDockerForeground as pt, S3StateBackend as q, LocalInvokeBuildError as qt, DeployEngine as r, StackHasActiveImportsError as rn, AssetModeResolver as rt, planRollback as s, formatError as sn, parseBootstrapMarker as st, DEFAULT_RESOURCE_TIMEOUT_MS as t, ResourceTimeoutError as tn, loadPublishableAssetManifest as tt, withResourceDeadline as u, withErrorHandling as un, buildDockerImage as ut, bold as v, synthesisStatusMessage as vt, IAMRoleProvider as w, resolveSkipPrefix as wt, green as x, resolveApp as xt, cyan as y, getDefaultStateBucketName as yt, assertRegionMatch as z, AwsClients as zt };
-//# sourceMappingURL=deploy-engine-DYrhAO-0.js.map
+export { WorkGraph as $, NestedStackChildDirectDestroyError as $t, slowCcOperationTimeoutMs as A, CFN_TEMPLATE_BODY_LIMIT as At, applyRoleArnIfSet as B, AwsClients as Bt, yellow as C, resolveAutoAssetStorage as Ct, ProviderRegistry as D, resolveStateBucketWithDefaultAndSource as Dt, clearOnUpdateRemoval as E, resolveStateBucketWithDefault as Et, refStateLookupFromResource as F, expectedOwnerParam as Ft, DagBuilder as G, CdkdError as Gt, describeTypeWithThrottleRetry as H, resetAwsClients as Ht, WAFv2WebACLProvider as I, AssemblyReader as It, S3StateBackend as J, LocalInvokeBuildError as Jt, TemplateParser as K, ConfigError as Kt, normalizeAwsTagsToCfn as L, processStackMessages as Lt, isTerminationProtectionPropagationError as M, MIGRATE_TMP_PREFIX as Mt, IntrinsicFunctionResolver as N, findLargeInlineResources as Nt, findActionableSilentDrops as O, resolveUseCdkBootstrapAssets as Ot, cfnRefValueFromPhysicalId as P, uploadCfnTemplate as Pt, stringifyValue as Q, MissingCdkCliError as Qt, resolveExplicitPhysicalId as R, clearBucketRegionCache as Rt, red as S, resolveApp as St, collectInlinePolicyNamesManagedBySiblings as T, resolveSkipPrefix as Tt, withRetry as U, setAwsClients as Ut, DiffCalculator as V, getAwsClients as Vt, isRetryableTransientError as W, AssetError as Wt, shouldRetainResource as X, LocalStartServiceError as Xt, rebuildClientForBucketRegion as Y, LocalMigrateError as Yt, AssetPublisher as Z, LockError as Zt, formatResourceLine as _, getDockerImageBySourceHash as _t, DeploymentEventsStore as a, StackTerminationProtectionError as an, BOOTSTRAP_MARKER_PREFIX as at, gray as b, getDefaultStateBucketName as bt, replayFailedOperations as c, formatError as cn, parseBootstrapMarker as ct, IMPLICIT_DELETE_DEPENDENCIES as d, withErrorHandling as dn, buildDockerImage as dt, PartialFailureError as en, buildAssetRedirectMap as et, computeImplicitDeleteEdges as f, __exportAll as fn, formatDockerLoginError as ft, renderStatefulReason as g, AssetManifestLoader as gt, isStatefulRecreateTargetSync as h, runDockerStreaming as ht, DeploymentEventsReader as i, StackHasActiveImportsError as in, AssetModeResolver as it, disableInstanceApiTermination as j, CFN_TEMPLATE_URL_LIMIT as jt, CloudControlProvider as k, warnDeprecatedNoPrefixCliFlag as kt, replayRollback as l, isCdkdError as ln, validateAssetBucketName as lt, MULTI_REGION_RECREATE_BLOCKED_TYPES as m, runDockerForeground as mt, DEFAULT_RESOURCE_WARN_AFTER_MS as n, ResourceTimeoutError as nn, loadPublishableAssetManifest as nt, planFailedOps as o, StateError as on, ensureAssetStorage as ot, extractDeploymentEventError as p, getDockerCmd as pt, LockManager as q, DependencyError as qt, DeployEngine as r, ResourceUpdateNotSupportedError as rn, rewriteTemplateAssetReferences as rt, planRollback as s, SynthesisError as sn, getBootstrapMarkerKey as st, DEFAULT_RESOURCE_TIMEOUT_MS as t, ProvisioningError as tn, createAssetRedirectResolver as tt, withResourceDeadline as u, normalizeAwsError as un, validateContainerRepoName as ut, bold as v, Synthesizer as vt, IAMRoleProvider as w, resolveCaptureObservedState as wt, green as x, getLegacyStateBucketName as xt, cyan as y, synthesisStatusMessage as yt, assertRegionMatch as z, resolveBucketRegion as zt };
+//# sourceMappingURL=deploy-engine-COX8YJsC.js.map