@go-to-k/cdkd 0.257.1 → 0.257.2

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as BOOTSTRAP_MARKER_PREFIX, A as withRetry, At as AssemblyReader, B as TemplateParser, C as disableInstanceApiTermination, Ct as warnDeprecatedNoPrefixCliFlag, D as refStateLookupFromResource, Dt as findLargeInlineResources, E as cfnRefValueFromPhysicalId, Et as MIGRATE_TMP_PREFIX, F as resolveExplicitPhysicalId, Ft as resetAwsClients, G as AssetPublisher, Gt as MissingCdkCliError, H as S3StateBackend, Ht as LocalMigrateError, I as assertRegionMatch, It as setAwsClients, J as buildAssetRedirectMap, Jt as ProvisioningError, K as stringifyValue, Kt as NestedStackChildDirectDestroyError, L as applyRoleArnIfSet, M as CDK_PATH_TAG, Mt as resolveBucketRegion, N as matchesCdkPath, Nt as AwsClients, O as WAFv2WebACLProvider, Ot as uploadCfnTemplate, P as normalizeAwsTagsToCfn, Pt as getAwsClients, Q as AssetModeResolver, Qt as StackTerminationProtectionError, R as DiffCalculator, Rt as CdkdError, S as CloudControlProvider, St as resolveUseCdkBootstrapAssets, T as IntrinsicFunctionResolver, Tt as CFN_TEMPLATE_URL_LIMIT, U as rebuildClientForBucketRegion, Ut as LocalStartServiceError, V as LockManager, Vt as LocalInvokeBuildError$1, W as shouldRetainResource, X as loadPublishableAssetManifest, Xt as ResourceUpdateNotSupportedError, Y as createAssetRedirectResolver, Yt as ResourceTimeoutError, Z as rewriteTemplateAssetReferences, Zt as StackHasActiveImportsError, _ as yellow, _t as resolveAutoAssetStorage, a as IMPLICIT_DELETE_DEPENDENCIES, at as buildDockerImage, b as ProviderRegistry, bt as resolveStateBucketWithDefault, c as MULTI_REGION_RECREATE_BLOCKED_TYPES, ct as runDockerForeground, d as formatResourceLine, dt as getDockerImageBySourceHash, et as ensureAssetStorage, f as bold, ft as Synthesizer, g as red, gt as resolveApp, h as green, ht as getLegacyStateBucketName, i as withResourceDeadline, in as withErrorHandling, it as validateContainerRepoName, j as isRetryableTransientError, k as importTagWalk, kt as expectedOwnerParam, l as isStatefulRecreateTargetSync, lt as runDockerStreaming, m as gray, mt as getDefaultStateBucketName, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as parseBootstrapMarker, o as computeImplicitDeleteEdges, ot as formatDockerLoginError, p as cyan, pt as synthesisStatusMessage, q as WorkGraph, qt as PartialFailureError, r as DeployEngine, rn as normalizeAwsError, rt as validateAssetBucketName, s as extractDeploymentEventError, st as getDockerCmd, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as getBootstrapMarkerKey, u as renderStatefulReason, ut as AssetManifestLoader, v as IAMRoleProvider, vt as resolveCaptureObservedState, w as isTerminationProtectionPropagationError, wt as CFN_TEMPLATE_BODY_LIMIT, x as findActionableSilentDrops, xt as resolveStateBucketWithDefaultAndSource, y as collectInlinePolicyNamesManagedBySiblings, yt as resolveSkipPrefix, z as DagBuilder } from "./deploy-engine-DOPBIRKR.js";
+import { $ as AssetModeResolver, $t as StackTerminationProtectionError, A as importTagWalk, At as expectedOwnerParam, B as DagBuilder, C as slowCcOperationTimeoutMs, Ct as resolveUseCdkBootstrapAssets, D as cfnRefValueFromPhysicalId, Dt as MIGRATE_TMP_PREFIX, E as IntrinsicFunctionResolver, Et as CFN_TEMPLATE_URL_LIMIT, F as normalizeAwsTagsToCfn, Ft as getAwsClients, G as shouldRetainResource, H as LockManager, Ht as LocalInvokeBuildError$1, I as resolveExplicitPhysicalId, It as resetAwsClients, J as WorkGraph, Jt as PartialFailureError, K as AssetPublisher, Kt as MissingCdkCliError, L as assertRegionMatch, Lt as setAwsClients, M as isRetryableTransientError, N as CDK_PATH_TAG, Nt as resolveBucketRegion, O as refStateLookupFromResource, Ot as findLargeInlineResources, P as matchesCdkPath, Pt as AwsClients, Q as rewriteTemplateAssetReferences, Qt as StackHasActiveImportsError, R as applyRoleArnIfSet, S as CloudControlProvider, St as resolveStateBucketWithDefaultAndSource, T as isTerminationProtectionPropagationError, Tt as CFN_TEMPLATE_BODY_LIMIT, U as S3StateBackend, Ut as LocalMigrateError, V as TemplateParser, W as rebuildClientForBucketRegion, Wt as LocalStartServiceError, X as createAssetRedirectResolver, Xt as ResourceTimeoutError, Y as buildAssetRedirectMap, Yt as ProvisioningError, Z as loadPublishableAssetManifest, Zt as ResourceUpdateNotSupportedError, _ as yellow, _t as resolveApp, a as IMPLICIT_DELETE_DEPENDENCIES, an as withErrorHandling, at as validateContainerRepoName, b as ProviderRegistry, bt as resolveSkipPrefix, c as MULTI_REGION_RECREATE_BLOCKED_TYPES, ct as getDockerCmd, d as formatResourceLine, dt as AssetManifestLoader, et as BOOTSTRAP_MARKER_PREFIX, f as bold, ft as getDockerImageBySourceHash, g as red, gt as getLegacyStateBucketName, h as green, ht as getDefaultStateBucketName, i as withResourceDeadline, in as normalizeAwsError, it as validateAssetBucketName, j as withRetry, jt as AssemblyReader, k as WAFv2WebACLProvider, kt as uploadCfnTemplate, l as isStatefulRecreateTargetSync, lt as runDockerForeground, m as gray, mt as synthesisStatusMessage, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as getBootstrapMarkerKey, o as computeImplicitDeleteEdges, ot as buildDockerImage, p as cyan, pt as Synthesizer, q as stringifyValue, qt as NestedStackChildDirectDestroyError, r as DeployEngine, rt as parseBootstrapMarker, s as extractDeploymentEventError, st as formatDockerLoginError, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as ensureAssetStorage, u as renderStatefulReason, ut as runDockerStreaming, v as IAMRoleProvider, vt as resolveAutoAssetStorage, w as disableInstanceApiTermination, wt as warnDeprecatedNoPrefixCliFlag, x as findActionableSilentDrops, xt as resolveStateBucketWithDefault, y as collectInlinePolicyNamesManagedBySiblings, yt as resolveCaptureObservedState, z as DiffCalculator, zt as CdkdError } from "./deploy-engine-wmvXbyoB.js";
 import { a as getLiveRenderer, c as PATTERN_B_RESOURCE_TYPES, d as generateResourceNameWithFallback, f as withSkipPrefix, i as runStackBuffered, n as getLogger, o as PATTERN_B_NAME_OPTIONS, p as withStackName, s as PATTERN_B_NAME_PROPERTIES, u as generateResourceName } from "./logger-BYMEE-BS.js";
