@go-to-k/cdkd 0.99.1 → 0.99.3

package/dist/cli.js

@@ -654,6 +654,16 @@ function toYaml(obj, indent = 0) {
 //#endregion
 //#region src/cli/commands/synth.ts
 /**
+* Count deployable resources in a synth template.
+*
+* Excludes `AWS::CDK::Metadata` (CDK-injected construct-tree marker; cdkd deploy
+* also filters this out, so the two commands stay in sync — see
+* deploy-engine.ts `validateResourceTypes` call site).
+*/
+function countDeployableResources(template) {
+	return Object.values(template.Resources ?? {}).filter((r) => r.Type !== "AWS::CDK::Metadata").length;
+}
+/**
 * Synth command implementation
 */
 async function synthCommand(options) {
@@ -687,7 +697,7 @@ async function synthCommand(options) {
 	}
 	logger.info(`\n✅ Synthesis complete! Found ${stacks.length} stack(s):`);
 	for (const stack of stacks) {
-		const resourceCount = Object.keys(stack.template.Resources ?? {}).length;
+		const resourceCount = countDeployableResources(stack.template);
 		const outputCount = Object.keys(stack.template.Outputs ?? {}).length;
 		logger.info(`  • ${stack.stackName}`);
 		logger.info(`    - Resources: ${resourceCount}`);
@@ -32122,7 +32132,8 @@ async function importCommand(stackArg, options) {
 					stackName: stackInfo.stackName,
 					region: targetRegion,
 					providerRegistry,
-					override: overrides.get(logicalId)
+					override: overrides.get(logicalId),
+					overrides
 				});
 				rows.push(outcome);
 			}
@@ -32176,9 +32187,54 @@ async function importCommand(stackArg, options) {
 		awsClients.destroy();
 	}
 }
+/**
+* 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
+* provider's `import()` needs to see at the time it's called — specifically
+* for sub-resource providers like `SQSQueuePolicyProvider` whose fallback
+* path reads `properties.<ParentKey>` as a literal operational identifier
+* (queue URL / topic ARN / bucket name) rather than the unresolved intrinsic.
+*
+* Scope is intentionally narrow:
+*   - Only `{Ref: <X>}` shapes are substituted. `Fn::GetAtt` is NOT handled
+*     here — the overrides map carries physical IDs only, not the
+*     per-resource attributes a GetAtt resolution needs. Full GetAtt /
+*     Fn::Sub / Fn::Join handling happens later in
+*     `resolveImportedProperties` against the populated `stackState.resources`.
+*   - Pseudo-parameter refs (`AWS::Region` / `AWS::AccountId` / etc.) are
+*     left untouched — those are handled by the full resolver post-import.
+*   - When the `Ref` target is NOT in the overrides map, the intrinsic is
+*     left in place (the post-import resolver may resolve it from the
+*     `stackState.resources` built by other imports).
+*
+* Closes issue #361 — `AWS::SQS::QueuePolicy` under
+* `--migrate-from-cloudformation` previously hard-errored because
+* `properties.Queues[0]` arrived at `provider.import()` as
+* `{Ref: <Queue>}` and the queue URL needed for the fallback identification
+* branch was never substituted in.
+*
+* Pure-functional — does not mutate `value`.
+*/
+function substituteOverrideRefs(value, overrides) {
+	if (value === null || value === void 0) return value;
+	if (typeof value !== "object") return value;
+	if (Array.isArray(value)) return value.map((v) => substituteOverrideRefs(v, overrides));
+	const obj = value;
+	const keys = Object.keys(obj);
+	if (keys.length === 1 && keys[0] === "Ref" && typeof obj["Ref"] === "string") {
+		const refTarget = obj["Ref"];
+		const resolved = overrides.get(refTarget);
+		if (resolved !== void 0) return resolved;
+		return value;
+	}
+	const result = {};
+	for (const [k, v] of Object.entries(obj)) result[k] = substituteOverrideRefs(v, overrides);
+	return result;
+}
 async function importOne(task) {
 	const logger = getLogger();
-	const { logicalId, resource, stackName, region, providerRegistry, override } = task;
+	const { logicalId, resource, stackName, region, providerRegistry, override, overrides } = task;
 	if (!providerRegistry.hasProvider(resource.Type)) return {
 		logicalId,
 		resourceType: resource.Type,
@@ -32193,13 +32249,14 @@ async function importOne(task) {
 		reason: `provider does not implement import (yet)`
 	};
 	const cdkPath = readCdkPath(resource);
+	const properties = substituteOverrideRefs(resource.Properties ?? {}, overrides);
 	const input = {
 		logicalId,
 		resourceType: resource.Type,
 		cdkPath,
 		stackName,
 		region,
-		properties: resource.Properties ?? {},
+		properties,
 		...override !== void 0 && { knownPhysicalId: override }
 	};
 	try {
@@ -42547,7 +42604,7 @@ function reorderArgs(argv) {
 */
 async function main() {
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.99.0");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.99.2");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());