fix: feat: restore smoke-init CI pipeline using mock Forgejo (#124)

.woodpecker/smoke-init.yml

@@ -0,0 +1,36 @@
+# .woodpecker/smoke-init.yml — Smoke test for disinto init using mock Forgejo
+#
+# Runs on PRs that touch init-related files:
+#   - bin/disinto (the init code)
+#   - lib/load-project.sh, lib/env.sh (init dependencies)
+#   - tests/** (test changes)
+#   - .woodpecker/smoke-init.yml (pipeline changes)
+#
+# Uses mock Forgejo server (starts in <1s) instead of real Forgejo.
+# Total runtime target: <10 seconds.
+#
+# Pipeline steps:
+#   1. Start mock-forgejo.py (instant startup)
+#   2. Run smoke-init.sh which:
+#      - Runs disinto init against mock
+#      - Verifies users, repos, labels created via API
+#      - Verifies .env tokens, TOML generated, cron installed
+#      - Queries /mock/state endpoint to verify all API calls made
+
+when:
+  - event: pull_request
+    path:
+      - "bin/disinto"
+      - "lib/load-project.sh"
+      - "lib/env.sh"
+      - "tests/**"
+      - ".woodpecker/smoke-init.yml"
+
+steps:
+  - name: smoke-init
+    image: python:3-alpine
+    commands:
+      - apk add --no-cache bash curl jq git coreutils
+      - python3 tests/mock-forgejo.py &
+      - sleep 1  # wait for mock to start
+      - bash tests/smoke-init.sh

tests/mock-forgejo.py

@@ -150,6 +150,9 @@ class ForgejoHandler(BaseHTTPRequestHandler):
             (r"^admin/users/([^/]+)$", f"handle_{method}_admin_users_username"),
             # Org patterns
             (r"^orgs$", f"handle_{method}_orgs"),
+            # Mock debug endpoints
+            (r"^mock/state$", f"handle_{method}_mock_state"),
+            (r"^mock/shutdown$", f"handle_{method}_mock_shutdown"),
         ]
 
         for pattern, handler_name in patterns:
@@ -237,6 +240,20 @@ class ForgejoHandler(BaseHTTPRequestHandler):
         SHUTDOWN_REQUESTED = True
         json_response(self, 200, {"status": "shutdown"})
 
+    def handle_GET_mock_state(self, query):
+        """GET /mock/state — debug endpoint for smoke tests"""
+        require_token(self)
+        json_response(self, 200, {
+            "users": list(state["users"].keys()),
+            "tokens": list(state["tokens"].keys()),
+            "repos": list(state["repos"].keys()),
+            "orgs": list(state["orgs"].keys()),
+            "labels": {k: [l["name"] for l in v] for k, v in state["labels"].items()},
+            "collaborators": {k: list(v) for k, v in state["collaborators"].items()},
+            "protections": {k: list(v) for k, v in state["protections"].items()},
+            "oauth2_apps": [a["name"] for a in state["oauth2_apps"]],
+        })
+
     def handle_POST_admin_users(self, query):
         """POST /api/v1/admin/users"""
         require_token(self)

tests/smoke-init.sh

@@ -1,32 +1,28 @@
 #!/usr/bin/env bash
-# tests/smoke-init.sh — End-to-end smoke test for disinto init
+# tests/smoke-init.sh — End-to-end smoke test for disinto init using mock Forgejo
 #
-# Expects a running Forgejo at SMOKE_FORGE_URL with a bootstrap admin
-# user already created (see .woodpecker/smoke-init.yml for CI setup).
 # Validates the full init flow: Forgejo API, user/token creation,
 # repo setup, labels, TOML generation, and cron installation.
 #
+# Uses mock Forgejo server (started by .woodpecker/smoke-init.yml).
+#
 # Required env:  SMOKE_FORGE_URL (default: http://localhost:3000)
-# Required tools: bash, curl, jq, python3, git
+# Required tools: bash, curl, jq, git
 
 set -euo pipefail
 
 FACTORY_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 FORGE_URL="${SMOKE_FORGE_URL:-http://localhost:3000}"
-SETUP_ADMIN="setup-admin"
-SETUP_PASS="SetupPass-789xyz"
 TEST_SLUG="smoke-org/smoke-repo"
 MOCK_BIN="/tmp/smoke-mock-bin"
