@go-to-k/cdkd 0.94.0 → 0.94.1

package/dist/cli.js

@@ -80029,7 +80029,8 @@ var PRIMARY_IDENTIFIER_FALLBACK = {
 };
 var COMPOSITE_ID_SPLITTERS = {
   // cdkd stores `restApiId|resourceId|httpMethod` (apigateway-provider.ts);
-  // CFn primary identifier is [RestApiId, ResourceId, HttpMethod] — same order.
+  // CFn primary identifier is [RestApiId, ResourceId, HttpMethod] — same
+  // order, and all three are writable Properties of AWS::ApiGateway::Method.
   "AWS::ApiGateway::Method": (id) => {
     const parts = id.split("|");
     if (parts.length !== 3) {
@@ -80037,28 +80038,98 @@ var COMPOSITE_ID_SPLITTERS = {
         `expected 3 parts (restApiId|resourceId|httpMethod), got ${parts.length}: '${id}'`
       );
     }
-    return { RestApiId: parts[0], ResourceId: parts[1], HttpMethod: parts[2] };
+    const map = { RestApiId: parts[0], ResourceId: parts[1], HttpMethod: parts[2] };
+    return { resourceIdentifier: map };
   },
   // cdkd stores `restApiId|resourceId` (apigateway-provider.ts);
-  // CFn primary identifier is [RestApiId, ResourceId].
+  // CFn primary identifier is [RestApiId, ResourceId] — both are writable
+  // Properties of AWS::ApiGateway::Resource.
   "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] };
+    const map = { RestApiId: parts[0], ResourceId: parts[1] };
+    return { resourceIdentifier: map };
   },
   // cdkd stores `IGW|VpcId` (ec2-provider.ts);
   // CFn primary identifier is [VpcId, InternetGatewayId] — DIFFERENT order
-  // from cdkd. Splitter reorders explicitly.
+  // from cdkd. Splitter reorders explicitly. Both are writable Properties.
   "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] };
+    const map = { VpcId: parts[1], InternetGatewayId: parts[0] };
+    return { resourceIdentifier: map };
+  },
+  // cdkd stores just `IntegrationId` (apigatewayv2-provider.ts); the parent
+  // `ApiId` lives in cdkd state's properties (`properties.ApiId`). CFn primary
+  // identifier is [ApiId, IntegrationId]. ApiId IS a writable Property
+  // (already in synth template via Ref); IntegrationId is tagged
+  // `readOnlyProperties: ['/properties/IntegrationId']` in the CFn schema —
+  // exclude it from propertiesOverlay so CFn doesn't reject writing a
+  // read-only property at changeset-create.
+  "AWS::ApiGatewayV2::Integration": (physicalId, properties) => {
+    const apiId = readStringProperty(properties, "ApiId", "AWS::ApiGatewayV2::Integration");
+    return {
+      resourceIdentifier: { ApiId: apiId, IntegrationId: physicalId },
+      propertiesOverlay: { ApiId: apiId }
+    };
+  },
+  // cdkd stores just `RouteId` (apigatewayv2-provider.ts); parent `ApiId`
+  // comes from properties. CFn primary identifier is [ApiId, RouteId]. Same
+  // overlay narrowing as Integration above.
+  "AWS::ApiGatewayV2::Route": (physicalId, properties) => {
+    const apiId = readStringProperty(properties, "ApiId", "AWS::ApiGatewayV2::Route");
+    return {
+      resourceIdentifier: { ApiId: apiId, RouteId: physicalId },
+      propertiesOverlay: { ApiId: apiId }
+    };
+  },
+  // NOTE: `AWS::ApiGatewayV2::Stage` is intentionally NOT in this map.
+  // (1) AWS reports its primaryIdentifier as `['/properties/Id']` (single-key),
+  //     so cdkd's single-key resolution path handles it without a splitter.
+  // (2) But AWS CloudFormation does NOT support `AWS::ApiGatewayV2::Stage` in
+  //     IMPORT changesets (CreateChangeSet rejects with "ResourceTypes
+  //     [AWS::ApiGatewayV2::Stage] are not supported for Import"). This means
+  //     `cdkd export` cannot complete on any stack that includes an HttpApi
+  //     (CDK auto-creates a `$default` Stage). Tracked in a follow-up issue
+  //     (link in PR description); the workaround design is open
+  //     (pre-delete + phase-2-CREATE vs hard-block-with-clear-error).
+  // cdkd stores `StatementId` (lambda-permission-provider.ts:124); for state
+  // entries written by the older CC-API path (pre-SDK-provider), physicalId
+  // may instead be the legacy `<functionArn>|<statementId>` shape — the
+  // provider's own delete / update / getAttribute paths normalize via
+  // `physicalId.split('|').pop()` (see lambda-permission-provider.ts:160 /
+  // 222 / 290). Mirror that here so legacy state still produces the
+  // correct CFn Id field; otherwise CFn IMPORT's identifier-match would
+  // compare `Id: '<arn>|<sid>'` against the AWS-current Sid and reject.
+  //
+  // CFn primary identifier is [FunctionName, Id] (note: CFn schema calls
+  // the field `Id`, not `StatementId`). FunctionName IS a writable
+  // Property; `Id` is tagged `readOnlyProperties: ['/properties/Id']` in
+  // the CFn schema (it's set at create time by AWS, not by the user).
+  // Narrow overlay to FunctionName so CFn doesn't reject writing read-only
+  // `Id` at changeset-create.
+  "AWS::Lambda::Permission": (physicalId, properties) => {
+    const functionName = readStringProperty(properties, "FunctionName", "AWS::Lambda::Permission");
+    const statementId = physicalId.includes("|") ? physicalId.split("|").pop() : physicalId;
+    return {
+      resourceIdentifier: { FunctionName: functionName, Id: statementId },
+      propertiesOverlay: { FunctionName: functionName }
+    };
   }
 };
