@go-to-k/cdkd 0.85.0 → 0.86.0

package/dist/cli.js

@@ -79317,6 +79317,38 @@ var PRIMARY_IDENTIFIER_FALLBACK = {
   "AWS::Cognito::UserPool": "UserPoolId",
   "AWS::ECR::Repository": "RepositoryName"
 };
+var COMPOSITE_ID_SPLITTERS = {
+  // cdkd stores `restApiId|resourceId|httpMethod` (apigateway-provider.ts);
+  // CFn primary identifier is [RestApiId, ResourceId, HttpMethod] — same order.
+  "AWS::ApiGateway::Method": (id) => {
+    const parts = id.split("|");
+    if (parts.length !== 3) {
+      throw new Error(
+        `expected 3 parts (restApiId|resourceId|httpMethod), got ${parts.length}: '${id}'`
+      );
+    }
+    return { RestApiId: parts[0], ResourceId: parts[1], HttpMethod: parts[2] };
+  },
+  // cdkd stores `restApiId|resourceId` (apigateway-provider.ts);
+  // CFn primary identifier is [RestApiId, ResourceId].
+  "AWS::ApiGateway::Resource": (id) => {
+    const parts = id.split("|");
+    if (parts.length !== 2) {
+      throw new Error(`expected 2 parts (restApiId|resourceId), got ${parts.length}: '${id}'`);
+    }
+    return { RestApiId: parts[0], ResourceId: parts[1] };
+  },
+  // cdkd stores `IGW|VpcId` (ec2-provider.ts);
+  // CFn primary identifier is [VpcId, InternetGatewayId] — DIFFERENT order
+  // from cdkd. Splitter reorders explicitly.
+  "AWS::EC2::VPCGatewayAttachment": (id) => {
+    const parts = id.split("|");
+    if (parts.length !== 2) {
+      throw new Error(`expected 2 parts (IGW|VpcId), got ${parts.length}: '${id}'`);
+    }
+    return { VpcId: parts[1], InternetGatewayId: parts[0] };
+  }
+};
 async function exportCommand(stackArg, options) {
   const logger = getLogger();
   if (options.verbose) {
@@ -79587,14 +79619,19 @@ async function buildImportPlan(state, template, cfnClient) {
       });
       continue;
     }
-    let identifierKey;
+    let resourceIdentifier;
     try {
-      identifierKey = await resolvePrimaryIdentifier(resourceType, cfnClient, identifierCache);
+      resourceIdentifier = await resolveResourceIdentifier(
+        resourceType,
+        stateEntry.physicalId,
+        cfnClient,
+        identifierCache
+      );
     } catch (err) {
       skipped.push({
         logicalId,
         resourceType,
-        reason: "could not resolve primary identifier: " + (err instanceof Error ? err.message : String(err))
+        reason: "could not resolve resource identifier: " + (err instanceof Error ? err.message : String(err))
       });
       continue;
     }
@@ -79602,15 +79639,44 @@ async function buildImportPlan(state, template, cfnClient) {
       logicalId,
       resourceType,
       physicalId: stateEntry.physicalId,
-      identifierKey
+      resourceIdentifier
     });
   }
   return { plan, skipped };
 }
