@elench/testkit 0.1.10 → 0.1.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.10",
-  "description": "CLI for running k6 tests against real, ephemeral infrastructure",
+  "version": "0.1.11",
+  "description": "CLI for running manifest-defined local test suites across k6 and Playwright",
   "type": "module",
   "bin": {
     "testkit": "bin/testkit.mjs"
@@ -9,7 +9,8 @@
   "files": [
     "bin/",
     "lib/",
-    "infra/",
+    "infra/neon-up.sh",
+    "infra/neon-down.sh",
     "vendor/"
   ],
   "dependencies": {

package/infra/fly-app-ensure.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# Ensures the Fly app exists, creating it if necessary.
-# Idempotent — safe to call on every run.
-# Requires: FLY_APP, FLY_ORG
-set -eo pipefail
-
-export PATH="$PATH:/snap/bin:$HOME/.fly/bin"
-
-FLY_APP="${FLY_APP:?FLY_APP required}"
-FLY_ORG="${FLY_ORG:?FLY_ORG required}"
-
-if fly status --app "$FLY_APP" >/dev/null 2>&1; then
-  echo "Fly app '$FLY_APP' already exists"
-else
-  echo "Creating Fly app '$FLY_APP' in org '$FLY_ORG'..."
-  fly apps create "$FLY_APP" --org "$FLY_ORG"
-
-  # Allocate IPs so *.fly.dev DNS resolves
-  fly ips allocate-v4 --shared --app "$FLY_APP"
-  fly ips allocate-v6 --app "$FLY_APP"
-
-  echo "Fly app '$FLY_APP' created"
-fi

package/infra/fly-build.sh

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# Builds Docker image from current source and pushes to Fly registry.
-# Requires: FLY_APP, FLY_ORG, Docker, fly CLI
-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 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)
-IMAGE="registry.fly.io/$FLY_APP:testkit-$SHORT_SHA"
-
-# Warn if working tree is dirty (image will include uncommitted changes
-# but tag references HEAD)
-if ! git -C "$API_DIR" diff --quiet 2>/dev/null; then
-  echo "WARNING: uncommitted changes will be included in the build"
-fi
-
-mkdir -p "$STATE_DIR"
-
-# Skip if image tag unchanged (same commit, clean tree)
-if [ -f "$STATE_DIR/fly_image" ]; then
-  STORED_IMAGE=$(cat "$STATE_DIR/fly_image")
-  if [ "$STORED_IMAGE" = "$IMAGE" ] && git -C "$API_DIR" diff --quiet 2>/dev/null; then
-    echo "Image $IMAGE unchanged — skipping build"
-    exit 0
-  fi
-fi
-
-# Skip if image already exists in registry (e.g. built by a previous run without state)
-if git -C "$API_DIR" diff --quiet 2>/dev/null; then
-  fly auth docker 2>/dev/null
-  if docker manifest inspect "$IMAGE" >/dev/null 2>&1; then
-    echo "Image $IMAGE already in registry — skipping build"
-    echo "$IMAGE" > "$STATE_DIR/fly_image"
-    exit 0
-  fi
-fi
-
-# Ensure the Fly app exists (registry requires it)
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-bash "$SCRIPT_DIR/fly-app-ensure.sh"
-
-echo "Building image: $IMAGE"
-docker build -t "$IMAGE" -f "$DOCKERFILE_DIR/Dockerfile" "$API_DIR"
-
-echo "Pushing to Fly registry..."
-fly auth docker
-docker push "$IMAGE"
-
-echo "$IMAGE" > "$STATE_DIR/fly_image"
-echo "Image ready: $IMAGE"

package/infra/fly-destroy.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Destroys the Fly machine permanently (use fly-down.sh for stop/reuse)
-# Requires: FLY_APP
-set -eo pipefail
-
-export PATH="$PATH:/snap/bin:$HOME/.fly/bin"
-
-STATE_DIR="${STATE_DIR:-.state}"
-FLY_APP="${FLY_APP:?FLY_APP required}"
-
-if [ ! -f "$STATE_DIR/fly_machine_id" ]; then
-  echo "No Fly machine to destroy"
-  exit 0
-fi
-
-MACHINE_ID=$(cat "$STATE_DIR/fly_machine_id")
-echo "Destroying Fly machine: $MACHINE_ID"
-fly machines stop "$MACHINE_ID" --app "$FLY_APP" 2>/dev/null || true
-fly machines destroy "$MACHINE_ID" --app "$FLY_APP" --force 2>/dev/null || true
-rm -f "$STATE_DIR/fly_machine_id"
-echo "Fly machine destroyed"

package/infra/fly-down.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Stops the Fly machine (preserves it for reuse on next run)
-# Requires: FLY_APP
-set -eo pipefail
-
-export PATH="$PATH:/snap/bin:$HOME/.fly/bin"
-
-STATE_DIR="${STATE_DIR:-.state}"
-FLY_APP="${FLY_APP:?FLY_APP required}"
-
-if [ ! -f "$STATE_DIR/fly_machine_id" ]; then
-  echo "No Fly machine to stop"
-  exit 0
-fi
-
-MACHINE_ID=$(cat "$STATE_DIR/fly_machine_id")
-echo "Stopping Fly machine: $MACHINE_ID"
-fly machines stop "$MACHINE_ID" --app "$FLY_APP" 2>/dev/null || true
-echo "Fly machine stopped (preserved for next run)"

package/infra/fly-up.sh

@@ -1,142 +0,0 @@
-#!/usr/bin/env bash
-# Ensures a Fly machine is running with the correct env vars and image.
-# Reuses an existing stopped machine if available; creates a new one if not.
-# Requires: FLY_APP, FLY_REGION
-# Image required only for --build or new machines (FLY_IMAGE / FLY_IMAGE_DEFAULT / .state/fly_image)
-# Optional: DB_URL_ENV_NAME (default: DATABASE_URL), FLY_PORT, FLY_ENV_FILE
-set -eo pipefail
-
-export PATH="$PATH:/snap/bin:$HOME/.fly/bin"
-
-STATE_DIR="${STATE_DIR:-.state}"
-FLY_APP="${FLY_APP:?FLY_APP required}"
-FLY_REGION="${FLY_REGION:-lhr}"
-
-# Ensure the Fly app exists (idempotent — creates on first run)
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-bash "$SCRIPT_DIR/fly-app-ensure.sh"
-
-# Resolve image if available (not required yet — may not be needed for reuse)
-if [ -z "$FLY_IMAGE" ] && [ -f "$STATE_DIR/fly_image" ]; then
-  FLY_IMAGE="$(cat "$STATE_DIR/fly_image")"
-fi
-FLY_IMAGE="${FLY_IMAGE:-$FLY_IMAGE_DEFAULT}"
-
-if [ ! -f "$STATE_DIR/database_url" ]; then
-  echo "ERROR: No database_url — run neon-up.sh first"
-  exit 1
-fi
-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 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"
-fi
-
-MACHINE_ID=""
-
-# ── 1. Try state file ────────────────────────────────────────────────────
-if [ -f "$STATE_DIR/fly_machine_id" ]; then
-  EXISTING_ID=$(cat "$STATE_DIR/fly_machine_id")
-  if fly machines status "$EXISTING_ID" --app "$FLY_APP" >/dev/null 2>&1; then
-    MACHINE_ID="$EXISTING_ID"
-  else
-    echo "Stored machine $EXISTING_ID gone — will discover or create"
-    rm -f "$STATE_DIR/fly_machine_id"
-  fi
-fi
-
-# ── 2. Discover existing machine on the app ──────────────────────────────
-if [ -z "$MACHINE_ID" ]; then
-  DISCOVERED_ID=$(fly machines list --app "$FLY_APP" --json 2>/dev/null \
-    | jq -r '.[0].id // empty')
-  if [ -n "$DISCOVERED_ID" ]; then
-    MACHINE_ID="$DISCOVERED_ID"
-    echo "Discovered existing machine: $MACHINE_ID"
-  fi
-fi
-
-# ── 3. Update and start existing machine ─────────────────────────────────
-if [ -n "$MACHINE_ID" ]; then
-  echo "Reusing machine $MACHINE_ID — updating config"
-
-  # 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_ARGS+=(--image "$FLY_IMAGE")
-  fi
-
-  fly machines update "$MACHINE_ID" --app "$FLY_APP" \
-    "${UPDATE_ARGS[@]}" \
-    --yes 2>&1
-
-  # Start if not already running (update may auto-restart)
-  fly machines start "$MACHINE_ID" --app "$FLY_APP" 2>/dev/null || true
-  fly machines wait "$MACHINE_ID" --app "$FLY_APP" --state started --wait-timeout 60s
-
-  echo "$MACHINE_ID" > "$STATE_DIR/fly_machine_id"
-fi
-
-# ── 4. Create new machine if needed ──────────────────────────────────────
-if [ -z "$MACHINE_ID" ]; then
-  # Image is required for new machines
-  FLY_IMAGE="${FLY_IMAGE:?FLY_IMAGE required — run with --build or set FLY_IMAGE}"
-
-  echo "Creating Fly machine (app: $FLY_APP, region: $FLY_REGION)"
-
-  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_ARGS[@]}" \
-    --port "$FLY_PORT" \
-    2>&1); then
-    echo "ERROR: fly machines run failed:"
-    echo "$RESULT"
-    exit 1
-  fi
-
-  echo "$RESULT"
-
-  MACHINE_ID=$(echo "$RESULT" | grep 'Machine ID:' | awk '{print $3}')
-  if [ -z "$MACHINE_ID" ]; then
-    echo "ERROR: Could not extract machine ID from output"
-    exit 1
-  fi
-
-  echo "Waiting for machine $MACHINE_ID to start..."
-  fly machines wait "$MACHINE_ID" --app "$FLY_APP" --state started --wait-timeout 60s
-fi
-
-echo "$MACHINE_ID" > "$STATE_DIR/fly_machine_id"
-
-# Ephemeral machines aren't publicly DNS-routable by ID.
-# Route via the app hostname with fly-force-instance-id header.
-HOSTNAME="https://$FLY_APP.fly.dev"
-echo "$HOSTNAME" > "$STATE_DIR/fly_hostname"
-
-# Wait for app to become reachable (new apps need DNS propagation)
-echo "Waiting for $HOSTNAME to become reachable..."
-for i in $(seq 1 30); do
-  if curl -sf --max-time 5 -o /dev/null "$HOSTNAME/health" \
-       -H "fly-force-instance-id: $MACHINE_ID" 2>/dev/null; then
-    echo "App reachable after ${i}s"
-    break
-  fi
-  if [ "$i" -eq 30 ]; then
-    echo "WARNING: App not reachable after 30s — DNS may still be propagating"
-  fi
-  sleep 1
-done
-
-echo "Fly machine ready: $MACHINE_ID"
-echo "Hostname: $HOSTNAME (routed via fly-force-instance-id header)"