@elench/testkit 0.1.7 → 0.1.9

package/infra/fly-up.sh

@@ -31,8 +31,8 @@ DATABASE_URL=$(cat "$STATE_DIR/database_url")
 DB_URL_ENV_NAME="${DB_URL_ENV_NAME:-DATABASE_URL}"
 FLY_PORT="${FLY_PORT:-443:3000/tcp:tls:http}"
 
-# Load target-specific env flags (sets FLY_ENV_FLAGS)
-FLY_ENV_FLAGS=""
+# Load target-specific env args (sets FLY_ENV_ARGS array)
+FLY_ENV_ARGS=()
 if [ -n "$FLY_ENV_FILE" ] && [ -f "$FLY_ENV_FILE" ]; then
   # shellcheck disable=SC1090
   source "$FLY_ENV_FILE"
@@ -65,17 +65,16 @@ fi
 if [ -n "$MACHINE_ID" ]; then
   echo "Reusing machine $MACHINE_ID — updating config"
 
-  # Build update flags: always update DATABASE_URL + target env
-  UPDATE_FLAGS="--env $DB_URL_ENV_NAME=$DATABASE_URL $FLY_ENV_FLAGS"
+  # Build update args array: always update DATABASE_URL + target env
+  UPDATE_ARGS=(--env "$DB_URL_ENV_NAME=$DATABASE_URL" "${FLY_ENV_ARGS[@]}")
 
   # Only update image if one was provided (--build was used)
   if [ -n "$FLY_IMAGE" ]; then
-    UPDATE_FLAGS="$UPDATE_FLAGS --image $FLY_IMAGE"
+    UPDATE_ARGS+=(--image "$FLY_IMAGE")
   fi
 
-  # shellcheck disable=SC2086
   fly machines update "$MACHINE_ID" --app "$FLY_APP" \
-    $UPDATE_FLAGS \
+    "${UPDATE_ARGS[@]}" \
     --yes 2>&1
 
   # Start if not already running (update may auto-restart)
@@ -92,14 +91,13 @@ if [ -z "$MACHINE_ID" ]; then
 
   echo "Creating Fly machine (app: $FLY_APP, region: $FLY_REGION)"
 
-  # shellcheck disable=SC2086
   if ! RESULT=$(fly machines run "$FLY_IMAGE" \
     --app "$FLY_APP" \
     --region "$FLY_REGION" \
     --vm-memory 512 \
     --autostop=stop \
     --env "$DB_URL_ENV_NAME=$DATABASE_URL" \
-    $FLY_ENV_FLAGS \
+    "${FLY_ENV_ARGS[@]}" \
     --port "$FLY_PORT" \
     2>&1); then
     echo "ERROR: fly machines run failed:"

package/lib/config.mjs

@@ -87,6 +87,14 @@ export function loadConfigs(opts = {}) {
         throw new Error(`Secret "${key}" (service "${name}") not found in env or .env`);
       }
     }
+    // Check dependent secrets
+    for (const dep of tk.depends || []) {
+      for (const key of dep.fly?.secrets || []) {
+        if (!process.env[key]) {
+          throw new Error(`Secret "${key}" (service "${name}", dep "${dep.name}") not found in env or .env`);
+        }
+      }
+    }
 
     // Each service gets its own state dir: .testkit/<service>/
     const stateDir = entries.length === 1
