@elench/testkit 0.1.8 → 0.1.10

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/infra/neon-up.sh

@@ -96,7 +96,10 @@ fi
 echo "$CONN_URI" > "$STATE_DIR/database_url"
 
 # ── Reset test data ─────────────────────────────────────────────────────
-if command -v psql &>/dev/null; then
+NEON_RESET="${NEON_RESET:-true}"
+if [ "$NEON_RESET" = "false" ]; then
+  echo "Reset disabled — keeping fork data"
+elif command -v psql &>/dev/null; then
   echo "Resetting test data..."
   psql "$CONN_URI" -q -c "
     DO \$\$

package/lib/config.mjs

@@ -176,6 +176,9 @@ function validateService(name, svc, manifestPath) {
     } else {
       requireString(errors, tk.neon, `${ctx}: testkit.neon.projectId`, "projectId");
       requireString(errors, tk.neon, `${ctx}: testkit.neon.dbName`, "dbName");
+      if (tk.neon.reset !== undefined && typeof tk.neon.reset !== "boolean") {
+        errors.push(`${ctx}: testkit.neon.reset must be a boolean`);
+      }
     }
 
     if (!isObject(tk.fly)) {

package/lib/runner.mjs

@@ -64,6 +64,7 @@ export async function neonUp(config) {
     NEON_PROJECT_ID: tk.neon.projectId,
     NEON_DB_NAME: tk.neon.dbName,
     NEON_BRANCH_NAME: tk.neon.branchName || `${config.name}-test`,
+    NEON_RESET: tk.neon.reset === false ? "false" : "true",
     STATE_DIR: stateDir,
   });
 }
@@ -75,16 +76,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,
@@ -127,16 +128,16 @@ async function flyUpDep(config, dep) {
     fs.copyFileSync(primaryDbUrl, path.join(depStateDir, "database_url"));
   }
 
-  // Generate fly-env.sh for dependent
+  // 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}`);
+    envLines.push(`  --env "${k}=${v}"`);
   }
   for (const k of dep.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(depStateDir, "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: dep.fly.app,

package/package.json

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