@elench/testkit 0.1.5 → 0.1.7

package/infra/fly-build.sh

@@ -6,7 +6,8 @@ set -eo pipefail
 export PATH="$PATH:/snap/bin:$HOME/.fly/bin"
 
 STATE_DIR="${STATE_DIR:-.state}"
-API_DIR="$(cd "${API_DIR:?API_DIR required — set to the service directory containing the Dockerfile}" && pwd)"
+API_DIR="$(cd "${API_DIR:?API_DIR required — set to the product directory}" && pwd)"
+DOCKERFILE_DIR="$(cd "${DOCKERFILE_DIR:-$API_DIR}" && pwd)"
 FLY_APP="${FLY_APP:?FLY_APP required}"
 
 SHORT_SHA=$(git -C "$API_DIR" rev-parse --short HEAD)
@@ -44,7 +45,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 bash "$SCRIPT_DIR/fly-app-ensure.sh"
 
 echo "Building image: $IMAGE"
-docker build -t "$IMAGE" -f "$API_DIR/Dockerfile" "$API_DIR"
+docker build -t "$IMAGE" -f "$DOCKERFILE_DIR/Dockerfile" "$API_DIR"
 
 echo "Pushing to Fly registry..."
 fly auth docker

package/infra/neon-up.sh

@@ -106,6 +106,7 @@ if command -v psql &>/dev/null; then
         SELECT tablename FROM pg_tables
         WHERE schemaname = 'public'
         AND tablename NOT LIKE '%migration%'
+        AND tablename NOT LIKE 'goose_%'
         AND tablename NOT LIKE 'drizzle_%'
       ) LOOP
         EXECUTE 'TRUNCATE TABLE public.' || quote_ident(r.tablename) || ' CASCADE';

package/lib/config.mjs

@@ -178,6 +178,14 @@ function validateService(name, svc, manifestPath) {
       optionalStringArray(errors, tk.fly, `${ctx}: testkit.fly.secrets`, "secrets");
     }
 
+    if (tk.migrate !== undefined) {
+      if (!isObject(tk.migrate)) {
+        errors.push(`${ctx}: testkit.migrate must be an object`);
+      } else {
+        requireString(errors, tk.migrate, `${ctx}: testkit.migrate.cmd`, "cmd");
+      }
+    }
+
     if (tk.k6 !== undefined && !isObject(tk.k6)) {
       errors.push(`${ctx}: testkit.k6 must be an object`);
     }
@@ -201,6 +209,9 @@ function validateService(name, svc, manifestPath) {
         const prefix = `${ctx}: suites.${type}[${i}]`;
         requireString(errors, suite, `${prefix}.name`, "name");
         requireNonEmptyStringArray(errors, suite, `${prefix}.files`, "files");
+        if (suite.pre !== undefined && (typeof suite.pre !== "string" || suite.pre.length === 0)) {
+          errors.push(`${prefix}.pre must be a non-empty string (shell command)`);
+        }
       }
     }
   }

package/lib/runner.mjs

@@ -49,6 +49,7 @@ export async function build(config) {
     FLY_APP: tk.fly.app,
     FLY_ORG: tk.fly.org,
     API_DIR: productDir,
+    DOCKERFILE_DIR: tk.dockerfile ? path.join(productDir, tk.dockerfile) : productDir,
     STATE_DIR: stateDir,
   });
 }
@@ -180,6 +181,66 @@ export async function runDalTests(config, files) {
   return { failed };
 }
 
+/**
+ * Delete the Neon branch (so neonUp creates a fresh fork from prod).
+ */
+async function neonReset(config) {
+  const { stateDir, manifest } = config;
+  const tk = manifest.testkit;
+  console.log("Deleting Neon branch for fresh fork...");
+  await runScript("neon-down.sh", {
+    NEON_PROJECT_ID: tk.neon.projectId,
+    STATE_DIR: stateDir,
+  });
+  // Clear branch state so neonUp creates a new one
+  const branchFile = path.join(stateDir, "neon_branch_id");
+  if (fs.existsSync(branchFile)) fs.unlinkSync(branchFile);
+  const dbUrlFile = path.join(stateDir, "database_url");
+  if (fs.existsSync(dbUrlFile)) fs.unlinkSync(dbUrlFile);
+}
+
+/**
+ * Run database migrations from local source against the test branch.
+ * If migrations fail, nukes the Neon branch and retries on a fresh fork.
+ * A second failure means a real migration bug — throws.
+ */
+async function migrate(config) {
+  const { productDir, stateDir, manifest } = config;
+  const migrateCmd = manifest.testkit.migrate?.cmd;
+  if (!migrateCmd) return;
+
+  const dbUrlPath = path.join(stateDir, "database_url");
+  const env = { ...process.env };
+  if (fs.existsSync(dbUrlPath)) {
+    env.DATABASE_URL = fs.readFileSync(dbUrlPath, "utf8").trim();
+  }
+
+  const execOpts = { stdio: "inherit", cwd: productDir, env, shell: true };
+
+  console.log("\n── migrate ──");
+  try {
+    await execaCommand(migrateCmd, execOpts);
+    return;
+  } catch (err) {
+    console.log("\nMigration failed — resetting Neon branch and retrying...\n");
+  }
+
+  // Nuke and retry: fresh fork from prod, clean goose state
+  await neonReset(config);
+  await neonUp(config);
+
+  // Re-read DATABASE_URL from fresh branch
+  if (fs.existsSync(dbUrlPath)) {
+    env.DATABASE_URL = fs.readFileSync(dbUrlPath, "utf8").trim();
+  }
+
+  try {
+    await execaCommand(migrateCmd, execOpts);
+  } catch (retryErr) {
+    throw new Error(`Migration failed on fresh branch — likely a bug in your migration SQL:\n${retryErr.message}`);
+  }
+}
+
 /**
  * Show state directory contents.
  */