-import { t as ASGProvider } from "./asg-provider-6IZKZOKp.js";
+import { t as ASGProvider } from "./asg-provider-4KjJhMTY.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { CopyObjectCommand, CreateBucketCommand, DeleteBucketAnalyticsConfigurationCommand, DeleteBucketCommand, DeleteBucketCorsCommand, DeleteBucketIntelligentTieringConfigurationCommand, DeleteBucketInventoryConfigurationCommand, DeleteBucketLifecycleCommand, DeleteBucketMetricsConfigurationCommand, DeleteBucketPolicyCommand, DeleteBucketReplicationCommand, DeleteBucketTaggingCommand, DeleteBucketWebsiteCommand, DeleteObjectsCommand, GetBucketAccelerateConfigurationCommand, GetBucketCorsCommand, GetBucketEncryptionCommand, GetBucketLifecycleConfigurationCommand, GetBucketLocationCommand, GetBucketLoggingCommand, GetBucketNotificationConfigurationCommand, GetBucketPolicyCommand, GetBucketReplicationCommand, GetBucketTaggingCommand, GetBucketVersioningCommand, GetBucketWebsiteCommand, GetObjectCommand, GetObjectLockConfigurationCommand, GetPublicAccessBlockCommand, HeadBucketCommand, ListBucketAnalyticsConfigurationsCommand, ListBucketIntelligentTieringConfigurationsCommand, ListBucketInventoryConfigurationsCommand, ListBucketMetricsConfigurationsCommand, ListBucketsCommand, ListDirectoryBucketsCommand, ListObjectVersionsCommand, ListObjectsV2Command, NoSuchBucket, PutBucketAccelerateConfigurationCommand, PutBucketAnalyticsConfigurationCommand, PutBucketCorsCommand, PutBucketEncryptionCommand, PutBucketIntelligentTieringConfigurationCommand, PutBucketInventoryConfigurationCommand, PutBucketLifecycleConfigurationCommand, PutBucketLoggingCommand, PutBucketMetricsConfigurationCommand, PutBucketNotificationConfigurationCommand, PutBucketOwnershipControlsCommand, PutBucketPolicyCommand, PutBucketReplicationCommand, PutBucketTaggingCommand, PutBucketVersioningCommand, PutBucketWebsiteCommand, PutObjectCommand, PutObjectLockConfigurationCommand, PutPublicAccessBlockCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
@@ -1899,7 +1899,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.257.1";
+	return "0.257.2";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -41901,7 +41901,8 @@ async function runDestroyForStack(stackName, state, ctx) {
 					const providerMinTimeoutMs = provider.getMinResourceTimeoutMs?.() ?? 0;
 					const warnAfterMs = ctx.resourceWarnAfterByType?.[resource.resourceType] ?? ctx.resourceWarnAfterMs ?? 3e5;
 					const globalTimeoutMs = ctx.resourceTimeoutMs ?? 18e5;
-					const timeoutMs = ctx.resourceTimeoutByType?.[resource.resourceType] ?? Math.max(providerMinTimeoutMs, globalTimeoutMs);
+					const slowTypeMinTimeoutMs = slowCcOperationTimeoutMs(resource.resourceType, "DELETE");
+					const timeoutMs = ctx.resourceTimeoutByType?.[resource.resourceType] ?? Math.max(providerMinTimeoutMs, slowTypeMinTimeoutMs, globalTimeoutMs);
 					await withResourceDeadline(async () => {
 						const maxAttempts = provider.disableOuterRetry ? 0 : 3;
 						let lastDeleteError;
@@ -52003,30 +52004,13 @@ async function importCommand(stackArg, options) {
 		if (migrationCfnStackName) {
 			logger.info(`Resolving physical IDs from CloudFormation stack '${migrationCfnStackName}' (recursive)...`);
 			migrationTree = await getCloudFormationResourceTree(migrationCfnStackName, awsClients.cloudFormation);
-			const cfnMapping = migrationTree.resources;
-			let derived = 0;
-			let skippedNonImportable = 0;
-			let skippedNestedStackRow = 0;
-			for (const [logicalId, physicalId] of cfnMapping) {
-				if (!templateLogicalIds.has(logicalId)) {
-					skippedNonImportable++;
-					continue;
-				}
-				if (template.Resources[logicalId]?.Type === "AWS::CloudFormation::Stack") {
-					skippedNestedStackRow++;
-					continue;
-				}
-				if (!overrides.has(logicalId)) {
-					overrides.set(logicalId, physicalId);
-					derived++;
-				}
-			}
-			const overriddenByUser = cfnMapping.size - derived - skippedNonImportable - skippedNestedStackRow;
-			const detail = [];
-			if (overriddenByUser > 0) detail.push(`${overriddenByUser} already overridden by --resource`);
-			if (skippedNonImportable > 0) detail.push(`${skippedNonImportable} non-importable (e.g. CDKMetadata)`);
-			if (skippedNestedStackRow > 0) detail.push(`${skippedNestedStackRow} nested-stack row(s) handled separately`);
-			logger.info(`Resolved ${derived} physical ID(s) from CloudFormation` + (detail.length > 0 ? ` (${detail.join(", ")})` : ""));
+			const mergeStats = mergeCfnDerivedOverrides({
+				cfnMapping: migrationTree.resources,
+				template,
+				templateLogicalIds,
+				overrides
+			});
+			logger.info(`Resolved ${mergeStats.derived} physical ID(s) from CloudFormation` + formatCfnOverrideMergeDetail(mergeStats));
 			validateNestedStackShape(template, migrationTree, stackInfo.stackName, stackInfo.nestedTemplates ?? {});
 		}
 		let accountIdForNestedSynth;
@@ -52041,15 +52025,13 @@ async function importCommand(stackArg, options) {
 		if (!selectiveMode && !migrationCfnStackName) {
 			const cfnResources = await tryGetCloudFormationResourceMap(stackInfo.stackName, awsClients.cloudFormation);
 			if (cfnResources) {
-				let derived = 0;
-				for (const [logicalId, physicalId] of cfnResources) {
-					if (!templateLogicalIds.has(logicalId)) continue;
-					if (template.Resources[logicalId]?.Type === "AWS::CloudFormation::Stack") continue;
-					if (overrides.has(logicalId)) continue;
-					overrides.set(logicalId, physicalId);
-					derived++;
-				}
-				if (derived > 0) logger.info(`Resolved ${derived} physical ID(s) from CloudFormation stack '${stackInfo.stackName}'. To adopt AND retire that stack, use --migrate-from-cloudformation.`);
+				const mergeStats = mergeCfnDerivedOverrides({
+					cfnMapping: cfnResources,
+					template,
+					templateLogicalIds,
+					overrides
+				});
+				if (mergeStats.derived > 0) logger.info(`Resolved ${mergeStats.derived} physical ID(s) from CloudFormation stack '${stackInfo.stackName}'. To adopt AND retire that stack, use --migrate-from-cloudformation.`);
 				else logger.debug(`CloudFormation stack '${stackInfo.stackName}' contributed no new physical IDs.`);
 			} else logger.debug(`No CloudFormation stack named '${stackInfo.stackName}' — resolving physical IDs per provider.`);
 		}
@@ -52166,6 +52148,79 @@ async function importCommand(stackArg, options) {
 	}
 }
 /**
+* Merge a CloudFormation-derived `logicalId -> physicalId` map into the run's
+* `overrides`, applying the three filters every CFn-derived seed needs, and
+* report what each filter dropped.
+*
+* The filters, in order:
+*   1. **Not an importable template resource** — CFn knows about sentinel rows
+*      like `AWS::CDK::Metadata` that cdkd silently skips on import. Merging
+*      those would make the typo-validation step reject them.
+*   2. **Nested-stack row** — the AWS-side physical ID of an
+*      `AWS::CloudFormation::Stack` row is the child stack ARN, which is NOT
+*      what we want as an import override. The parent's state entry carries
+*      the synthesized cdkd-local ARN (matching what `NestedStackProvider.create`
+*      writes at deploy time — design §6), populated by `importOne`'s
+*      short-circuit. Filtering here keeps the AWS ARN from overwriting it.
+*   3. **Already overridden** — user-supplied `--resource` /
+*      `--resource-mapping` entries are inserted before any CFn lookup and
+*      always win.
+*
+* Shared by all three CFn-derived seeding sites so a change to any filter
+* lands once: the `--migrate-from-cloudformation` root walk, the auto-mode
+* best-effort lookup (issue #1128), and the recursive nested-child walk.
+* The three differ only in their LOGGING, which stays at the call sites.
+*
+* **Second-order effect worth naming:** `overrides` is also consumed by
+* {@link substituteOverrideRefs}, so seeding it from CloudFormation means a
+* `{Ref: <X>}` in a resource's Properties pre-resolves to the CFn physical ID
+* before `provider.import()` sees it. That is intended — it is what makes
+* sub-resource providers (e.g. `SQSQueuePolicyProvider`, which reads
+* `properties.Queues[0]` as a literal queue URL) importable — but it is a
+* behavior beyond "resolve physical IDs", and it applies to every caller of
+* this helper, not just the migration path. See issue #1131.
+*
+* Mutates `overrides` in place; does not mutate `cfnMapping` or `template`.
+*/
+function mergeCfnDerivedOverrides(params) {
+	const { cfnMapping, template, templateLogicalIds, overrides } = params;
+	const stats = {
+		derived: 0,
+		skippedNonImportable: 0,
+		skippedNestedStackRow: 0,
+		overriddenByUser: 0
+	};
+	for (const [logicalId, physicalId] of cfnMapping) {
+		if (!templateLogicalIds.has(logicalId)) {
+			stats.skippedNonImportable++;
+			continue;
+		}
+		if (template.Resources[logicalId]?.Type === "AWS::CloudFormation::Stack") {
+			stats.skippedNestedStackRow++;
+			continue;
+		}
+		if (overrides.has(logicalId)) {
+			stats.overriddenByUser++;
+			continue;
+		}
+		overrides.set(logicalId, physicalId);
+		stats.derived++;
+	}
+	return stats;
+}
+/**
+* Render the human-readable breakdown of a {@link mergeCfnDerivedOverrides}
+* result — the parenthesized suffix of the `Resolved N physical ID(s)` line.
+* Returns `''` when nothing was dropped (no breakdown worth reporting).
+*/
+function formatCfnOverrideMergeDetail(stats) {
+	const detail = [];
+	if (stats.overriddenByUser > 0) detail.push(`${stats.overriddenByUser} already overridden by --resource`);
+	if (stats.skippedNonImportable > 0) detail.push(`${stats.skippedNonImportable} non-importable (e.g. CDKMetadata)`);
+	if (stats.skippedNestedStackRow > 0) detail.push(`${stats.skippedNestedStackRow} nested-stack row(s) handled separately`);
+	return detail.length > 0 ? ` (${detail.join(", ")})` : "";
+}
+/**
 * Recursively substitute `{Ref: <LogicalId>}` shapes in an arbitrary value
 * tree with the matching entry from `overrides`. Used to bridge the gap
 * between CDK synth's template (which carries raw intrinsics) and what a
@@ -52714,11 +52769,12 @@ async function importNestedStackChildrenRecursive(args) {
 			const childResources = collectImportableResources(childTemplate);
 			const childTemplateLogicalIds = new Set(childResources.map((r) => r.logicalId));
 			const childOverrides = /* @__PURE__ */ new Map();
-			for (const [logicalId, physicalId] of childTreeNode.resources) {
-				if (!childTemplateLogicalIds.has(logicalId)) continue;
-				if (childTemplate.Resources[logicalId]?.Type === "AWS::CloudFormation::Stack") continue;
-				childOverrides.set(logicalId, physicalId);
-			}
+			mergeCfnDerivedOverrides({
+				cfnMapping: childTreeNode.resources,
+				template: childTemplate,
+				templateLogicalIds: childTemplateLogicalIds,
+				overrides: childOverrides
+			});
 			const rows = [];
 			for (const { logicalId, resource } of childResources) {
 				if (resource.Type === "AWS::CloudFormation::Stack" && childTreeNode.nested.has(logicalId)) {
@@ -62320,7 +62376,7 @@ function createMigrateCommand() {
 */
 function buildProgram() {
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.257.1");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.257.2");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());