@go-to-k/cdkd 0.260.5 → 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.5";
+	return "0.260.6";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -21875,6 +21875,22 @@ const DEPLOYMENT_CONFIG_PRESERVE_KEYS = /* @__PURE__ */ new Set(["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:
@@ -22277,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;
@@ -22878,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
@@ -22926,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"]
 			}));
@@ -23012,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) {
@@ -61680,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.5");
+	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());