@go-to-k/cdkd 0.260.6 → 0.260.8

package/dist/cli.js

@@ -1901,7 +1901,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.260.6";
+	return "0.260.8";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -22376,7 +22376,19 @@ var ECSProvider = class {
 			startTimeout: def["StartTimeout"],
 			stopTimeout: def["StopTimeout"],
 			interactive: def["Interactive"],
-			pseudoTerminal: def["PseudoTerminal"]
+			pseudoTerminal: def["PseudoTerminal"],
+			repositoryCredentials: def["RepositoryCredentials"] ? pascalToCamelCaseKeys(def["RepositoryCredentials"]) : void 0,
+			firelensConfiguration: this.convertFirelensConfiguration(def["FirelensConfiguration"]),
+			resourceRequirements: def["ResourceRequirements"] ? pascalToCamelCaseKeys(def["ResourceRequirements"]) : void 0,
+			systemControls: def["SystemControls"] ? pascalToCamelCaseKeys(def["SystemControls"]) : void 0,
+			extraHosts: def["ExtraHosts"] ? pascalToCamelCaseKeys(def["ExtraHosts"]) : void 0,
+			restartPolicy: def["RestartPolicy"] ? pascalToCamelCaseKeys(def["RestartPolicy"]) : void 0,
+			dnsServers: def["DnsServers"],
+			dnsSearchDomains: def["DnsSearchDomains"],
+			dockerSecurityOptions: def["DockerSecurityOptions"],
+			credentialSpecs: def["CredentialSpecs"],
+			hostname: def["Hostname"],
+			versionConsistency: def["VersionConsistency"]
 		}));
 	}
 	/**
@@ -22494,6 +22506,20 @@ var ECSProvider = class {
 		};
 	}
 	/**
+	* Convert CFn `ContainerDefinitions[].FirelensConfiguration` to the ECS SDK
+	* shape (issue #1173). `Type` flips to `type`, but `Options` is a free-form
+	* map of user-supplied FireLens options (e.g. `enable-ecs-log-metadata`,
+	* `config-file-value`) whose keys are NOT CFn property names, so it is copied
+	* verbatim rather than case-flipped.
+	*/
+	convertFirelensConfiguration(config) {
+		if (!config) return void 0;
+		return {
+			type: config["Type"],
+			options: config["Options"]
+		};
+	}
+	/**
 	* Convert CFn HealthCheck to ECS SDK format
 	*/
 	convertHealthCheck(check) {
@@ -22695,6 +22721,140 @@ var ECSProvider = class {
 		return out;
 	}
 	/**
+	* Reverse of `convertContainerDefinitions` for `readCurrentState` (issue
+	* #1169). Emits CFn PascalCase so the drift baseline (state `properties`
+	* PascalCase, or `observedProperties` captured via this same reader) compares
+	* apples-to-apples instead of phantom-drifting on the whole array — the drift
+	* comparator compares arrays wholesale via `deepEqual`, so the previous raw
+	* SDK camelCase read (`result['ContainerDefinitions'] = td.containerDefinitions`)
+	* never matched a PascalCase baseline.
+	*
+	* Two rules keep the read side matching a template that omits AWS's defaults:
+	*   1. Only the fields `convertContainerDefinitions` can SET are emitted, so
+	*      the round-trip is symmetric — a field cdkd cannot set is never surfaced
+	*      as drift against a template that lacks it.
+	*   2. AWS-defaulted-empty divergences are normalized away — `Cpu: 0`, empty
+	*      arrays (`PortMappings` / `Environment` / ...), and an empty
+	*      `LinuxParameters.Capabilities: {Add:[],Drop:[]}` are dropped so they
+	*      equal "absent" (what the template has). AWS returns these defaults on
+	*      EVERY read, so without this the `properties` fallback baseline
+	*      (pre-observedProperties state) would phantom-drift on every run; the
+	*      normalization trades that for a rare edge — a template that EXPLICITLY
+	*      sets one of these to its empty/zero default AND has no observed baseline
+	*      (CDK L2 never emits e.g. an explicit `Cpu: 0`). On the normal
+	*      `observedProperties` path both sides run through this reader, so the
+	*      snapshot is self-consistent regardless.
+	*
+	* Free-form maps (`DockerLabels`, `LogConfiguration.Options`) are copied
+	* verbatim — their keys are user data (log-driver options / container labels),
+	* NOT CFn property names, so they must not be case-flipped.
+	*/
+	containerDefinitionsToCfn(defs) {
+		if (!defs) return [];
+		return defs.map((c) => {
+			const out = {};
+			if (c.name !== void 0) out["Name"] = c.name;
+			if (c.image !== void 0) out["Image"] = c.image;
+			if (c.cpu !== void 0 && c.cpu !== 0) out["Cpu"] = c.cpu;
+			if (c.memory !== void 0) out["Memory"] = c.memory;
+			if (c.memoryReservation !== void 0) out["MemoryReservation"] = c.memoryReservation;
+			if (c.essential !== void 0) out["Essential"] = c.essential;
+			if (c.command && c.command.length > 0) out["Command"] = [...c.command];
+			if (c.entryPoint && c.entryPoint.length > 0) out["EntryPoint"] = [...c.entryPoint];
+			if (c.environment && c.environment.length > 0) out["Environment"] = c.environment.map((e) => ({
+				Name: e.name,
+				Value: e.value
+			}));
+			if (c.environmentFiles && c.environmentFiles.length > 0) out["EnvironmentFiles"] = c.environmentFiles.map((e) => ({
+				Type: e.type,
+				Value: e.value
+			}));
+			if (c.secrets && c.secrets.length > 0) out["Secrets"] = c.secrets.map((s) => ({
+				Name: s.name,
+				ValueFrom: s.valueFrom
+			}));
+			if (c.portMappings && c.portMappings.length > 0) out["PortMappings"] = camelToPascalCaseKeys(c.portMappings);
+			if (c.mountPoints && c.mountPoints.length > 0) out["MountPoints"] = camelToPascalCaseKeys(c.mountPoints);
+			if (c.volumesFrom && c.volumesFrom.length > 0) out["VolumesFrom"] = camelToPascalCaseKeys(c.volumesFrom);
+			if (c.dependsOn && c.dependsOn.length > 0) out["DependsOn"] = camelToPascalCaseKeys(c.dependsOn);
+			if (c.links && c.links.length > 0) out["Links"] = [...c.links];
+			if (c.workingDirectory !== void 0) out["WorkingDirectory"] = c.workingDirectory;
+			if (c.disableNetworking !== void 0) out["DisableNetworking"] = c.disableNetworking;
+			if (c.privileged !== void 0) out["Privileged"] = c.privileged;
+			if (c.readonlyRootFilesystem !== void 0) out["ReadonlyRootFilesystem"] = c.readonlyRootFilesystem;
+			if (c.user !== void 0) out["User"] = c.user;
+			if (c.ulimits && c.ulimits.length > 0) out["Ulimits"] = camelToPascalCaseKeys(c.ulimits);
+			if (c.logConfiguration) out["LogConfiguration"] = this.logConfigurationToCfn(c.logConfiguration);
+			if (c.healthCheck) out["HealthCheck"] = camelToPascalCaseKeys(c.healthCheck);
+			if (c.linuxParameters) {
+				const lp = this.linuxParametersToCfn(c.linuxParameters);
+				if (Object.keys(lp).length > 0) out["LinuxParameters"] = lp;
+			}
+			if (c.dockerLabels && Object.keys(c.dockerLabels).length > 0) out["DockerLabels"] = { ...c.dockerLabels };
+			if (c.startTimeout !== void 0) out["StartTimeout"] = c.startTimeout;
+			if (c.stopTimeout !== void 0) out["StopTimeout"] = c.stopTimeout;
+			if (c.interactive !== void 0) out["Interactive"] = c.interactive;
+			if (c.pseudoTerminal !== void 0) out["PseudoTerminal"] = c.pseudoTerminal;
+			if (c.repositoryCredentials) out["RepositoryCredentials"] = camelToPascalCaseKeys(c.repositoryCredentials);
+			if (c.firelensConfiguration) {
+				const fc = {};
+				if (c.firelensConfiguration.type !== void 0) fc["Type"] = c.firelensConfiguration.type;
+				if (c.firelensConfiguration.options && Object.keys(c.firelensConfiguration.options).length > 0) fc["Options"] = { ...c.firelensConfiguration.options };
+				if (Object.keys(fc).length > 0) out["FirelensConfiguration"] = fc;
+			}
+			if (c.resourceRequirements && c.resourceRequirements.length > 0) out["ResourceRequirements"] = camelToPascalCaseKeys(c.resourceRequirements);
+			if (c.systemControls && c.systemControls.length > 0) out["SystemControls"] = camelToPascalCaseKeys(c.systemControls);
+			if (c.extraHosts && c.extraHosts.length > 0) out["ExtraHosts"] = camelToPascalCaseKeys(c.extraHosts);
+			if (c.restartPolicy) out["RestartPolicy"] = camelToPascalCaseKeys(c.restartPolicy);
+			if (c.dnsServers && c.dnsServers.length > 0) out["DnsServers"] = [...c.dnsServers];
+			if (c.dnsSearchDomains && c.dnsSearchDomains.length > 0) out["DnsSearchDomains"] = [...c.dnsSearchDomains];
+			if (c.dockerSecurityOptions && c.dockerSecurityOptions.length > 0) out["DockerSecurityOptions"] = [...c.dockerSecurityOptions];
+			if (c.credentialSpecs && c.credentialSpecs.length > 0) out["CredentialSpecs"] = [...c.credentialSpecs];
+			if (c.hostname !== void 0) out["Hostname"] = c.hostname;
+			if (c.versionConsistency !== void 0 && c.versionConsistency !== "enabled") out["VersionConsistency"] = c.versionConsistency;
+			return out;
+		});
+	}
+	/**
+	* Reverse of `convertLogConfiguration` for `containerDefinitionsToCfn`.
+	* `LogDriver` flips; `Options` is a free-form log-driver option map copied
+	* verbatim (its keys, e.g. `awslogs-group`, are NOT CFn property names);
+	* `SecretOptions` is a `{Name, ValueFrom}[]` list. Emit-when-present so an
+	* absent / empty sub-field does not phantom-drift.
+	*/
+	logConfigurationToCfn(lc) {
+		const out = {};
+		if (lc.logDriver !== void 0) out["LogDriver"] = lc.logDriver;
+		if (lc.options && Object.keys(lc.options).length > 0) out["Options"] = { ...lc.options };
+		if (lc.secretOptions && lc.secretOptions.length > 0) out["SecretOptions"] = lc.secretOptions.map((s) => ({
+			Name: s.name,
+			ValueFrom: s.valueFrom
+		}));
+		return out;
+	}
+	/**
+	* Reverse of `convertLinuxParameters` for `containerDefinitionsToCfn`. The
+	* SET side is a mechanical first-letter flip (`pascalToCamelCaseKeys`), so the
+	* read side is the inverse `camelToPascalCaseKeys` — plus normalization of the
+	* AWS-defaulted-empty `Capabilities` / `Devices` / `Tmpfs`: AWS returns
+	* `capabilities: {add:[], drop:[]}` even when the template set neither, so the
+	* empty `Add` / `Drop` (and an otherwise-empty `Capabilities`) and empty
+	* `Devices` / `Tmpfs` arrays are dropped to equal a template that omits them.
+	*/
+	linuxParametersToCfn(lp) {
+		const out = camelToPascalCaseKeys(lp);
+		const caps = out["Capabilities"];
+		if (caps) {
+			const normalized = {};
+			if (Array.isArray(caps["Add"]) && caps["Add"].length > 0) normalized["Add"] = caps["Add"];
+			if (Array.isArray(caps["Drop"]) && caps["Drop"].length > 0) normalized["Drop"] = caps["Drop"];
+			if (Object.keys(normalized).length > 0) out["Capabilities"] = normalized;
+			else delete out["Capabilities"];
+		}
+		for (const key of ["Devices", "Tmpfs"]) if (Array.isArray(out[key]) && out[key].length === 0) delete out[key];
+		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
@@ -23027,7 +23187,7 @@ var ECSProvider = class {
 		if (td.ipcMode !== void 0) result["IpcMode"] = td.ipcMode;
 		if (td.ephemeralStorage?.sizeInGiB !== void 0) result["EphemeralStorage"] = { SizeInGiB: td.ephemeralStorage.sizeInGiB };
 		if (td.enableFaultInjection !== void 0) result["EnableFaultInjection"] = td.enableFaultInjection;
-		result["ContainerDefinitions"] = td.containerDefinitions ?? [];
+		result["ContainerDefinitions"] = this.containerDefinitionsToCfn(td.containerDefinitions);
 		result["Tags"] = normalizeAwsTagsToCfn(resp.tags);
 		return result;
 	}
@@ -61707,7 +61867,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.260.6");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.260.8");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());