@go-to-k/cdkd 0.260.4 → 0.260.6

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.4";
+	return "0.260.6";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -21867,6 +21867,30 @@ function convertTags(tags) {
 */
 const DEPLOYMENT_CONFIG_PRESERVE_KEYS = /* @__PURE__ */ new Set(["HookDetails"]);
 /**
+* Read-side (camelCase -> PascalCase) counterpart of
+* `DEPLOYMENT_CONFIG_PRESERVE_KEYS` for `readCurrentState` (issue #1165 /
+* #1167). The SDK response carries the free-form document under the camelCase
+* key `hookDetails`, so the reverse key-flip must copy its value subtree
+* verbatim (the key itself is still flipped to `HookDetails`).
+*/
+const DEPLOYMENT_CONFIG_PRESERVE_KEYS_CAMEL = /* @__PURE__ */ new Set(["hookDetails"]);
+/**
+* Derive the cluster name from a long-format ECS Service ARN
+* (`arn:<partition>:ecs:<region>:<account>:service/<clusterName>/<serviceName>`)
+* so `DescribeServices` can be scoped to the right cluster (issue #1170).
+* Returns `undefined` for the legacy short-format ARN
+* (`.../service/<serviceName>`, which does not encode a cluster) or any input
+* that does not match the ARN shape — the caller then falls back to the default
+* cluster, matching what the short-format ARN implies.
+*/
+function clusterNameFromServiceArn(arn) {
+	const resource = arn.split(":")[5];
+	if (!resource) return void 0;
+	const segments = resource.split("/");
+	if (segments[0] !== "service") return void 0;
+	return segments.length >= 3 ? segments[1] : void 0;
+}
+/**
 * AWS ECS Provider
 *
 * Implements resource provisioning for ECS resources:
@@ -22269,7 +22293,10 @@ var ECSProvider = class {
 		}
 	}
 	async getServiceAttribute(physicalId, attributeName) {
-		const service = (await this.getClient().send(new DescribeServicesCommand({ services: [physicalId] }))).services?.[0];
+		const service = (await this.getClient().send(new DescribeServicesCommand({
+			cluster: clusterNameFromServiceArn(physicalId),
+			services: [physicalId]
+		}))).services?.[0];
 		if (!service) return void 0;
 		switch (attributeName) {
 			case "ServiceArn": return service.serviceArn;
@@ -22649,6 +22676,25 @@ var ECSProvider = class {
 		});
 	}
 	/**
+	* Reverse of `convertProxyConfiguration` for `readCurrentState` (issue
+	* #1167): map the SDK camelCase `ProxyConfiguration` back to the CFn
+	* PascalCase shape so the drift baseline (state `properties`, PascalCase)
+	* and the AWS-current read compare apples-to-apples. Unlike the pure
+	* first-letter flips, the SDK field `properties` maps back to the CFn key
+	* `ProxyConfigurationProperties` (a `{Name,Value}[]`), so it needs an
+	* explicit remap rather than `camelToPascalCaseKeys`.
+	*/
+	proxyConfigurationToCfn(config) {
+		const out = {};
+		if (config.type !== void 0) out["Type"] = config.type;
+		if (config.containerName !== void 0) out["ContainerName"] = config.containerName;
+		if (config.properties !== void 0) out["ProxyConfigurationProperties"] = config.properties.map((p) => ({
+			Name: p.name,
+			Value: p.value
+		}));
+		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
@@ -22851,8 +22897,9 @@ var ECSProvider = class {
 	*
 	* Dispatches by resource type:
 	*   - `AWS::ECS::Cluster` → `DescribeClusters`
-	*   - `AWS::ECS::Service` → `DescribeServices`. Service physicalIds use
-	*     the composite form `<clusterArn>|<serviceName>`; we split on `|`.
+	*   - `AWS::ECS::Service` → `DescribeServices`. Service physicalIds come in
+	*     two forms — the service ARN (what `createService` stores) and the
+	*     composite `<clusterArn>|<serviceName>` — and both are accepted (#1170).
 	*   - `AWS::ECS::TaskDefinition` → `DescribeTaskDefinition`
 	*
 	* Each branch surfaces only the keys cdkd's `create()` accepts, mapping
@@ -22888,8 +22935,8 @@ var ECSProvider = class {
 		if (!c || !c.clusterName) return void 0;
 		const result = { ClusterName: c.clusterName };
 		result["CapacityProviders"] = c.capacityProviders ? [...c.capacityProviders] : [];
-		result["DefaultCapacityProviderStrategy"] = c.defaultCapacityProviderStrategy ?? [];
-		if (c.configuration) result["Configuration"] = c.configuration;
+		result["DefaultCapacityProviderStrategy"] = camelToPascalCaseKeys(c.defaultCapacityProviderStrategy ?? []);
+		if (c.configuration) result["Configuration"] = camelToPascalCaseKeys(c.configuration);
 		result["ClusterSettings"] = (c.settings ?? []).map((s) => ({
 			Name: s.name,
 			Value: s.value
@@ -22899,14 +22946,20 @@ var ECSProvider = class {
 		return result;
 	}
 	async readCurrentStateService(physicalId) {
+		let cluster;
+		let serviceName;
 		const sep = physicalId.indexOf("|");
-		if (sep < 0) return void 0;
-		const clusterArn = physicalId.substring(0, sep);
-		const serviceName = physicalId.substring(sep + 1);
+		if (sep >= 0) {
+			cluster = physicalId.substring(0, sep);
+			serviceName = physicalId.substring(sep + 1);
+		} else {
+			serviceName = physicalId;
+			cluster = clusterNameFromServiceArn(physicalId);
+		}
 		let resp;
 		try {
 			resp = await this.getClient().send(new DescribeServicesCommand({
-				cluster: clusterArn,
+				cluster,
 				services: [serviceName],
 				include: ["TAGS"]
 			}));
@@ -22927,21 +22980,22 @@ var ECSProvider = class {
 		if (s.enableECSManagedTags !== void 0) result["EnableECSManagedTags"] = s.enableECSManagedTags;
 		if (s.enableExecuteCommand !== void 0) result["EnableExecuteCommand"] = s.enableExecuteCommand;
 		if (s.healthCheckGracePeriodSeconds !== void 0) result["HealthCheckGracePeriodSeconds"] = s.healthCheckGracePeriodSeconds;
-		if (s.networkConfiguration) result["NetworkConfiguration"] = s.networkConfiguration;
-		result["LoadBalancers"] = s.loadBalancers ?? [];
-		if (s.capacityProviderStrategy && s.capacityProviderStrategy.length > 0) result["CapacityProviderStrategy"] = s.capacityProviderStrategy;
+		if (s.networkConfiguration) result["NetworkConfiguration"] = camelToPascalCaseKeys(s.networkConfiguration);
+		result["LoadBalancers"] = camelToPascalCaseKeys(s.loadBalancers ?? []);
+		if (s.capacityProviderStrategy && s.capacityProviderStrategy.length > 0) result["CapacityProviderStrategy"] = camelToPascalCaseKeys(s.capacityProviderStrategy);
 		else if (!s.launchType) result["CapacityProviderStrategy"] = [];
-		if (s.deploymentConfiguration) result["DeploymentConfiguration"] = s.deploymentConfiguration;
-		result["PlacementConstraints"] = s.placementConstraints ?? [];
+		if (s.deploymentConfiguration) result["DeploymentConfiguration"] = camelToPascalCaseKeys(s.deploymentConfiguration, DEPLOYMENT_CONFIG_PRESERVE_KEYS_CAMEL);
+		result["PlacementConstraints"] = camelToPascalCaseKeys(s.placementConstraints ?? []);
 		if (s.launchType === "EC2" || s.launchType === "EXTERNAL") {
-			const strategy = s.placementStrategy ?? [];
+			const strategy = camelToPascalCaseKeys(s.placementStrategy ?? []);
 			result["PlacementStrategy"] = strategy;
 			result["PlacementStrategies"] = strategy;
 		} else if (s.placementStrategy && s.placementStrategy.length > 0) {
-			result["PlacementStrategy"] = s.placementStrategy;
-			result["PlacementStrategies"] = s.placementStrategy;
+			const strategy = camelToPascalCaseKeys(s.placementStrategy);
+			result["PlacementStrategy"] = strategy;
+			result["PlacementStrategies"] = strategy;
 		}
-		result["ServiceRegistries"] = s.serviceRegistries ?? [];
+		result["ServiceRegistries"] = camelToPascalCaseKeys(s.serviceRegistries ?? []);
 		result["Tags"] = normalizeAwsTagsToCfn(s.tags);
 		return result;
 	}
@@ -22966,9 +23020,9 @@ var ECSProvider = class {
 		if (td.executionRoleArn !== void 0) result["ExecutionRoleArn"] = td.executionRoleArn;
 		if (td.taskRoleArn !== void 0) result["TaskRoleArn"] = td.taskRoleArn;
 		result["Volumes"] = this.volumesToCfn(td.volumes);
-		result["PlacementConstraints"] = td.placementConstraints ?? [];
-		if (td.runtimePlatform) result["RuntimePlatform"] = td.runtimePlatform;
-		if (td.proxyConfiguration) result["ProxyConfiguration"] = td.proxyConfiguration;
+		result["PlacementConstraints"] = camelToPascalCaseKeys(td.placementConstraints ?? []);
+		if (td.runtimePlatform) result["RuntimePlatform"] = camelToPascalCaseKeys(td.runtimePlatform);
+		if (td.proxyConfiguration) result["ProxyConfiguration"] = this.proxyConfigurationToCfn(td.proxyConfiguration);
 		if (td.pidMode !== void 0) result["PidMode"] = td.pidMode;
 		if (td.ipcMode !== void 0) result["IpcMode"] = td.ipcMode;
 		if (td.ephemeralStorage?.sizeInGiB !== void 0) result["EphemeralStorage"] = { SizeInGiB: td.ephemeralStorage.sizeInGiB };
@@ -22984,10 +23038,11 @@ var ECSProvider = class {
 	* `AWS::ECS::TaskDefinition` — all explicit-override only (see the
 	* per-branch notes on why the `aws:cdk:path` tag walk was removed).
 	*
-	* Service has a composite physical id of `<clusterArn>|<serviceName>`
-	* (the form ECSProvider uses internally for mutation operations),
-	* so the explicit-override path takes that composite form when
-	* supplied.
+	* `createService` stores the service ARN as the Service physical id (and
+	* the mutation ops pass it straight through as the `service` argument, with
+	* the cluster read from the template `Cluster` property). The explicit
+	* `--resource` override is honored verbatim, so a caller may also supply the
+	* composite `<clusterArn>|<serviceName>` form that `readCurrentState` accepts.
 	*/
 	async import(input) {
 		switch (input.resourceType) {
@@ -61652,7 +61707,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.4");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.260.6");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());