@celilo/cli 2.2.1 → 3.0.0

package/src/services/terraform-safety.ts

@@ -178,3 +178,56 @@ function formatUnsafeOperationError(action: TerraformAction): string {
 
   return lines.join('\n');
 }
+
+/** What the deploy should do with the plan computed AFTER an auto-import. */
+export type ImportRetryVerdict =
+  | { action: 'done' }
+  | { action: 'apply' }
+  | { action: 'refuse'; error: string };
+
+/**
+ * Decide whether the apply retried after an auto-import may proceed.
+ *
+ * An import REPLACES the plan that `deployTerraform` validated before its first
+ * apply. That plan described a create; the plan computed after the import can
+ * describe a REPLACE, because `ostemplate` and `rootfs[0].storage` do not
+ * round-trip through an import and each forces one. Nothing re-validated it, so
+ * the retry applied a destroy that `validateTerraformPlanSafety` exists to
+ * forbid — and a redeploy destroyed signal's LXC on a converged fleet
+ * (celilo#1374). The gate was present; the import walked around it.
+ *
+ * Pure (Rule 10) so the refusal is testable without terraform: the caller does
+ * the I/O and hands the exit code and output here.
+ */
+export function planAfterImportVerdict(exitCode: number, planOutput: string): ImportRetryVerdict {
+  // 0 = no changes. The import alone reconciled state with reality, which is
+  // the outcome we want: adopt the resource and apply nothing.
+  if (exitCode === 0) {
+    return { action: 'done' };
+  }
+
+  // 2 = changes pending. Anything else is an error, and an unreadable plan is
+  // never a licence to apply (D7: no measurement is not "no drift").
+  if (exitCode !== 2) {
+    return {
+      action: 'refuse',
+      error: `Refusing to apply after import: terraform plan failed (exit ${exitCode}).\n${planOutput.slice(0, 500)}`,
+    };
+  }
+
+  const safety = validateTerraformPlanSafety(planOutput);
+  if (!safety.safe) {
+    return {
+      action: 'refuse',
+      error: [
+        'Refusing to apply the plan computed after importing an existing resource.',
+        'The import adopted infrastructure that already exists, and applying this',
+        'plan would destroy it rather than adopt it.',
+        '',
+        safety.error ?? 'unsafe plan',
+      ].join('\n'),
+    };
+  }
+
+  return { action: 'apply' };
+}

package/src/services/update/orchestrator.test.ts

@@ -78,6 +78,7 @@ const cleanAudit: AuditDeps = {
   moduleConfigs: { modules: [] },
   moduleIntegrity: { results: [] },
   detectWithoutConverge: { modules: [] },
+  jailExemptions: { exemptions: [] },
   health: { results: [] },
   backups: { modules: [] },
   abandonedOperations: { records: [] },
@@ -87,8 +88,9 @@ const cleanAudit: AuditDeps = {
   secretsDecryptable: { results: [] },
   servicesReachable: { results: [] },
   machinesReachable: { results: [] },
+  diskSpace: { results: [] },
   transportReads: { statuses: [], now: new Date(), staleAfterMs: 30 * 60_000 },
-  trustedSources: { firewalls: [] },
+  trustedSources: { firewalls: [], unreachableFirewalls: [] },
   publicDns: { records: [], probe: unusedPublicDnsProbe },
 };
 

package/src/test-utils/bus-responder.ts

@@ -130,7 +130,7 @@ export function startBusResponderFixture(opts: BusResponderFixtureOptions): BusR
     close: () => {
       handle.close();
       db.$client.close();
-      if (prevDataDir === undefined) process.env.CELILO_DATA_DIR = undefined;
+      if (prevDataDir === undefined) delete process.env.CELILO_DATA_DIR;
       else process.env.CELILO_DATA_DIR = prevDataDir;
       // Reset to the scratch path, never restore the previous value: it may
       // be another suite's temp database, or unset — which sends the next

package/tsconfig.json

@@ -1,21 +1,10 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
     "lib": ["ESNext"],
-    "moduleResolution": "bundler",
     "jsx": "react-jsx",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "types": ["bun-types"],
     "paths": {
       "@/*": ["./src/*"]
     }
-  },
-  "include": ["src/**/*", "test-integration/**/*"],
-  "exclude": ["node_modules"]
+  }
 }