@biffo/cli 0.148.1 → 0.149.0

package/dist/index.js

@@ -350,10 +350,11 @@ var coreDiffCommand = new Command("diff").description(
 ).option("--cwd <path>", "Instance repo root to inspect (defaults to the current directory)").option(
   "--template <path>",
   "Path to a biffo-template checkout to compare against (defaults to the template this CLI ships with)"
-).action(async (options) => {
+).option("--json", "Emit the classification as JSON on stdout instead of the human report").action(async (options) => {
   const cwd = options.cwd ? resolve(options.cwd) : process.cwd();
   const runOptions = { cwd };
   if (options.template) runOptions.templateRoot = resolve(options.template);
+  if (options.json) runOptions.json = true;
   try {
     await runCoreDiff(runOptions);
   } catch (err) {
@@ -368,6 +369,20 @@ async function runCoreDiff(options) {
   const instanceVersion = readInstanceCoreVersion(options.cwd);
   const diff = computeCoreDiff(templateRoot, options.cwd, manifest);
   const total = diff.added.length + diff.removed.length + diff.modified.length;
+  if (options.json) {
+    const payload = {
+      schemaVersion: 1,
+      instanceCore: instanceVersion ?? null,
+      templateCore: templateVersion,
+      modified: diff.modified,
+      added: diff.added,
+      removed: diff.removed,
+      instanceOnly: diff.instanceOnly,
+      unchanged: diff.unchanged
+    };
+    console.log(JSON.stringify(payload, null, 2));
+    return;
+  }
   console.log(chalk2.bold("\n  Biffo core diff\n"));
   console.log(`  instance core:  ${instanceVersion ?? chalk2.dim("(unrecorded)")}`);
   console.log(`  template core:  ${templateVersion}
@@ -2028,6 +2043,13 @@ function standardArguments(pluginName, handler) {
     ["event_bus_name", "module.events.event_bus_name"],
     ["core_api_url", "module.api_gateway.api_endpoint"],
     ["core_api_execution_arn", "module.api_gateway.execution_arn"],
+    // ADR-0021: a user-facing plugin has no Lambda of its own — its module
+    // provisions a frontend S3 origin and REQUIRES the parent distribution's
+    // ARN, with no default. Without this the generated block cannot plan at
+    // all ("No value for required variable"), which is what made #685 break
+    // `terraform plan` for a whole environment. Filtered by declaration below,
+    // so a Lambda-backed legacy module that does not declare it is unaffected.
+    ["cdn_distribution_arn", "module.cdn.distribution_arn"],
     ["tags", "local.tags"]
   ];
 }
@@ -2113,13 +2135,43 @@ function declaredVariables(moduleDir) {
   }
   return names;
 }
+function declaredOutputs(moduleDir) {
+  const names = /* @__PURE__ */ new Set();
+  let entries;
+  try {
+    entries = readdirSync3(moduleDir, { withFileTypes: true });
+  } catch {
+    return names;
+  }
+  for (const entry of entries) {
+    if (!entry.isFile() || !entry.name.endsWith(".tf")) continue;
+    let contents;
+    try {
+      contents = readFileSync7(join10(moduleDir, entry.name), "utf8");
+    } catch {
+      continue;
+    }
+    for (const match of contents.matchAll(/^\s*output\s+"([^"]+)"/gm)) {
+      names.add(match[1]);
+    }
+  }
+  return names;
+}
 function renderArguments(args, indent) {
   const width = Math.max(...args.map(([key]) => key.length));
   return args.map(([key, value]) => `${indent}${key.padEnd(width)} = ${value}`).join("\n");
 }
-function renderModuleBlock(pluginName, declared, handler, source) {
+function renderModuleBlock(pluginName, declared, handler, source, outputs) {
   const args = standardArguments(pluginName, handler).filter(([key]) => declared.has(key));
   const quoted = JSON.stringify(pluginName);
+  const exported = [...outputs].sort().map(
+    (name) => [
+      `output "plugin_${pluginName}_${name}" {`,
+      `  description = "${name} of the ${pluginName} plugin, or null when it is not in enabled_plugins."`,
+      `  value       = try(module.plugin_${pluginName}[${quoted}].${name}, null)`,
+      "}"
+    ].join("\n")
+  );
   const lines = [
     `module "plugin_${pluginName}" {`,
     `  source   = "${source}"`,
@@ -2127,11 +2179,7 @@ function renderModuleBlock(pluginName, declared, handler, source) {
     "",
     renderArguments(args, "  "),
     "}",
-    "",
-    `output "plugin_${pluginName}_function_arn" {`,
-    `  description = "Lambda ARN of the ${pluginName} plugin, or null when it is not in enabled_plugins."`,
-    `  value       = try(module.plugin_${pluginName}[${quoted}].function_arn, null)`,
-    "}"
+    ...exported.length > 0 ? ["", exported.join("\n\n")] : []
   ];
   return lines.join("\n");
 }
@@ -2163,7 +2211,8 @@ function renderGeneratedTerraform(plugins) {
       p.name,
       p.declaredVariables,
       p.handler ?? DEFAULT_PLUGIN_HANDLER,
-      p.source ?? THIRD_PARTY_TERRAFORM(p.name)
+      p.source ?? THIRD_PARTY_TERRAFORM(p.name),
+      p.declaredOutputs ?? /* @__PURE__ */ new Set()
     )
   );
   return `${GENERATED_HEADER}
@@ -2184,6 +2233,7 @@ function syncPluginTerraform(cwd) {
     return {
       name,
       declaredVariables: declaredVariables(moduleDir),
+      declaredOutputs: declaredOutputs(moduleDir),
       source: pluginModuleSource(cwd, name)
     };
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.148.1",
+  "version": "0.149.0",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",