@go-to-k/cdkd 0.209.1 → 0.210.1

package/README.md

@@ -251,10 +251,11 @@ The Docker-backed commands above require Docker. Pass `--from-state`
 substitute deployed physical IDs into intrinsic-valued env vars /
 secrets / image URIs; without either, intrinsic values are dropped with
 a per-key warning (matches `sam local *`). The two flags are mutually
-exclusive. `start-cloudfront` is the partial exception: a
-CloudFront-Functions + S3-origin distribution serves entirely in-process
-(no Docker), and it carries cdk-local's `--from-cfn-stack` but not cdkd's
-`--from-state` (its factory lacks the state-provider seam — issue #766).
+exclusive. `start-cloudfront` carries both `--from-state` and
+`--from-cfn-stack` too (since cdk-local 0.128.0 / issue #766); a
+CloudFront-Functions + S3-origin distribution still serves entirely
+in-process (no Docker), while a Lambda Function URL origin runs via the
+RIE container.
 
 ### `local invoke`
 

package/dist/cli.js

@@ -43823,6 +43823,7 @@ function extractLambdaProperties(stack, logicalId, resource, resources) {
 		handler,
 		memoryMb,
 		timeoutSec,
+		architecture: extractArchitecture(props, logicalId),
 		codePath,
 		layers,
 		...ephemeralStorageMb !== void 0 && { ephemeralStorageMb },
@@ -43910,6 +43911,24 @@ function extractImageUri$1(value, logicalId, stackName, resources, region) {
 	}
 }
 /**
+* Parse `Properties.Architectures` into the single arch cdkd threads to
+* `--platform`. CFn types it as an array, but CDK / Lambda allow exactly
+* one entry; default `x86_64` matches the AWS-side default when the
+* property is absent. Shared by BOTH the ZIP and IMAGE variants (issue
+* #768) so the ZIP container run pins `--platform` the same way the IMAGE
+* path always has.
+*/
+function extractArchitecture(props, logicalId) {
+	const arches = props["Architectures"];
+	if (Array.isArray(arches) && arches.length > 0) {
+		const first = arches[0];
+		if (first === "arm64") return "arm64";
+		if (first === "x86_64") return "x86_64";
+		throw new LocalInvokeResolutionError(`Lambda '${logicalId}' has unsupported Architectures value '${String(first)}'. cdkd local invoke supports x86_64 and arm64.`);
+	}
+	return "x86_64";
+}
+/**
 * Build the IMAGE-variant `ResolvedLambda` from a Lambda template entry
 * with `Code.ImageUri`. `ImageConfig` and `Architectures` are both
 * optional in CFn — the defaults match the AWS-side defaults.
@@ -43921,14 +43940,6 @@ function extractImageLambdaProperties(args) {
 	if (Array.isArray(rawImageConfig["Command"])) imageConfig.command = rawImageConfig["Command"].filter((s) => typeof s === "string");
 	if (Array.isArray(rawImageConfig["EntryPoint"])) imageConfig.entryPoint = rawImageConfig["EntryPoint"].filter((s) => typeof s === "string");
 	if (typeof rawImageConfig["WorkingDirectory"] === "string") imageConfig.workingDirectory = rawImageConfig["WorkingDirectory"];
-	const arches = props["Architectures"];
-	let architecture = "x86_64";
-	if (Array.isArray(arches) && arches.length > 0) {
-		const first = arches[0];
-		if (first === "arm64") architecture = "arm64";
-		else if (first === "x86_64") architecture = "x86_64";
-		else throw new LocalInvokeResolutionError(`Lambda '${logicalId}' has unsupported Architectures value '${String(first)}'. cdkd local invoke supports x86_64 and arm64.`);
-	}
 	return {
 		kind: "image",
 		stack,
@@ -43938,7 +43949,7 @@ function extractImageLambdaProperties(args) {
 		timeoutSec,
 		imageUri,
 		imageConfig,
-		architecture,
+		architecture: extractArchitecture(props, logicalId),
 		layers: [],
 		...ephemeralStorageMb !== void 0 && { ephemeralStorageMb }
 	};
@@ -46532,6 +46543,7 @@ function createContainerPool(specs, options) {
 				hostPort,
 				host: spec.containerHost,
 				name,
+				platform: spec.platform,
 				...spec.debugPort !== void 0 && { debugPort: spec.debugPort },
 				...spec.tmpfs !== void 0 && { tmpfs: spec.tmpfs },
 				...spec.extraHosts !== void 0 && { extraHosts: spec.extraHosts }
@@ -47464,6 +47476,7 @@ async function buildContainerSpec(args) {
 	if (lambda.kind === "zip") {
 		codeDir = lambda.codePath ?? materializeInlineCode$1(lambda.handler, lambda.inlineCode ?? "", resolveRuntimeFileExtension(lambda.runtime), inlineTmpDirs);
 		optDir = await materializeLambdaLayers$1(lambda.layers, layerTmpDirs, layerRoleArn);
+		platform = architectureToPlatform(lambda.architecture);
 	} else {
 		imageRef = (await resolveContainerImageForStartApi(lambda, skipPull)).imageRef;
 		platform = architectureToPlatform(lambda.architecture);
@@ -47530,6 +47543,7 @@ async function buildContainerSpec(args) {
 		kind: "zip",
 		lambda,
 		codeDir,
+		platform,
 		env: dockerEnv,
 		containerHost,
 		...optDir !== void 0 && { optDir },
@@ -47681,6 +47695,7 @@ function resolveLambdaByLogicalId(logicalId, stacks) {
 		if (!inlineCode) codePath = resolveAssetCodePath(stack, logicalId, resource);
 		const layers = resolveLambdaLayers(stack, logicalId, props);
 		const ephemeralStorageMb = extractEphemeralStorageMb(props, logicalId);
+		const architecture = extractStartApiArchitecture(props, logicalId);
 		return {
 			kind: "zip",
 			stack,
@@ -47692,6 +47707,7 @@ function resolveLambdaByLogicalId(logicalId, stacks) {
 			timeoutSec,
 			codePath,
 			layers,
+			architecture,
 			...inlineCode !== void 0 && { inlineCode },
 			...ephemeralStorageMb !== void 0 && { ephemeralStorageMb }
 		};
@@ -47741,6 +47757,23 @@ function extractImageUri(value, logicalId, stackName, resources, region) {
 	}
 }
 /**
+* Parse `Properties.Architectures` into the single arch cdkd threads to
+* `--platform`. Defaults to `x86_64` (the AWS default) when absent; CDK
+* only ever sets one entry. Shared by BOTH the ZIP and IMAGE start-api
+* resolvers (issue #768) so the ZIP container run pins `--platform` the
+* same way the IMAGE path always has.
+*/
+function extractStartApiArchitecture(props, logicalId) {
+	const arches = props["Architectures"];
+	if (Array.isArray(arches) && arches.length > 0) {
+		const first = arches[0];
+		if (first === "arm64") return "arm64";
+		if (first === "x86_64") return "x86_64";
+		throw new Error(`Lambda '${logicalId}' has unsupported Architectures value '${String(first)}'. cdkd local start-api supports x86_64 and arm64.`);
+	}
+	return "x86_64";
+}
+/**
 * Build the IMAGE-variant `ResolvedStartApiLambda` from a Lambda
 * template entry with `Code.ImageUri`. Mirrors
 * `lambda-resolver.ts:extractImageLambdaProperties` but trimmed to the
@@ -47753,14 +47786,7 @@ function resolveImageLambda(args) {
 	if (Array.isArray(rawImageConfig["Command"])) imageConfig.command = rawImageConfig["Command"].filter((s) => typeof s === "string");
 	if (Array.isArray(rawImageConfig["EntryPoint"])) imageConfig.entryPoint = rawImageConfig["EntryPoint"].filter((s) => typeof s === "string");
 	if (typeof rawImageConfig["WorkingDirectory"] === "string") imageConfig.workingDirectory = rawImageConfig["WorkingDirectory"];
-	const arches = props["Architectures"];
-	let architecture = "x86_64";
-	if (Array.isArray(arches) && arches.length > 0) {
-		const first = arches[0];
-		if (first === "arm64") architecture = "arm64";
-		else if (first === "x86_64") architecture = "x86_64";
-		else throw new Error(`Lambda '${logicalId}' has unsupported Architectures value '${String(first)}'. cdkd local start-api supports x86_64 and arm64.`);
-	}
+	const architecture = extractStartApiArchitecture(props, logicalId);
 	const ephemeralStorageMb = extractEphemeralStorageMb(props, logicalId);
 	return {
 		kind: "image",
@@ -50809,14 +50835,17 @@ function createLocalInvokeAgentCoreCommand() {
 * `--stack-region`) live in cdk-local's `addStartAgentCoreSpecificOptions` and
 * are auto-inherited.
 *
-* UNLIKE `start-cloudfront`, this command DOES bind deployed state: cdk-local's
-* factory accepts an `extraStateProviders` option (the same seam the
-* heavy-wrapper `cdkd local *` commands use), so cdkd threads its S3-backed
-* `--from-state` factory in via `cdkdExtraStateProviders` and layers the
-* cdkd-specific `--from-state` / `--state-bucket` / `--state-prefix` flags on
-* top of cdk-local's inherited `--from-cfn-stack` / `--stack-region` (issue
-* #766). The factory's internal `createLocalStateProvider` call picks cdkd's
-* `fromState` factory transparently when `--from-state` is passed.
+* Like `start-cloudfront` / `start-alb` / `start-service`, this command binds
+* deployed state through cdk-local's `extraStateProviders` seam: the factory
+* accepts an `extraStateProviders` option (the same seam those commands use), so
+* cdkd threads its S3-backed `--from-state` factory in via
+* `cdkdExtraStateProviders` and layers the cdkd-specific `--from-state` /
+* `--state-bucket` / `--state-prefix` flags on top of cdk-local's inherited
+* `--from-cfn-stack` / `--stack-region` (issue #766; the `start-agentcore`
+* factory carried the seam from the start, the `start-cloudfront` factory gained
+* it in cdk-local 0.128.0). The factory's internal `createLocalStateProvider`
+* call picks cdkd's `fromState` factory transparently when `--from-state` is
+* passed.
 *
 * The active cdkd embed config is re-handed to the factory so branding stays
 * cdkd: cdk-local's factory calls `setEmbedConfig(opts.embedConfig)`, and
@@ -50871,16 +50900,17 @@ function createLocalStartAlbCommand() {
 * binding a Function URL origin's backing Lambda + a deployed-S3 origin's bucket
 * name to deployed state) live in cdk-local and are auto-inherited.
 *
-* UNLIKE `start-agentcore` / `start-alb` / `start-service`, this command does
-* NOT thread cdkd's S3-backed `--from-state` source: cdk-local's
-* `CreateLocalStartCloudFrontCommandOptions` accepts only `embedConfig`, not the
-* `extraStateProviders` seam (the factory's internal `createLocalStateProvider`
-* calls pass no fourth argument). So `--from-state` / `--state-bucket` /
-* `--state-prefix` and `cdkdExtraStateProviders` threading are intentionally
-* absent here — start-cloudfront stays exempt from issue #766 until cdk-local
-* adds `extraStateProviders` to its start-cloudfront factory. Until then the
-* `--from-cfn-stack` flag (CloudFormation-backed deployed state) is the only
-* state source on this command.
+* As of cdk-local 0.128.0 (go-to-k/cdk-local#426 / #436) the start-cloudfront
+* factory accepts the `extraStateProviders` seam — the same one
+* `start-agentcore` / `start-alb` / `start-service` use — so cdkd now threads
+* its S3-backed `--from-state` factory in via `cdkdExtraStateProviders` and
+* layers the cdkd-specific `--from-state` / `--state-bucket` / `--state-prefix`
+* flags on top of cdk-local's inherited `--from-cfn-stack` / `--stack-region`
+* (issue #766). The factory's internal `createLocalStateProvider` calls pick
+* cdkd's `fromState` factory transparently when `--from-state` is passed, so a
+* Function URL origin's backing Lambda + a deployed-S3 origin's bucket name can
+* be bound to cdkd-managed state (after a prior `cdkd deploy`), not just to a
+* CloudFormation stack.
 *
 * The active cdkd embed config is re-handed to the factory so branding stays
 * cdkd: cdk-local's factory calls `setEmbedConfig(opts.embedConfig)`, and
@@ -50889,7 +50919,14 @@ function createLocalStartAlbCommand() {
 * cdk-local's `cdkl` defaults.
 */
 function createLocalStartCloudFrontCommand$1() {
-	return createLocalStartCloudFrontCommand({ embedConfig: getEmbedConfig() });
+	const cmd = createLocalStartCloudFrontCommand({
+		embedConfig: getEmbedConfig(),
+		extraStateProviders: cdkdExtraStateProviders
+	});
+	cmd.addOption(new Option("--from-state", "Read cdkd's S3 state for the target stack and substitute Ref / Fn::GetAtt / Fn::Sub / Fn::ImportValue / Fn::GetStackOutput intrinsics when binding a Lambda Function URL origin's backing Lambda and a deployed-S3 origin's bucket name. Mutually exclusive with --from-cfn-stack.").default(false));
+	cmd.addOption(new Option("--state-bucket <bucket>", "S3 bucket for --from-state. Falls back to CDKD_STATE_BUCKET env or cdk.json context.cdkd.stateBucket."));
+	cmd.addOption(new Option("--state-prefix <prefix>", "S3 key prefix for --from-state state files.").default("cdkd"));
+	return cmd;
 }
 
 //#endregion
@@ -51192,6 +51229,7 @@ async function resolveZipImagePlan(lambda, options) {
 		}],
 		extraMounts: layerPlan.mount ? [layerPlan.mount] : [],
 		cmd: [lambda.handler],
+		platform: architectureToPlatform(lambda.architecture),
 		...inlineTmpDir !== void 0 && { inlineTmpDir },
 		...layerPlan.tmpDir !== void 0 && { layersTmpDir: layerPlan.tmpDir },
 		...layerPlan.extraTmpDirs.length > 0 && { layerArnTmpDirs: layerPlan.extraTmpDirs },
@@ -52836,7 +52874,7 @@ function reorderArgs(argv) {
 async function main() {
 	installPipeCloseHandler();
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.209.1");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.210.1");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());