@go-to-k/cdkd 0.91.3 → 0.91.4

package/dist/cli.js

@@ -79615,6 +79615,7 @@ import { Command as Command17 } from "commander";
 import {
   CreateChangeSetCommand,
   DescribeChangeSetCommand,
+  DescribeStackEventsCommand,
   ExecuteChangeSetCommand,
   DescribeStacksCommand as DescribeStacksCommand2,
   DescribeTypeCommand,
@@ -79631,10 +79632,13 @@ var NEVER_IMPORTABLE_TYPES = /* @__PURE__ */ new Set([
 function isNeverImportableType(resourceType) {
   if (NEVER_IMPORTABLE_TYPES.has(resourceType))
     return true;
-  if (resourceType.startsWith("Custom::"))
+  if (isCustomResourceType(resourceType))
     return true;
   return false;
 }
+function isCustomResourceType(resourceType) {
+  return resourceType === "AWS::CloudFormation::CustomResource" || resourceType.startsWith("Custom::");
+}
 var PRIMARY_IDENTIFIER_FALLBACK = {
   "AWS::S3::Bucket": "BucketName",
   "AWS::IAM::Role": "RoleName",
@@ -79898,6 +79902,12 @@ async function exportCommand(stackArg, options) {
         );
       }
       const phase1Template = filterTemplateForImport(template, phase1Imports);
+      const injectedCount = injectDeletionPolicyForImport(phase1Template);
+      if (injectedCount > 0) {
+        logger.info(
+          `Injected DeletionPolicy: Retain on ${injectedCount} resource(s) without an explicit DeletionPolicy (required by CFn IMPORT). The first \`cdk deploy\` after export will reset each to your CDK-declared value.`
+        );
+      }
       await executeImportChangeSet(
         awsClients.cloudFormation,
         cfnStackName,
@@ -80029,7 +80039,7 @@ async function assertCfnStackAbsent(cfnClient, stackName) {
   }
 }
 function isPhase2CreatableType(resourceType) {
-  return resourceType.startsWith("Custom::");
+  return isCustomResourceType(resourceType);
 }
 async function buildImportPlan(state, template, cfnClient) {
   const templateResources = template["Resources"];
@@ -80211,32 +80221,49 @@ function resolveTemplateParameters(template, userOverrides) {
   }
   return { parameters, missing };
 }
+function injectDeletionPolicyForImport(template) {
+  const resources = template["Resources"];
+  if (!resources || typeof resources !== "object" || Array.isArray(resources)) {
+    return 0;
+  }
+  let injected = 0;
+  for (const [, resource] of Object.entries(resources)) {
+    if (!resource || typeof resource !== "object" || Array.isArray(resource))
+      continue;
+    const r = resource;
+    if (r["DeletionPolicy"] === void 0) {
+      r["DeletionPolicy"] = "Retain";
+      injected++;
+    }
+  }
+  return injected;
+}
 function filterTemplateForImport(template, plan) {
-  const allow = new Set(plan.map((p) => p.logicalId));
+  const allow = new Map(plan.map((p) => [p.logicalId, p]));
   const original = template["Resources"];
   const filteredResources = {};
   for (const [logicalId, resource] of Object.entries(original)) {
-    if (allow.has(logicalId)) {
-      filteredResources[logicalId] = resource;
-    }
+    const entry = allow.get(logicalId);
+    if (!entry)
+      continue;
+    filteredResources[logicalId] = overlayResourceIdentifierOnProperties(resource, entry);
   }
   const result = { ...template, Resources: filteredResources };
-  const outputs = template["Outputs"];
-  if (outputs && typeof outputs === "object" && !Array.isArray(outputs)) {
-    const filteredOutputs = {};
-    for (const [name, output] of Object.entries(outputs)) {
-      if (referencesOnly(output, allow)) {
-        filteredOutputs[name] = output;
-      }
-    }
-    if (Object.keys(filteredOutputs).length > 0) {
-      result["Outputs"] = filteredOutputs;
-    } else {
-      delete result["Outputs"];
-    }
-  }
+  delete result["Outputs"];
   return result;
 }
+function overlayResourceIdentifierOnProperties(resource, entry) {
+  if (!resource || typeof resource !== "object" || Array.isArray(resource)) {
+    return resource;
+  }
+  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)) {
+    properties[field] = value;
+  }
+  return { ...r, Properties: properties };
+}
 function reportDriftBaselineGaps(state, logger) {
   const entries = Object.entries(state.resources ?? {});
   if (entries.length === 0)
@@ -80307,29 +80334,6 @@ function walkForGetStackOutput(node, path3, emit) {
     walkForGetStackOutput(value, path3 ? `${path3}.${key}` : key, emit);
   }
 }
-function referencesOnly(node, allow) {
-  if (!node || typeof node !== "object")
-    return true;
-  if (Array.isArray(node)) {
-    return node.every((item) => referencesOnly(item, allow));
-  }
-  for (const [key, value] of Object.entries(node)) {
-    if (key === "Ref" && typeof value === "string") {
-      if (!allow.has(value))
-        return false;
-      continue;
-    }
-    if (key === "Fn::GetAtt") {
-      const target = Array.isArray(value) && typeof value[0] === "string" ? value[0] : typeof value === "string" ? value.split(".")[0] : void 0;
-      if (target && !allow.has(target))
-        return false;
-      continue;
-    }
-    if (!referencesOnly(value, allow))
-      return false;
-  }
-  return true;
-}
 function printPlan(plan, cfnStackName) {
   const logger = getLogger();
   logger.info("");
@@ -80407,11 +80411,41 @@ async function executeImportChangeSet(cfnClient, stackName, template, plan, para
       { StackName: stackName }
     );
   } catch (err) {
+    const failureSummary = await collectImportFailureSummary(cfnClient, stackName).catch(() => "");
     await cfnClient.send(new DeleteChangeSetCommand({ StackName: stackName, ChangeSetName: changeSetName })).catch(() => {
     });
+    if (failureSummary) {
+      throw new Error(`IMPORT changeset failed:
+${failureSummary}`, { cause: err });
+    }
     throw err;
   }
 }
+async function collectImportFailureSummary(cfnClient, stackName) {
+  const resp = await cfnClient.send(new DescribeStackEventsCommand({ StackName: stackName }));
+  const events = resp.StackEvents ?? [];
+  const failures = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const e of events) {
+    if (!e.ResourceStatus || !e.ResourceStatus.endsWith("FAILED"))
+      continue;
+    if (!e.LogicalResourceId)
+      continue;
+    if (seen.has(e.LogicalResourceId))
+      continue;
+    seen.add(e.LogicalResourceId);
+    failures.push({
+      logicalId: e.LogicalResourceId,
+      type: e.ResourceType ?? "<unknown>",
+      reason: e.ResourceStatusReason ?? "<no reason reported>"
+    });
+    if (failures.length >= 5)
+      break;
+  }
+  if (failures.length === 0)
+    return "";
+  return failures.map((f) => `  - ${f.logicalId} (${f.type}): ${f.reason}`).join("\n");
+}
 async function executeUpdateChangeSet(cfnClient, stackName, template, parameters) {
   const logger = getLogger();
   const changeSetName = `cdkd-phase2-${Date.now()}`;
@@ -80593,7 +80627,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.91.3");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.91.4");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());