@@ -193,6 +201,30 @@ function validateService(name, svc, manifestPath) {
     if (tk.dal !== undefined && !isObject(tk.dal)) {
       errors.push(`${ctx}: testkit.dal must be an object`);
     }
+
+    if (tk.depends !== undefined) {
+      if (!Array.isArray(tk.depends)) {
+        errors.push(`${ctx}: testkit.depends must be an array`);
+      } else {
+        for (let i = 0; i < tk.depends.length; i++) {
+          const dep = tk.depends[i];
+          const dp = `${ctx}: testkit.depends[${i}]`;
+          if (!isObject(dep)) {
+            errors.push(`${dp} must be an object`);
+            continue;
+          }
+          requireString(errors, dep, `${dp}.name`, "name");
+          requireString(errors, dep, `${dp}.dockerfile`, "dockerfile");
+          if (!isObject(dep.fly)) {
+            errors.push(`${dp}.fly is required and must be an object`);
+          } else {
+            requireString(errors, dep.fly, `${dp}.fly.app`, "app");
+            requireString(errors, dep.fly, `${dp}.fly.org`, "org");
+            optionalStringArray(errors, dep.fly, `${dp}.fly.secrets`, "secrets");
+          }
+        }
+      }
+    }
   }
 
   if (!isObject(svc.suites)) {

package/lib/runner.mjs

@@ -75,16 +75,16 @@ export async function flyUp(config) {
   const { productDir, stateDir, manifest } = config;
   const tk = manifest.testkit;
 
-  // Generate fly-env.sh from manifest
+  // Generate fly-env.sh from manifest (bash array for safe quoting)
   const envLines = [];
   for (const [k, v] of Object.entries(tk.fly.env || {})) {
-    envLines.push(`  --env ${k}=${v}`);
+    envLines.push(`  --env "${k}=${v}"`);
   }
   for (const k of tk.fly.secrets || []) {
-    envLines.push(`  --env ${k}=$${k}`);  // shell substitution at source-time
+    envLines.push(`  --env "${k}=\${${k}}"`);  // shell substitution at source-time
   }
   const flyEnvPath = path.join(stateDir, "fly-env.sh");
-  fs.writeFileSync(flyEnvPath, `FLY_ENV_FLAGS="\n${envLines.join("\n")}\n"\n`);
+  fs.writeFileSync(flyEnvPath, `FLY_ENV_ARGS=(\n${envLines.join("\n")}\n)\n`);
 
   await runScript("fly-up.sh", {
     FLY_APP: tk.fly.app,
@@ -96,6 +96,69 @@ export async function flyUp(config) {
   });
 }
 
+/**
+ * Build a dependent service's Docker image.
+ */
+async function buildDep(config, dep) {
+  const { productDir, stateDir } = config;
+  const depStateDir = path.join(stateDir, "deps", dep.name);
+  fs.mkdirSync(depStateDir, { recursive: true });
+  await runScript("fly-build.sh", {
+    FLY_APP: dep.fly.app,
+    FLY_ORG: dep.fly.org,
+    API_DIR: productDir,
+    DOCKERFILE_DIR: path.join(productDir, dep.dockerfile),
+    STATE_DIR: depStateDir,
+  });
+}
+
+/**
+ * Deploy a dependent service's Fly machine.
+ * Copies database_url from primary, generates fly-env.sh, calls fly-up.sh.
+ */
+async function flyUpDep(config, dep) {
+  const { stateDir } = config;
+  const depStateDir = path.join(stateDir, "deps", dep.name);
+  fs.mkdirSync(depStateDir, { recursive: true });
+
+  // Copy database_url from primary state dir
+  const primaryDbUrl = path.join(stateDir, "database_url");
+  if (fs.existsSync(primaryDbUrl)) {
+    fs.copyFileSync(primaryDbUrl, path.join(depStateDir, "database_url"));
+  }
+
+  // Generate fly-env.sh for dependent (bash array for safe quoting)
+  const envLines = [];
+  for (const [k, v] of Object.entries(dep.fly.env || {})) {
+    envLines.push(`  --env "${k}=${v}"`);
+  }
+  for (const k of dep.fly.secrets || []) {
+    envLines.push(`  --env "${k}=\${${k}}"`);  // shell substitution at source-time
+  }
+  const flyEnvPath = path.join(depStateDir, "fly-env.sh");
+  fs.writeFileSync(flyEnvPath, `FLY_ENV_ARGS=(\n${envLines.join("\n")}\n)\n`);
+
+  await runScript("fly-up.sh", {
+    FLY_APP: dep.fly.app,
+    FLY_ORG: dep.fly.org,
+    FLY_REGION: dep.fly.region || "lhr",
+    FLY_PORT: dep.fly.port,
+    FLY_ENV_FILE: flyEnvPath,
+    STATE_DIR: depStateDir,
+  });
+}
+
+/**
+ * Stop a dependent service's Fly machine.
+ */
+async function flyDownDep(config, dep) {
+  const depStateDir = path.join(config.stateDir, "deps", dep.name);
+  await runScript("fly-down.sh", {
+    FLY_APP: dep.fly.app,
+    STATE_DIR: depStateDir,
+  });
+}
+
 /**
  * Stop the Fly machine (preserved for reuse).
  */
@@ -109,10 +172,20 @@ export async function flyDown(config) {
 
 /**
  * Destroy machine + neon branch + state.
+ * Destroys dependent machines first, then primary.
  */
 export async function destroy(config) {
   const { stateDir, manifest } = config;
   const tk = manifest.testkit;
+
+  // Destroy dependents first
+  for (const dep of tk.depends || []) {
+    const depStateDir = path.join(stateDir, "deps", dep.name);
+    if (fs.existsSync(depStateDir)) {
+      await runScript("fly-destroy.sh", { FLY_APP: dep.fly.app, STATE_DIR: depStateDir });
+    }
+  }
+
   await runScript("fly-destroy.sh", { FLY_APP: tk.fly.app, STATE_DIR: stateDir });
   await runScript("neon-down.sh", {
     NEON_PROJECT_ID: tk.neon.projectId,
@@ -257,6 +330,23 @@ export function showStatus(config) {
     const val = fs.readFileSync(filePath, "utf8").trim();
     console.log(`  ${file}: ${val}`);
   }
+
+  // Show dependent state dirs
+  const depsDir = path.join(stateDir, "deps");
+  if (fs.existsSync(depsDir)) {
+    for (const depName of fs.readdirSync(depsDir)) {
+      const depDir = path.join(depsDir, depName);
+      if (!fs.statSync(depDir).isDirectory()) continue;
+      console.log(`  ── dep: ${depName} ──`);
+      for (const file of fs.readdirSync(depDir)) {
+        if (file === "fly-env.sh") continue;
+        const filePath = path.join(depDir, file);
+        if (fs.statSync(filePath).isDirectory()) continue;
+        const val = fs.readFileSync(filePath, "utf8").trim();
+        console.log(`    ${file}: ${val}`);
+      }
+    }
+  }
 }
 
 /**
@@ -317,11 +407,27 @@ async function runService(config, suiteType, suiteNames, opts) {
   // HTTP flow: build → neon → migrate → fly → run → fly down
   if (httpFiles.length) {
     requireFlyToken(config.name);
-    if (opts.build) await build(config);
+    const deps = manifest.testkit.depends || [];
+
+    // Phase 1: Build primary + deps in parallel
+    if (opts.build) {
+      await Promise.all([
+        build(config),
+        ...deps.map(dep => buildDep(config, dep)),
+      ]);
+    }
+
+    // Phase 2: Database (unchanged)
     await neonUp(config);
     await migrate(config);
     neonReady = true;
-    await flyUp(config);
+
+    // Phase 3: Deploy primary + deps in parallel
+    await Promise.all([
+      flyUp(config),
+      ...deps.map(dep => flyUpDep(config, dep)),
+    ]);
+
     try {
       for (const suite of httpSuites) {
         await runSuitePre(config, suite);
@@ -329,7 +435,11 @@ async function runService(config, suiteType, suiteNames, opts) {
       const result = await runTests(config, httpFiles);
       if (result?.failed) failed = true;
     } finally {
-      await flyDown(config);
+      // Phase 5: Teardown primary + deps in parallel
+      await Promise.allSettled([
+        flyDown(config),
+        ...deps.map(dep => flyDownDep(config, dep)),
+      ]);
     }
   }
 

package/package.json

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