@go-to-k/cdkd 0.220.4 → 0.221.0

package/dist/cli.js

@@ -1553,7 +1553,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.220.4";
+	return "0.221.0";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -19738,18 +19738,175 @@ var ECSProvider = class {
 		};
 	}
 	/**
-	* Convert CFn Volumes to ECS SDK format
+	* Convert CFn Volumes to ECS SDK format.
+	*
+	* Every nested volume-configuration block is PascalCase in the CFn
+	* template and camelCase in the ECS SDK input, so each sub-block runs
+	* through a dedicated converter — the same PascalCase->camelCase trap
+	* already fixed for the ContainerDefinitions sub-arrays
+	* (convertEnvironment / convertSecrets / convertMountPoints etc.).
+	* Before issue #815, `Host` / `EFSVolumeConfiguration` were cast through
+	* raw (so their nested keys reached the SDK still PascalCase) and
+	* `DockerVolumeConfiguration` / `FSxWindowsFileServerVolumeConfiguration`
+	* were not mapped at all (silently dropped).
 	*/
 	convertVolumes(volumes) {
 		if (!volumes) return void 0;
 		return volumes.map((v) => ({
 			name: v["Name"],
-			host: v["Host"],
-			efsVolumeConfiguration: v["EFSVolumeConfiguration"],
+			host: this.convertVolumeHost(v["Host"]),
+			dockerVolumeConfiguration: this.convertDockerVolumeConfiguration(v["DockerVolumeConfiguration"]),
+			efsVolumeConfiguration: this.convertEFSVolumeConfiguration(v["EFSVolumeConfiguration"]),
+			fsxWindowsFileServerVolumeConfiguration: this.convertFSxWindowsVolumeConfiguration(v["FSxWindowsFileServerVolumeConfiguration"]),
 			configuredAtLaunch: this.coerceBool(v["ConfiguredAtLaunch"])
 		}));
 	}
 	/**
+	* Convert CFn Volumes[].Host to ECS SDK format.
+	* CFn: `{SourcePath}` -> SDK: `{sourcePath}`.
+	*/
+	convertVolumeHost(host) {
+		if (!host) return void 0;
+		return { sourcePath: host["SourcePath"] };
+	}
+	/**
+	* Convert CFn Volumes[].DockerVolumeConfiguration to ECS SDK format.
+	* CFn: `{Scope, Autoprovision, Driver, DriverOpts, Labels}`
+	* -> SDK: `{scope, autoprovision, driver, driverOpts, labels}`.
+	*/
+	convertDockerVolumeConfiguration(config) {
+		if (!config) return void 0;
+		return {
+			scope: config["Scope"],
+			autoprovision: this.coerceBool(config["Autoprovision"]),
+			driver: config["Driver"],
+			driverOpts: config["DriverOpts"],
+			labels: config["Labels"]
+		};
+	}
+	/**
+	* Convert CFn Volumes[].EFSVolumeConfiguration to ECS SDK format.
+	* CFn: `{FilesystemId, RootDirectory, TransitEncryption,
+	* TransitEncryptionPort, AuthorizationConfig}`
+	* -> SDK: `{fileSystemId, rootDirectory, transitEncryption,
+	* transitEncryptionPort, authorizationConfig}`.
+	* Note the CFn property is `FilesystemId` (lowercase `s`) while the SDK
+	* field is `fileSystemId` — they are not a simple first-letter case flip.
+	*/
+	convertEFSVolumeConfiguration(config) {
+		if (!config) return void 0;
+		return {
+			fileSystemId: config["FilesystemId"],
+			rootDirectory: config["RootDirectory"],
+			transitEncryption: config["TransitEncryption"],
+			transitEncryptionPort: config["TransitEncryptionPort"] !== void 0 ? Number(config["TransitEncryptionPort"]) : void 0,
+			authorizationConfig: this.convertEFSAuthorizationConfig(config["AuthorizationConfig"])
+		};
+	}
+	/**
+	* Convert CFn EFSVolumeConfiguration.AuthorizationConfig to ECS SDK format.
+	* CFn: `{AccessPointId, IAM}` -> SDK: `{accessPointId, iam}`.
+	* Note the CFn key is `IAM` (all caps), NOT `Iam` — not a simple
+	* first-letter case flip (verified against the CDK L1 `IAM` mapping).
+	*/
+	convertEFSAuthorizationConfig(config) {
+		if (!config) return void 0;
+		return {
+			accessPointId: config["AccessPointId"],
+			iam: config["IAM"]
+		};
+	}
+	/**
+	* Convert CFn Volumes[].FSxWindowsFileServerVolumeConfiguration to ECS
+	* SDK format.
+	* CFn: `{FileSystemId, RootDirectory, AuthorizationConfig}`
+	* -> SDK: `{fileSystemId, rootDirectory, authorizationConfig}`.
+	*/
+	convertFSxWindowsVolumeConfiguration(config) {
+		if (!config) return void 0;
+		return {
+			fileSystemId: config["FileSystemId"],
+			rootDirectory: config["RootDirectory"],
+			authorizationConfig: this.convertFSxWindowsAuthorizationConfig(config["AuthorizationConfig"])
+		};
+	}
+	/**
+	* Convert CFn FSxWindowsFileServerVolumeConfiguration.AuthorizationConfig
+	* to ECS SDK format.
+	* CFn: `{CredentialsParameter, Domain}`
+	* -> SDK: `{credentialsParameter, domain}`.
+	*/
+	convertFSxWindowsAuthorizationConfig(config) {
+		if (!config) return void 0;
+		return {
+			credentialsParameter: config["CredentialsParameter"],
+			domain: config["Domain"]
+		};
+	}
+	/**
+	* Convert the camelCase SDK `volumes` shape returned by
+	* DescribeTaskDefinition back to the PascalCase CFn template form, so the
+	* `readCurrentState` snapshot matches the deploy-time template
+	* representation for drift comparison (issue #815). Only volume keys
+	* present on the SDK side are emitted, so a future field cdkd does not
+	* map cannot surface as phantom drift. TaskDefinitions are immutable
+	* replace-only today, so this is forward-looking normalization.
+	*/
+	volumesToCfn(volumes) {
+		if (!volumes) return [];
+		return volumes.map((v) => {
+			const out = {};
+			if (v.name !== void 0) out["Name"] = v.name;
+			if (v.host !== void 0) {
+				const host = {};
+				if (v.host.sourcePath !== void 0) host["SourcePath"] = v.host.sourcePath;
+				out["Host"] = host;
+			}
+			if (v.dockerVolumeConfiguration !== void 0) {
+				const d = v.dockerVolumeConfiguration;
+				const docker = {};
+				if (d.scope !== void 0) docker["Scope"] = d.scope;
+				if (d.autoprovision !== void 0) docker["Autoprovision"] = d.autoprovision;
+				if (d.driver !== void 0) docker["Driver"] = d.driver;
+				if (d.driverOpts !== void 0) docker["DriverOpts"] = d.driverOpts;
+				if (d.labels !== void 0) docker["Labels"] = d.labels;
+				out["DockerVolumeConfiguration"] = docker;
+			}
+			if (v.efsVolumeConfiguration !== void 0) {
+				const e = v.efsVolumeConfiguration;
+				const efs = {};
+				if (e.fileSystemId !== void 0) efs["FilesystemId"] = e.fileSystemId;
+				if (e.rootDirectory !== void 0) efs["RootDirectory"] = e.rootDirectory;
+				if (e.transitEncryption !== void 0) efs["TransitEncryption"] = e.transitEncryption;
+				if (e.transitEncryptionPort !== void 0) efs["TransitEncryptionPort"] = e.transitEncryptionPort;
+				if (e.authorizationConfig !== void 0) {
+					const a = e.authorizationConfig;
+					const auth = {};
+					if (a.accessPointId !== void 0) auth["AccessPointId"] = a.accessPointId;
+					if (a.iam !== void 0) auth["IAM"] = a.iam;
+					efs["AuthorizationConfig"] = auth;
+				}
+				out["EFSVolumeConfiguration"] = efs;
+			}
+			if (v.fsxWindowsFileServerVolumeConfiguration !== void 0) {
+				const f = v.fsxWindowsFileServerVolumeConfiguration;
+				const fsx = {};
+				if (f.fileSystemId !== void 0) fsx["FileSystemId"] = f.fileSystemId;
+				if (f.rootDirectory !== void 0) fsx["RootDirectory"] = f.rootDirectory;
+				if (f.authorizationConfig !== void 0) {
+					const a = f.authorizationConfig;
+					const auth = {};
+					if (a.credentialsParameter !== void 0) auth["CredentialsParameter"] = a.credentialsParameter;
+					if (a.domain !== void 0) auth["Domain"] = a.domain;
+					fsx["AuthorizationConfig"] = auth;
+				}
+				out["FSxWindowsFileServerVolumeConfiguration"] = fsx;
+			}
+			if (v.configuredAtLaunch !== void 0) out["ConfiguredAtLaunch"] = v.configuredAtLaunch;
+			return out;
+		});
+	}
+	/**
 	* Coerce a CFn boolean property to a real boolean at the wire boundary.
 	* CFn templates can carry booleans as the strings "true" / "false"
 	* (e.g. via Fn::Sub / parameter plumbing), so the SDK input must
@@ -19928,7 +20085,7 @@ var ECSProvider = class {
 		result["RequiresCompatibilities"] = td.requiresCompatibilities ? [...td.requiresCompatibilities] : [];
 		if (td.executionRoleArn !== void 0) result["ExecutionRoleArn"] = td.executionRoleArn;
 		if (td.taskRoleArn !== void 0) result["TaskRoleArn"] = td.taskRoleArn;
-		result["Volumes"] = td.volumes ?? [];
+		result["Volumes"] = this.volumesToCfn(td.volumes);
 		result["PlacementConstraints"] = td.placementConstraints ?? [];
 		if (td.runtimePlatform) result["RuntimePlatform"] = td.runtimePlatform;
 		if (td.proxyConfiguration) result["ProxyConfiguration"] = td.proxyConfiguration;
@@ -34259,7 +34416,8 @@ async function runDestroyForStack(stackName, state, ctx) {
 		skippedEmpty: false,
 		deletedCount: 0,
 		retainedCount: 0,
-		errorCount: 0
+		errorCount: 0,
+		interrupted: false
 	};
 	const resourceCount = Object.keys(state.resources).length;
 	const regionForState = state.region ?? ctx.baseRegion;
@@ -34352,6 +34510,20 @@ async function runDestroyForStack(stackName, state, ctx) {
 	};
 	const renderer = getLiveRenderer();
 	renderer.start();
+	let draining = false;
+	const sigintHandler = () => {
+		if (draining) {
+			ctx.lockManager.releaseLock(stackName, regionForState).catch(() => {});
+			process.stderr.write(`\nForce-quit: stack lock may not be released. If the next run reports a lock, run: cdkd force-unlock ${stackName}\n`);
+			process.exit(130);
+		}
+		draining = true;
+		renderer.printAbove(() => {
+			process.stderr.write("\nInterrupted — finishing in-flight deletes, then flushing state and releasing the lock (press Ctrl-C again to force-quit)...\n");
+		});
+	};
+	process.setMaxListeners(Math.max(process.getMaxListeners(), 100));
+	process.on("SIGINT", sigintHandler);
 	try {
 		logger.info("Building dependency graph...");
 		const template = {
@@ -34393,11 +34565,16 @@ async function runDestroyForStack(stackName, state, ctx) {
 		const executionLevels = dagBuilder.getExecutionLevels(graph);
 		logger.debug(`Dependency graph: ${executionLevels.length} level(s)`);
 		for (let levelIndex = executionLevels.length - 1; levelIndex >= 0; levelIndex--) {
+			if (draining) {
+				logger.debug("Interrupted (draining) — not scheduling further deletion levels");
+				break;
+			}
 			const level = executionLevels[levelIndex];
 			if (!level) continue;
 			logger.debug(`Deletion level ${executionLevels.length - levelIndex}/${executionLevels.length} (${level.length} resources)`);
 			const stackRegion = state.region ?? ctx.baseRegion;
 			const deletePromises = level.map(async (logicalId) => {
+				if (draining) return;
 				const resource = state.resources[logicalId];
 				if (!resource) {
 					logger.warn(`Resource ${logicalId} not found in state, skipping`);
@@ -34534,8 +34711,10 @@ async function runDestroyForStack(stackName, state, ctx) {
 			});
 			await Promise.all(deletePromises);
 		}
+		result.interrupted = draining;
 		await saveChain;
-		if (result.errorCount === 0) {
+		const preserveState = result.errorCount > 0 || result.interrupted;
+		if (!preserveState) {
 			await ctx.stateBackend.deleteState(stackName, regionForState);
 			logger.debug("State deleted");
 			if (ctx.exportIndexStore) await ctx.exportIndexStore.removeStack(stackName, regionForState);
@@ -34545,12 +34724,15 @@ async function runDestroyForStack(stackName, state, ctx) {
 			} catch (error) {
 				logger.warn(`Failed to persist remaining state after partial destroy: ${error instanceof Error ? error.message : String(error)}. The state file may still list already-deleted resources; a re-run resolves them idempotently.`);
 			}
-			logger.warn(`${result.errorCount} resource(s) failed to delete. State preserved.`);
+			if (result.interrupted) logger.warn(`Destroy interrupted — ${Object.keys(remainingResources).length} resource(s) not deleted. State preserved.`);
+			else logger.warn(`${result.errorCount} resource(s) failed to delete. State preserved.`);
 		}
 		const retainedSuffix = result.retainedCount > 0 ? `, ${result.retainedCount} retained` : "";
-		if (result.errorCount === 0) logger.info(`\n${green("✓")} ${bold(`Stack ${stackName} destroyed`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${result.errorCount} errors)`);
+		if (!preserveState) logger.info(`\n${green("✓")} ${bold(`Stack ${stackName} destroyed`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${result.errorCount} errors)`);
+		else if (result.interrupted && result.errorCount === 0) logger.warn(`\n${yellow("⚠")} ${bold(`Stack ${stackName} destroy interrupted`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${result.errorCount} errors). State preserved — re-run 'cdkd destroy' / 'cdkd state destroy' to finish.`);
 		else logger.warn(`\n${yellow("⚠")} ${bold(`Stack ${stackName} partially destroyed`)} (${green(result.deletedCount)} deleted${retainedSuffix}, ${red(result.errorCount)} errors). State preserved — re-run 'cdkd destroy' / 'cdkd state destroy' to clean up.`);
 	} finally {
+		process.removeListener("SIGINT", sigintHandler);
 		renderer.stop();
 		await saveChain;
 		logger.debug("Releasing lock...");
@@ -38165,6 +38347,7 @@ async function destroyCommand(stackArgs, options) {
 		} else throw new Error("Could not determine which stacks belong to this app. Specify stack names explicitly, use --all, or ensure --app / cdk.json is configured.");
 		const stackPatterns = stackArgs.length > 0 ? stackArgs : options.stack ? [options.stack] : [];
 		let totalErrors = 0;
+		let interrupted = false;
 		let stackNames;
 		if (options.all) stackNames = candidateStacks.map((s) => s.stackName);
 		else if (stackPatterns.length > 0) stackNames = matchStacks(candidateStacks, stackPatterns).map((s) => s.stackName);
@@ -38286,6 +38469,7 @@ async function destroyCommand(stackArgs, options) {
 					eventRecorder
 				}));
 				totalErrors += result.errorCount;
+				if (result.interrupted) interrupted = true;
 				destroyRunResult = result.errorCount > 0 ? "FAILED" : "SUCCEEDED";
 				eventRecorder.record({
 					eventType: "RUN_FINISHED",
@@ -38305,8 +38489,10 @@ async function destroyCommand(stackArgs, options) {
 			} finally {
 				await eventRecorder.finalize(destroyRunResult);
 			}
+			if (interrupted) break;
 		}
 		if (totalErrors > 0) throw new PartialFailureError(`Destroy completed with ${totalErrors} resource error(s). State preserved — inspect 'cdkd state show <stack>' and re-run 'cdkd destroy' to retry.`);
+		if (interrupted) throw new PartialFailureError(`Destroy interrupted by Ctrl-C. State preserved — re-run 'cdkd destroy' to finish.`);
 	} finally {
 		awsClients.destroy();
 	}
@@ -42743,6 +42929,7 @@ async function stateDestroyCommand(stackArgs, options) {
 		}
 		logger.info(`Found ${stackNames.length} stack(s) to destroy: ${stackNames.join(", ")}`);
 		let totalErrors = 0;
+		let interrupted = false;
 		for (const stackName of stackNames) {
 			const refs = stateRefs.filter((r) => r.stackName === stackName);
 			let targets;
@@ -42800,9 +42987,13 @@ async function stateDestroyCommand(stackArgs, options) {
 					...options.resourceTimeout?.perTypeMs && { resourceTimeoutByType: options.resourceTimeout.perTypeMs }
 				}));
 				totalErrors += result.errorCount;
+				if (result.interrupted) interrupted = true;
+				if (interrupted) break;
 			}
+			if (interrupted) break;
 		}
 		if (totalErrors > 0) throw new PartialFailureError(`Destroy completed with ${totalErrors} resource error(s). State preserved — inspect 'cdkd state show <stack>' and re-run 'cdkd state destroy' to retry.`);
+		if (interrupted) throw new PartialFailureError(`Destroy interrupted by Ctrl-C. State preserved — re-run 'cdkd state destroy' to finish.`);
 	} finally {
 		setup.dispose();
 	}
@@ -53633,7 +53824,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.220.4");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.221.0");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());