-MOCK_STATE="/tmp/smoke-mock-state"
 FAILED=0
 
 fail() { printf 'FAIL: %s\n' "$*" >&2; FAILED=1; }
 pass() { printf 'PASS: %s\n' "$*"; }
 
 cleanup() {
-  rm -rf "$MOCK_BIN" "$MOCK_STATE" /tmp/smoke-test-repo \
-         "${FACTORY_ROOT}/projects/smoke-repo.toml" \
-         "${FACTORY_ROOT}/docker-compose.yml"
+  rm -rf "$MOCK_BIN" /tmp/smoke-test-repo \
+         "${FACTORY_ROOT}/projects/smoke-repo.toml"
   # Restore .env only if we created the backup
   if [ -f "${FACTORY_ROOT}/.env.smoke-backup" ]; then
     mv "${FACTORY_ROOT}/.env.smoke-backup" "${FACTORY_ROOT}/.env"
@@ -40,11 +36,11 @@ trap cleanup EXIT
 if [ -f "${FACTORY_ROOT}/.env" ]; then
   cp "${FACTORY_ROOT}/.env" "${FACTORY_ROOT}/.env.smoke-backup"
 fi
-# Start with a clean .env (setup_forge writes tokens here)
+# Start with a clean .env (init writes tokens here)
 printf '' > "${FACTORY_ROOT}/.env"
 
-# ── 1. Verify Forgejo is ready ──────────────────────────────────────────────
-echo "=== 1/6 Verifying Forgejo at ${FORGE_URL} ==="
+# ── 1. Verify mock Forgejo is ready ─────────────────────────────────────────
+echo "=== 1/6 Verifying mock Forgejo at ${FORGE_URL} ==="
 retries=0
 api_version=""
 while true; do
@@ -55,166 +51,16 @@ while true; do
   fi
   retries=$((retries + 1))
   if [ "$retries" -gt 30 ]; then
-    fail "Forgejo API not responding after 30s"
+    fail "Mock Forgejo API not responding after 30s"
     exit 1
   fi
   sleep 1
 done
-pass "Forgejo API v${api_version} (${retries}s)"
+pass "Mock Forgejo API v${api_version} (${retries}s)"
 
-# Verify bootstrap admin user exists
-if curl -sf --max-time 5 "${FORGE_URL}/api/v1/users/${SETUP_ADMIN}" >/dev/null 2>&1; then
-  pass "Bootstrap admin '${SETUP_ADMIN}' exists"
-else
-  fail "Bootstrap admin '${SETUP_ADMIN}' not found — was Forgejo set up?"
-  exit 1
-fi
-
-# ── 2. Set up mock binaries ─────────────────────────────────────────────────
+# ── 2. Set up mock binaries (claude, tmux) ─────────────────────────────────
 echo "=== 2/6 Setting up mock binaries ==="
-mkdir -p "$MOCK_BIN" "$MOCK_STATE"
-
-# Store bootstrap admin credentials for the docker mock
-printf '%s:%s' "${SETUP_ADMIN}" "${SETUP_PASS}" > "$MOCK_STATE/bootstrap_creds"
-
-# ── Mock: docker ──
-# Routes 'docker exec' user-creation calls to the Forgejo admin API,
-# using the bootstrap admin's credentials.
-cat > "$MOCK_BIN/docker" << 'DOCKERMOCK'
-#!/usr/bin/env bash
-set -euo pipefail
-
-FORGE_URL="${SMOKE_FORGE_URL:-http://localhost:3000}"
-MOCK_STATE="/tmp/smoke-mock-state"
-
-if [ ! -f "$MOCK_STATE/bootstrap_creds" ]; then
-  echo "mock-docker: bootstrap credentials not found" >&2
-  exit 1
-fi
-BOOTSTRAP_CREDS="$(cat "$MOCK_STATE/bootstrap_creds")"
-
-# docker ps — return empty (no containers running)
-if [ "${1:-}" = "ps" ]; then
-  exit 0
-fi
-
-# docker exec — route to Forgejo API
-if [ "${1:-}" = "exec" ]; then
-  shift  # remove 'exec'
-
-  # Skip docker exec flags (-u VALUE, -T, -i, etc.)
-  while [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; do
-    case "$1" in
-      -u|-w|-e) shift 2 ;;
-      *)        shift ;;
-    esac
-  done
-  shift  # remove container name (e.g. disinto-forgejo)
-
-  # $@ is now: forgejo admin user list|create [flags]
-  if [ "${1:-}" = "forgejo" ] && [ "${2:-}" = "admin" ] && [ "${3:-}" = "user" ]; then
-    subcmd="${4:-}"
-
-    if [ "$subcmd" = "list" ]; then
-      echo "ID   Username   Email"
-      exit 0
-    fi
-
-    if [ "$subcmd" = "create" ]; then
-      shift 4  # skip 'forgejo admin user create'
-      username="" password="" email="" is_admin="false"
-      while [ $# -gt 0 ]; do
-        case "$1" in
-          --admin)                is_admin="true"; shift ;;
-          --username)             username="$2"; shift 2 ;;
-          --password)             password="$2"; shift 2 ;;
-          --email)                email="$2"; shift 2 ;;
-          --must-change-password*) shift ;;
-          *)                      shift ;;
-        esac
-      done
-
-      if [ -z "$username" ] || [ -z "$password" ] || [ -z "$email" ]; then
-        echo "mock-docker: missing required args" >&2
-        exit 1
-      fi
-
-      # Create user via Forgejo admin API
-      if ! curl -sf -X POST \
-        -u "$BOOTSTRAP_CREDS" \
-        -H "Content-Type: application/json" \
-        "${FORGE_URL}/api/v1/admin/users" \
-        -d "{\"username\":\"${username}\",\"password\":\"${password}\",\"email\":\"${email}\",\"must_change_password\":false,\"login_name\":\"${username}\",\"source_id\":0}" \
-        >/dev/null 2>&1; then
-        echo "mock-docker: failed to create user '${username}'" >&2
-        exit 1
-      fi
-
-      # Patch user: ensure must_change_password is false (Forgejo admin
-      # API POST may ignore it) and promote to admin if requested
-      patch_body="{\"must_change_password\":false,\"login_name\":\"${username}\",\"source_id\":0"
-      if [ "$is_admin" = "true" ]; then
-        patch_body="${patch_body},\"admin\":true"
-      fi
-      patch_body="${patch_body}}"
-
-      curl -sf -X PATCH \
-        -u "$BOOTSTRAP_CREDS" \
-        -H "Content-Type: application/json" \
-        "${FORGE_URL}/api/v1/admin/users/${username}" \
-        -d "${patch_body}" \
-        >/dev/null 2>&1 || true
-
-      echo "New user '${username}' has been successfully created!"
-      exit 0
-    fi
-
-    if [ "$subcmd" = "change-password" ]; then
-      shift 4  # skip 'forgejo admin user change-password'
-      username="" password=""
-      while [ $# -gt 0 ]; do
-        case "$1" in
-          --username)             username="$2"; shift 2 ;;
-          --password)             password="$2"; shift 2 ;;
-          --must-change-password*) shift ;;
-          --config*)              shift ;;
-          *)                      shift ;;
-        esac
-      done
-
-      if [ -z "$username" ]; then
-        echo "mock-docker: change-password missing --username" >&2
-        exit 1
-      fi
-
-      # PATCH user via Forgejo admin API to clear must_change_password
-      patch_body="{\"must_change_password\":false,\"login_name\":\"${username}\",\"source_id\":0"
-      if [ -n "$password" ]; then
-        patch_body="${patch_body},\"password\":\"${password}\""
-      fi
-      patch_body="${patch_body}}"
-
-      if ! curl -sf -X PATCH \
-        -u "$BOOTSTRAP_CREDS" \
-        -H "Content-Type: application/json" \
-        "${FORGE_URL}/api/v1/admin/users/${username}" \
-        -d "${patch_body}" \
-        >/dev/null 2>&1; then
-        echo "mock-docker: failed to change-password for '${username}'" >&2
-        exit 1
-      fi
-      exit 0
-    fi
-  fi
-
-  echo "mock-docker: unhandled exec: $*" >&2
-  exit 1
-fi
-
-echo "mock-docker: unhandled command: $*" >&2
-exit 1
-DOCKERMOCK
-chmod +x "$MOCK_BIN/docker"
+mkdir -p "$MOCK_BIN"
 
 # ── Mock: claude ──
 cat > "$MOCK_BIN/claude" << 'CLAUDEMOCK'