@@ -198,6 +259,22 @@ export function showStatus(config) {
   }
 }
 
+/**
+ * Run a suite's `pre` command if defined.
+ * Executes in the product directory with DATABASE_URL available.
+ */
+async function runSuitePre(config, suite) {
+  if (!suite.pre) return;
+  const { productDir, stateDir } = config;
+  const dbUrlPath = path.join(stateDir, "database_url");
+  const env = { ...process.env };
+  if (fs.existsSync(dbUrlPath)) {
+    env.DATABASE_URL = fs.readFileSync(dbUrlPath, "utf8").trim();
+  }
+  console.log(`\n── pre: ${suite.name} ──`);
+  await execaCommand(suite.pre, { stdio: "inherit", cwd: productDir, env, shell: true });
+}
+
 /**
  * Run a single service: orchestrate HTTP and/or DAL test flows.
  * Returns true if any tests failed.
@@ -205,25 +282,28 @@ export function showStatus(config) {
 async function runService(config, suiteType, suiteNames, opts) {
   const { manifest, stateDir } = config;
 
-  // Collect test files from manifest, partitioned by flow
+  // Collect suites from manifest, partitioned by flow
   const types = suiteType === "all"
     ? Object.keys(manifest.suites)
     : [suiteType === "int" ? "integration" : suiteType];
 
-  let httpFiles = [];
-  let dalFiles = [];
+  let httpSuites = [];
+  let dalSuites = [];
   for (const type of types) {
     const suites = manifest.suites[type] || [];
     for (const suite of suites) {
       if (suiteNames.length && !suiteNames.includes(suite.name)) continue;
       if (type === "dal") {
-        dalFiles.push(...suite.files);
+        dalSuites.push(suite);
       } else {
-        httpFiles.push(...suite.files);
+        httpSuites.push(suite);
       }
     }
   }
 
+  const httpFiles = httpSuites.flatMap((s) => s.files);
+  const dalFiles = dalSuites.flatMap((s) => s.files);
+
   if (!httpFiles.length && !dalFiles.length) {
     console.log(`No test files for ${config.name} type="${suiteType}" suites=${suiteNames.join(",") || "all"} — skipping`);
     return false;
@@ -234,14 +314,18 @@ async function runService(config, suiteType, suiteNames, opts) {
   let failed = false;
   let neonReady = false;
 
-  // HTTP flow: build → neon → fly → run → fly down
+  // HTTP flow: build → neon → migrate → fly → run → fly down
   if (httpFiles.length) {
     requireFlyToken(config.name);
     if (opts.build) await build(config);
     await neonUp(config);
+    await migrate(config);
     neonReady = true;
     await flyUp(config);
     try {
+      for (const suite of httpSuites) {
+        await runSuitePre(config, suite);
+      }
       const result = await runTests(config, httpFiles);
       if (result?.failed) failed = true;
     } finally {
@@ -249,11 +333,17 @@ async function runService(config, suiteType, suiteNames, opts) {
     }
   }
 
-  // DAL flow: neon (idempotent) → run DAL tests
+  // DAL flow: neon → migrate → run suite pre hooks → run DAL tests
   if (dalFiles.length) {
-    if (!neonReady) await neonUp(config);
-    const result = await runDalTests(config, dalFiles);
-    if (result?.failed) failed = true;
+    if (!neonReady) {
+      await neonUp(config);
+      await migrate(config);
+    }
+    for (const suite of dalSuites) {
+      await runSuitePre(config, suite);
+      const result = await runDalTests(config, suite.files);
+      if (result?.failed) failed = true;
+    }
   }
 
   return failed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "CLI for running k6 tests against real, ephemeral infrastructure",
   "type": "module",
   "bin": {