@go-to-k/cdkd 0.98.1 → 0.98.2

package/dist/cli.js

@@ -4754,23 +4754,75 @@ var SQSQueuePolicyProvider = class {
 	/**
 	* Adopt an existing SQS queue policy into cdkd state.
 	*
-	* **Explicit override only.** A `QueuePolicy` is an attachment applied to
-	* a queue via `SetQueueAttributes(Policy=...)` — it has no standalone
-	* identity and is not independently taggable. There is no `aws:cdk:path`
-	* tag to look up by; only the queue itself is taggable.
-	*
-	* Users adopting an existing queue policy should pass
-	* `--resource <logicalId>=<queueUrl>` (matching the physical id format
-	* returned by `create()`, which uses the first queue URL).
+	* The operational identifier for a `QueuePolicy` is the **queue URL**
+	* (`https://sqs.<region>.amazonaws.com/<account>/<name>`) — every AWS
+	* SDK call (`SetQueueAttributes` / `GetQueueAttributes`) takes a queue
+	* URL via the `QueueUrl` parameter, and cdkd's `create()` records the
+	* first `Queues` entry as the resource's `physicalId` so subsequent
+	* `update()` / `delete()` / `readCurrentState()` calls hit the right
+	* queue. A `QueuePolicy` has no standalone identity, no taggable ARN,
+	* and no `aws:cdk:path` lookup — only the parent queue is taggable.
+	*
+	* Resolution order (closes [#351](https://github.com/go-to-k/cdkd/issues/351)):
+	*
+	* 1. **`knownPhysicalId` if it is a valid queue URL.** Preserves the
+	*    `cdkd import --resource <logicalId>=<queueUrl>` path that has
+	*    always worked.
+	* 2. **First entry of `properties.Queues` if it is a literal queue URL.**
+	*    Closes the `--migrate-from-cloudformation` case: AWS CloudFormation's
+	*    `DescribeStackResources` returns the CFn-generated policy NAME for
+	*    `AWS::SQS::QueuePolicy` (e.g. `MyStack-MyQueuePolicy-XXXXXXXXXX`),
+	*    which is NOT a valid `QueueUrl` and crashes the AWS SDK
+	*    `queueUrlMiddleware` with `TypeError: Invalid URL` the first time
+	*    cdkd touches it (typically `captureObservedForImportedResources` →
+	*    `readCurrentState` → `GetQueueAttributes`). The user can also
+	*    point `--migrate-from-cloudformation` at a stack whose QueuePolicy
+	*    is templated as `Queues: ['https://sqs...']` (rare but valid) —
+	*    that literal form falls into this branch.
+	* 3. **Hard error** when neither path resolves a queue URL. This
+	*    covers (a) `--migrate-from-cloudformation` against a CFn stack
+	*    whose template carries `Queues: [{Ref: <MyQueue>}]` (the typical
+	*    CDK shape) when the referenced queue is NOT in the importable
+	*    set (or hasn't been imported yet in the current run), and (b)
+	*    explicit `--resource <logicalId>=<non-url>` typos. Pointing the
+	*    user at `--resource <logicalId>=<queueUrl>` is the recovery path
+	*    that always works.
+	*
+	* Intrinsic-valued `Queues[0]` (e.g. `{Ref: <MyQueue>}`) falls into
+	* branch 3 here even when the referenced sibling has been imported in
+	* the same run — `import()` is called BEFORE
+	* `resolveImportedProperties` runs the synth template's Properties
+	* through the intrinsic resolver, so the raw intrinsic object is what
+	* we see. The recovery message names `--resource` as the explicit
+	* escape hatch.
 	*/
 	async import(input) {
-		if (input.knownPhysicalId) return {
+		if (input.knownPhysicalId && isSqsQueueUrl(input.knownPhysicalId)) return {
 			physicalId: input.knownPhysicalId,
 			attributes: {}
 		};
-		return null;
+		const queues = input.properties["Queues"];
+		if (Array.isArray(queues) && queues.length > 0) {
+			const first = queues[0];
+			if (typeof first === "string" && isSqsQueueUrl(first)) return {
+				physicalId: first,
+				attributes: {}
+			};
+		}
+		const knownNote = input.knownPhysicalId ? ` Got knownPhysicalId='${input.knownPhysicalId}' (not a queue URL; CloudFormation returns the policy resource NAME for AWS::SQS::QueuePolicy, which is not the operational identifier).` : "";
+		const queuesNote = Array.isArray(queues) && queues.length > 0 ? ` Properties.Queues[0]=${JSON.stringify(queues[0])} did not resolve to a literal queue URL (intrinsic-valued entries like {Ref: <Queue>} are not resolved at import time).` : " Properties.Queues is missing or empty.";
+		throw new Error(`Cannot determine queue URL for ${input.resourceType} '${input.logicalId}'.${knownNote}${queuesNote} Re-run with --resource ${input.logicalId}=<queueUrl> (e.g. https://sqs.${input.region}.amazonaws.com/<account>/<queue-name>) to point cdkd at the queue this policy is attached to.`);
 	}
 };
+/**
+* Recognize an SQS queue URL. AWS standard form is
+* `https://sqs.<region>.amazonaws.com/<account>/<name>`; FIFO queues end
+* in `.fifo`. Non-standard partitions (`amazonaws.com.cn` /
+* `c2s.ic.gov` / etc.) are accepted via the broader prefix check.
+*/
+function isSqsQueueUrl(value) {
+	return value.startsWith("https://sqs.") && value.includes("/");
+}
 
 //#endregion
 //#region src/provisioning/providers/sns-topic-provider.ts
@@ -42243,7 +42295,7 @@ function reorderArgs(argv) {
 */
 async function main() {
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.98.0");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.98.1");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());