@@ -231,11 +77,8 @@ chmod +x "$MOCK_BIN/claude"
 printf '#!/usr/bin/env bash\nexit 0\n' > "$MOCK_BIN/tmux"
 chmod +x "$MOCK_BIN/tmux"
 
-# No crontab mock — use real BusyBox crontab (available in the Forgejo
-# Alpine image). Cron entries are verified via 'crontab -l' in step 6.
-
 export PATH="$MOCK_BIN:$PATH"
-pass "Mock binaries installed (docker, claude, tmux)"
+pass "Mock binaries installed (claude, tmux)"
 
 # ── 3. Run disinto init ─────────────────────────────────────────────────────
 echo "=== 3/6 Running disinto init ==="
@@ -290,19 +133,21 @@ if [ "$repo_found" = false ]; then
   fail "Repo not found on Forgejo under any expected path"
 fi
 
-# Labels exist on repo — use bootstrap admin to check
-setup_token=$(curl -sf -X POST \
-  -u "${SETUP_ADMIN}:${SETUP_PASS}" \
+# Labels exist on repo
+# Create a token to check labels (using disinto-admin which was created by init)
+disinto_admin_pass="Disinto-Admin-456"
+verify_token=$(curl -sf -X POST \
+  -u "disinto-admin:${disinto_admin_pass}" \
   -H "Content-Type: application/json" \
-  "${FORGE_URL}/api/v1/users/${SETUP_ADMIN}/tokens" \
+  "${FORGE_URL}/api/v1/users/disinto-admin/tokens" \
   -d '{"name":"smoke-verify","scopes":["all"]}' 2>/dev/null \
-  | jq -r '.sha1 // empty') || setup_token=""
+  | jq -r '.sha1 // empty') || verify_token=""
 