+function readStringProperty(properties, key, resourceType) {
+  const v = properties[key];
+  if (typeof v !== "string" || !v) {
+    throw new Error(
+      `cdkd state's properties for ${resourceType} is missing '${key}' (the parent identifier required to build the CFn ResourceIdentifier map). State entry may be corrupt or written by an older cdkd binary; re-deploy the resource to refresh state.`
+    );
+  }
+  return v;
+}
 async function exportCommand(stackArg, options) {
   const logger = getLogger();
   if (options.verbose) {
@@ -80436,11 +80507,12 @@ async function buildImportPlan(state, template, cfnClient) {
       });
       continue;
     }
-    let resourceIdentifier;
+    let resolved;
     try {
-      resourceIdentifier = await resolveResourceIdentifier(
+      resolved = await resolveResourceIdentifier(
         resourceType,
         stateEntry.physicalId,
+        stateEntry.properties ?? {},
         cfnClient,
         identifierCache
       );
@@ -80456,19 +80528,21 @@ async function buildImportPlan(state, template, cfnClient) {
       logicalId,
       resourceType,
       physicalId: stateEntry.physicalId,
-      resourceIdentifier
+      resourceIdentifier: resolved.resourceIdentifier,
+      propertiesOverlay: resolved.propertiesOverlay ?? resolved.resourceIdentifier
     });
   }
   return { phase1Imports, phase2Creates, blocked };
 }
-async function resolveResourceIdentifier(resourceType, physicalId, cfnClient, cache2) {
+async function resolveResourceIdentifier(resourceType, physicalId, properties, 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 map = { [entry.fields[0]]: physicalId };
+    return { resourceIdentifier: map };
   }
   const splitter = COMPOSITE_ID_SPLITTERS[resourceType];
   if (!splitter) {
@@ -80476,22 +80550,22 @@ async function resolveResourceIdentifier(resourceType, physicalId, cfnClient, ca
       `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;
+  let result;
   try {
-    split = splitter(physicalId);
+    result = splitter(physicalId, properties);
   } 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)) {
+    if (!(f in result.resourceIdentifier)) {
       throw new Error(
-        `composite-id splitter for ${resourceType} did not produce field '${f}' (produced: ${Object.keys(split).join(", ")})`
+        `composite-id splitter for ${resourceType} did not produce field '${f}' (produced: ${Object.keys(result.resourceIdentifier).join(", ")})`
       );
     }
   }
-  return split;
+  return result;
 }
 async function fetchPrimaryIdentifier(resourceType, cfnClient) {
   try {
@@ -80614,7 +80688,8 @@ function overlayResourceIdentifierOnProperties(resource, entry) {
   const r = resource;
   const existingProperties = r["Properties"];
   const properties = existingProperties && typeof existingProperties === "object" && !Array.isArray(existingProperties) ? { ...existingProperties } : {};
-  for (const [field, value] of Object.entries(entry.resourceIdentifier)) {
+  const overlay = entry.propertiesOverlay ?? entry.resourceIdentifier;
+  for (const [field, value] of Object.entries(overlay)) {
     properties[field] = value;
   }
   return { ...r, Properties: properties };
@@ -80982,7 +81057,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.94.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.94.1");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());