@go-to-k/cdkd 0.87.0 → 0.89.0

package/dist/cli.js

@@ -79381,6 +79381,7 @@ async function exportCommand(stackArg, options) {
     let template;
     let resolvedStackName;
     let synthedRegion;
+    let allSynthStacks = [];
     if (options.template) {
       if (!stackArg) {
         throw new Error(
@@ -79424,6 +79425,10 @@ async function exportCommand(stackArg, options) {
       template = stackInfo.template;
       resolvedStackName = stackInfo.stackName;
       synthedRegion = stackInfo.region;
+      allSynthStacks = result.stacks.map((s) => ({
+        stackName: s.stackName,
+        template: s.template
+      }));
     }
     const cfnStackName = options.cfnStackName ?? resolvedStackName;
     const targetRegion = await pickStackRegion2(
@@ -79512,19 +79517,55 @@ async function exportCommand(stackArg, options) {
           return;
         }
       }
+      reportDriftBaselineGaps(state, logger);
+      if (allSynthStacks.length > 0) {
+        const crossRefs = scanCrossStackReferences(allSynthStacks, resolvedStackName);
+        if (crossRefs.length > 0) {
+          const lines = crossRefs.map(
+            (r) => `  ${r.consumerStackName} \u2192 ${resolvedStackName}.${r.outputName} at ${r.location}`
+          );
+          if (options.strictCrossStack) {
+            throw new Error(
+              `Refusing to export: ${crossRefs.length} cross-stack reference(s) to ${resolvedStackName} found in sibling stacks. After migration, those references will break (cdkd's Fn::GetStackOutput reads cdkd state; the migrated stack's outputs live in CFn). Migrate consumers first, or remove the references, or drop --strict-cross-stack to proceed with a warning:
+` + lines.join("\n")
+            );
+          }
+          logger.warn(
+            `${crossRefs.length} cross-stack reference(s) to '${resolvedStackName}' from sibling stacks. These will break the next time those stacks deploy via cdkd (cdkd's Fn::GetStackOutput resolver reads cdkd state; the migrated stack's outputs are now in CFn). Plan multi-stack migrations from the leaves up.`
+          );
+          for (const line of lines)
+            logger.warn(line);
+        }
+      }
+      const userParameters = parseParameterOverrides(options.parameter);
+      const { parameters: cfnParameters, missing } = resolveTemplateParameters(
+        template,
+        userParameters
+      );
+      if (missing.length > 0) {
+        throw new Error(
+          `Template requires parameter(s) without defaults: ${missing.join(", ")}. Pass each one as --parameter Key=Value (or set a Default in the CDK code).`
+        );
+      }
       const phase1Template = filterTemplateForImport(template, phase1Imports);
       await executeImportChangeSet(
         awsClients.cloudFormation,
         cfnStackName,
         phase1Template,
-        phase1Imports
+        phase1Imports,
+        cfnParameters
       );
       logger.info(
         `\u2713 Phase 1: CloudFormation stack '${cfnStackName}' created via IMPORT. ${phase1Imports.length} resource(s) imported.`
       );
       if (phase2Creates.length > 0) {
         try {
-          await executeUpdateChangeSet(awsClients.cloudFormation, cfnStackName, template);
+          await executeUpdateChangeSet(
+            awsClients.cloudFormation,
+            cfnStackName,
+            template,
+            cfnParameters
+          );
           logger.info(`\u2713 Phase 2: ${phase2Creates.length} non-importable resource(s) CREATEd.`);
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
@@ -79762,6 +79803,64 @@ async function fetchPrimaryIdentifier(resourceType, cfnClient) {
     `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.`
   );
 }
+function parseParameterOverrides(tokens) {
+  const map = {};
+  if (!tokens)
+    return map;
+  for (const t of tokens) {
+    const eq = t.indexOf("=");
+    if (eq < 1) {
+      throw new Error(
+        `Invalid --parameter '${t}': expected 'Key=Value' (e.g. --parameter Env=prod)`
+      );
+    }
+    const key = t.slice(0, eq).trim();
+    const value = t.slice(eq + 1);
+    if (!key) {
+      throw new Error(`Invalid --parameter '${t}': key is empty`);
+    }
+    map[key] = value;
+  }
+  return map;
+}
+function resolveTemplateParameters(template, userOverrides) {
+  const tplParams = template["Parameters"];
+  if (!tplParams || typeof tplParams !== "object" || Array.isArray(tplParams)) {
+    const stray = Object.keys(userOverrides);
+    if (stray.length > 0) {
+      throw new Error(
+        `--parameter override(s) supplied (${stray.join(", ")}) but template has no Parameters section.`
+      );
+    }
+    return { parameters: [], missing: [] };
+  }
+  const parameters = [];
+  const missing = [];
+  const known = /* @__PURE__ */ new Set();
+  for (const [name, raw] of Object.entries(tplParams)) {
+    known.add(name);
+    const def = raw ?? {};
+    const override = userOverrides[name];
+    if (override !== void 0) {
+      parameters.push({ ParameterKey: name, ParameterValue: override });
+      continue;
+    }
+    if ("Default" in def) {
+      const value = typeof def.Default === "string" ? def.Default : String(def.Default);
+      parameters.push({ ParameterKey: name, ParameterValue: value });
+      continue;
+    }
+    missing.push(name);
+  }
+  for (const name of Object.keys(userOverrides)) {
+    if (!known.has(name)) {
+      throw new Error(
+        `--parameter override '${name}' does not match any parameter in the synthesized template (template declares: ${[...known].join(", ") || "(none)"})`
+      );
+    }
+  }
+  return { parameters, missing };
+}
 function filterTemplateForImport(template, plan) {
   const allow = new Set(plan.map((p) => p.logicalId));
   const original = template["Resources"];
@@ -79788,6 +79887,76 @@ function filterTemplateForImport(template, plan) {
   }
   return result;
 }
+function reportDriftBaselineGaps(state, logger) {
+  const entries = Object.entries(state.resources ?? {});
+  if (entries.length === 0)
+    return;
+  const missing = entries.filter(([, r]) => r.observedProperties === void 0);
+  if (missing.length === 0)
+    return;
+  if (state.version !== void 0 && state.version < 3) {
+    logger.warn(
+      `cdkd state schema is v${state.version} (pre-observedProperties). cdkd drift cannot reliably compare against AWS for this stack; the next \`cdk deploy\` after migration may surface spurious changes if AWS has drifted from the template. Run \`cdkd state refresh-observed ${state.stackName}\` (or any redeploy) before export to capture an AWS-current baseline.`
+    );
+    return;
+  }
+  logger.warn(
+    `${missing.length} of ${entries.length} resource(s) in cdkd state lack an AWS-current baseline (observedProperties). cdkd drift may produce false positives for them; the next \`cdk deploy\` after migration may surface unexpected changes. Run \`cdkd state refresh-observed ${state.stackName}\` to capture a baseline before export, then \`cdkd drift\` to verify the stack matches AWS.`
+  );
+  for (const [logicalId] of missing.slice(0, 10)) {
+    logger.warn(`  ${logicalId}`);
+  }
+  if (missing.length > 10) {
+    logger.warn(`  ... and ${missing.length - 10} more`);
+  }
+}
+function scanCrossStackReferences(stacks, exportingStackName) {
+  const refs = [];
+  for (const stack of stacks) {
+    if (stack.stackName === exportingStackName)
+      continue;
+    walkForGetStackOutput(stack.template, "", (ref) => {
+      if (ref.stackName === exportingStackName) {
+        refs.push({
+          consumerStackName: stack.stackName,
+          outputName: ref.outputName,
+          location: ref.location
+        });
+      }
+    });
+  }
+  return refs;
+}
+function walkForGetStackOutput(node, path3, emit) {
+  if (!node || typeof node !== "object")
+    return;
+  if (Array.isArray(node)) {
+    node.forEach((item, i) => walkForGetStackOutput(item, `${path3}[${i}]`, emit));
+    return;
+  }
+  const obj = node;
+  const intrinsic = obj["Fn::GetStackOutput"];
+  if (intrinsic !== void 0) {
+    if (intrinsic && typeof intrinsic === "object" && !Array.isArray(intrinsic)) {
+      const i = intrinsic;
+      const stackName = typeof i["StackName"] === "string" ? i["StackName"] : void 0;
+      const outputName = typeof i["OutputName"] === "string" ? i["OutputName"] : void 0;
+      if (stackName && outputName) {
+        emit({ stackName, outputName, location: path3 });
+      }
+    } else if (Array.isArray(intrinsic) && intrinsic.length === 2) {
+      const arr = intrinsic;
+      const stackName = arr[0];
+      const outputName = arr[1];
+      if (typeof stackName === "string" && typeof outputName === "string") {
+        emit({ stackName, outputName, location: path3 });
+      }
+    }
+  }
+  for (const [key, value] of Object.entries(obj)) {
+    walkForGetStackOutput(value, path3 ? `${path3}.${key}` : key, emit);
+  }
+}
 function referencesOnly(node, allow) {
   if (!node || typeof node !== "object")
     return true;
@@ -79821,7 +79990,7 @@ function printPlan(plan, cfnStackName) {
   }
   logger.info("");
 }
-async function executeImportChangeSet(cfnClient, stackName, template, plan) {
+async function executeImportChangeSet(cfnClient, stackName, template, plan, parameters) {
   const logger = getLogger();
   const changeSetName = `cdkd-migrate-${Date.now()}`;
   const templateBody = JSON.stringify(template, null, 2);
@@ -79846,6 +80015,7 @@ async function executeImportChangeSet(cfnClient, stackName, template, plan) {
         ChangeSetType: "IMPORT",
         TemplateBody: templateBody,
         ResourcesToImport: resourcesToImport,
+        ...parameters.length > 0 && { Parameters: parameters },
         // CDK templates routinely require CAPABILITY_IAM /
         // CAPABILITY_NAMED_IAM. Forward both so the user does not have to
         // re-discover and re-pass them.
@@ -79892,7 +80062,7 @@ async function executeImportChangeSet(cfnClient, stackName, template, plan) {
     throw err;
   }
 }
-async function executeUpdateChangeSet(cfnClient, stackName, template) {
+async function executeUpdateChangeSet(cfnClient, stackName, template, parameters) {
   const logger = getLogger();
   const changeSetName = `cdkd-phase2-${Date.now()}`;
   const templateBody = JSON.stringify(template, null, 2);
@@ -79911,6 +80081,7 @@ async function executeUpdateChangeSet(cfnClient, stackName, template) {
         ChangeSetName: changeSetName,
         ChangeSetType: "UPDATE",
         TemplateBody: templateBody,
+        ...parameters.length > 0 && { Parameters: parameters },
         Capabilities: ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
       })
     );
@@ -80027,6 +80198,13 @@ function createExportCommand() {
     "--include-non-importable",
     "Run a 2-phase migration when the stack contains non-importable resources (Custom::*). Phase 1 imports the importable resources; phase 2 CFn-CREATEs the non-importable ones, which re-invokes each Custom Resource's onCreate handler. Make sure onCreate is idempotent before enabling.",
     false
+  ).option(
+    "--parameter <key=value...>",
+    "CFn template Parameter override, repeatable. Required when the synthesized template has Parameters without Default values; otherwise overrides the template's default value. Format: --parameter Key=Value."
+  ).option(
+    "--strict-cross-stack",
+    "Refuse to export when sibling cdkd stacks in the same CDK app reference the exporting stack via Fn::GetStackOutput. Without the flag, cdkd warns but proceeds \u2014 the user is expected to migrate the consumer stacks in a follow-up.",
+    false
   ).action(withErrorHandling(exportCommand));
   [...commonOptions, ...appOptions, ...stateOptions, ...contextOptions].forEach(
     (opt) => cmd.addOption(opt)
@@ -80065,7 +80243,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.87.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.89.0");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());