-if [ -n "$setup_token" ]; then
+if [ -n "$verify_token" ]; then
   label_count=0
   for repo_path in "${TEST_SLUG}" "dev-bot/smoke-repo" "disinto-admin/smoke-repo"; do
     label_count=$(curl -sf \
-      -H "Authorization: token ${setup_token}" \
+      -H "Authorization: token ${verify_token}" \
       "${FORGE_URL}/api/v1/repos/${repo_path}/labels?limit=50" 2>/dev/null \
       | jq 'length' 2>/dev/null) || label_count=0
     if [ "$label_count" -gt 0 ]; then
@@ -316,7 +161,7 @@ if [ -n "$setup_token" ]; then
     fail "Expected >= 5 labels, found ${label_count}"
   fi
 else
-  fail "Could not obtain verification token from bootstrap admin"
+  fail "Could not obtain verification token"
 fi
 
 # ── 5. Verify local state ───────────────────────────────────────────────────
@@ -387,6 +232,50 @@ else
   fail "No cron entries found (crontab -l returned empty)"
 fi
 
+# ── Mock state verification ─────────────────────────────────────────────────
+echo "=== Verifying mock Forgejo state ==="
+
+# Query /mock/state to verify all expected API calls were made
+mock_state=$(curl -sf \
+  -H "Authorization: token ${verify_token}" \
+  "${FORGE_URL}/mock/state" 2>/dev/null) || mock_state=""
+
+if [ -n "$mock_state" ]; then
+  # Verify users were created
+  users=$(echo "$mock_state" | jq -r '.users | length' 2>/dev/null) || users=0
+  if [ "$users" -ge 3 ]; then
+    pass "Mock state: ${users} users created (expected >= 3)"
+  else
+    fail "Mock state: expected >= 3 users, found ${users}"
+  fi
+
+  # Verify repos were created
+  repos=$(echo "$mock_state" | jq -r '.repos | length' 2>/dev/null) || repos=0
+  if [ "$repos" -ge 1 ]; then
+    pass "Mock state: ${repos} repos created (expected >= 1)"
+  else
+    fail "Mock state: expected >= 1 repos, found ${repos}"
+  fi
+
+  # Verify labels were created
+  labels_total=$(echo "$mock_state" | jq '[.labels.values[] | length] | add // 0' 2>/dev/null) || labels_total=0
+  if [ "$labels_total" -ge 5 ]; then
+    pass "Mock state: ${labels_total} labels created (expected >= 5)"
+  else
+    fail "Mock state: expected >= 5 labels, found ${labels_total}"
+  fi
+
+  # Verify tokens were created
+  tokens=$(echo "$mock_state" | jq -r '.tokens | length' 2>/dev/null) || tokens=0
+  if [ "$tokens" -ge 1 ]; then
+    pass "Mock state: ${tokens} tokens created (expected >= 1)"
+  else
+    fail "Mock state: expected >= 1 tokens, found ${tokens}"
+  fi
+else
+  fail "Could not query /mock/state endpoint"
+fi
+
 # ── Summary ──────────────────────────────────────────────────────────────────
 echo ""
 if [ "$FAILED" -ne 0 ]; then