-async function resolvePrimaryIdentifier(resourceType, cfnClient, cache2) {
-  const cached = cache2.get(resourceType);
-  if (cached !== void 0)
-    return cached;
+async function resolveResourceIdentifier(resourceType, physicalId, cfnClient, cache2) {
+  let entry = cache2.get(resourceType);
+  if (entry === void 0) {
+    entry = await fetchPrimaryIdentifier(resourceType, cfnClient);
+    cache2.set(resourceType, entry);
+  }
+  if (entry.fields.length === 1) {
+    return { [entry.fields[0]]: physicalId };
+  }
+  const splitter = COMPOSITE_ID_SPLITTERS[resourceType];
+  if (!splitter) {
+    throw new Error(
+      `resource type uses a composite primary identifier (${entry.fields.length} fields: ${entry.fields.join(", ")}); add an entry to COMPOSITE_ID_SPLITTERS in src/cli/commands/export.ts that parses cdkd's physicalId for this type, or destroy the resource first and let CFn create it fresh`
+    );
+  }
+  let split;
+  try {
+    split = splitter(physicalId);
+  } catch (err) {
+    throw new Error(
+      `composite-id splitter for ${resourceType} failed: ` + (err instanceof Error ? err.message : String(err))
+    );
+  }
+  for (const f of entry.fields) {
+    if (!(f in split)) {
+      throw new Error(
+        `composite-id splitter for ${resourceType} did not produce field '${f}' (produced: ${Object.keys(split).join(", ")})`
+      );
+    }
+  }
+  return split;
+}
+async function fetchPrimaryIdentifier(resourceType, cfnClient) {
   try {
     const resp = await cfnClient.send(
       new DescribeTypeCommand({ Type: "RESOURCE", TypeName: resourceType })
@@ -79618,15 +79684,9 @@ async function resolvePrimaryIdentifier(resourceType, cfnClient, cache2) {
     if (resp.Schema) {
       const parsed = JSON.parse(resp.Schema);
       const primary = parsed.primaryIdentifier;
-      if (Array.isArray(primary) && primary.length === 1 && typeof primary[0] === "string") {
-        const propName = primary[0].replace(/^\/properties\//, "");
-        cache2.set(resourceType, propName);
-        return propName;
-      }
-      if (Array.isArray(primary) && primary.length > 1) {
-        throw new Error(
-          `resource type uses a composite primary identifier (${primary.length} fields); cdkd does not yet support composite identifiers for cdkd export`
-        );
+      if (Array.isArray(primary) && primary.length > 0 && primary.every((p) => typeof p === "string")) {
+        const fields = primary.map((p) => p.replace(/^\/properties\//, ""));
+        return { fields };
       }
     }
   } catch (err) {
@@ -79635,8 +79695,7 @@ async function resolvePrimaryIdentifier(resourceType, cfnClient, cache2) {
   }
   const fallback = PRIMARY_IDENTIFIER_FALLBACK[resourceType];
   if (fallback) {
-    cache2.set(resourceType, fallback);
-    return fallback;
+    return { fields: [fallback] };
   }
   throw new Error(
     `primary identifier unknown (DescribeType returned no usable schema and no fallback is registered). Add ${resourceType} to PRIMARY_IDENTIFIER_FALLBACK in export.ts, or open an issue.`
@@ -79696,9 +79755,8 @@ function printPlan(plan, cfnStackName) {
   logger.info("");
   logger.info(`Import plan for CloudFormation stack '${cfnStackName}':`);
   for (const entry of plan) {
-    logger.info(
-      `  ${entry.logicalId} (${entry.resourceType}) \u2190 ${entry.identifierKey}=${entry.physicalId}`
-    );
+    const idStr = Object.entries(entry.resourceIdentifier).map(([k, v]) => `${k}=${v}`).join(", ");
+    logger.info(`  ${entry.logicalId} (${entry.resourceType}) \u2190 ${idStr}`);
   }
   logger.info("");
 }
@@ -79709,7 +79767,7 @@ async function executeImportChangeSet(cfnClient, stackName, template, plan) {
   const resourcesToImport = plan.map((entry) => ({
     ResourceType: entry.resourceType,
     LogicalResourceId: entry.logicalId,
-    ResourceIdentifier: { [entry.identifierKey]: entry.physicalId }
+    ResourceIdentifier: entry.resourceIdentifier
   }));
   logger.info(
     `Creating IMPORT changeset '${changeSetName}' for stack '${stackName}' (${plan.length} resource(s), ${templateBody.length} bytes)...`
@@ -79880,7 +79938,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command18();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.85.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.86.0");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());