fix(uefi): keep an unrecordable write-back owed and prune off the stop path

A stop whose write-back obligation the store record could not take now
marks the instance record with the owing node (uefi_write_back_owed),
carried by the stop's own record write, and keeps the obligation in
write-back.json beside seeded.json. A start on another node refuses while
the marked node is a cluster member. The reaper records a kept obligation
once the store record answers, lands it by the existing rules, and clears
the marker in the same compare-and-set.

Pruning no longer runs inside a stop: a landed write-back queues the prefix
and the reaper prunes it, keeping the pointer as read at prune time.

.github/CODEOWNERS

@@ -0,0 +1,15 @@
+# CODEOWNERS — GitHub PR review enforcement
+#
+# Format: <path pattern>  <owner> [<owner> …]
+# Order matters — last matching pattern wins.
+#
+# Set the matching branch protection rule on `dev` and `main` to
+# "Require review from Code Owners" or this file is advisory only.
+
+# Network layer is governed by its invariant tests.
+# Changes here must respect those clauses
+# see spinifex/domains/network/invariants/
+# mulga docs/development/proposals/region-local-architecture/0006-spinifex-network-layer-contract.md (proposal, not accepted)
+/spinifex/domains/network/          @joshsiv-mulga
+/spinifex/runtime/roles/vpcd/ @joshsiv-mulga
+/spinifex/domains/network/invariants/ @joshsiv-mulga

.github/pull_request_template.md

@@ -6,6 +6,20 @@
 
 <!-- The notable changes, as bullets. -->
 
+## Account-scoped lifecycle impact
+
+<!-- Complete this section only when the PR changes account-scoped resource lifecycle, account termination, resource cleanup, or a lifecycle boundary. Otherwise write: N/A. -->
+
+- Lifecycle owner and resource family:
+- Owner-local ordering, recovery, retained-state, or force impact:
+- Cross-domain dependency or ownership impact:
+- Evidence added or rechecked:
+- ADR-0008 lifecycle register / ADR-0001 migration-record / bead updates:
+
+## Mulga design
+
+<!-- One line, so a reviewer knows whether the design records in the private mulga repository need to change. Write either "Updated: <mulga PR or bead id>" or "Not needed: <reason>". This is a reminder, not a gate. -->
+
 ## Community Contribution License
 
 - [ ] All community contributions in this pull request are licensed to Mulga under the terms of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). By creating this pull request I represent that I have the right to license these contributions to Mulga under the Apache License 2.0.

.github/scripts/e2e-select.sh

@@ -1,148 +0,0 @@
-#!/usr/bin/env bash
-# e2e-select.sh push <before> <sha> | suites "<e2e-x ...>"
-# Prints the e2e gate's single_legs, multi_suites and multi_timeout outputs.
-# Exits non-zero on anything it cannot read, which fails the e2e status.
-set -euo pipefail
-
-SCRIPTS_DIR=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
-# shellcheck source=suite-sets.sh
-. "${SCRIPTS_DIR}/suite-sets.sh"
-
-# Provision, install and teardown around the suites; the floor is what the
-# jobs have always had, so a budget can only be raised from it.
-SETUP_ALLOWANCE_MIN=15
-FLOOR_MIN=60
-
-BASE_RUNNER=ci-single
-SERVICE_RUNNER=ci-pseudo
-
-log() { printf '[e2e-select] %s\n' "$*" >&2; }
-die() { log "error: $*"; exit 1; }
-
-# in_list <word> <list>
-in_list() {
-  local w
-  for w in $2; do [ "$w" = "$1" ] && return 0; done
-  return 1
-}
-
-# keep <list> <eligible>: the words of <list> that are in <eligible>, deduplicated.
-keep() {
-  local out="" s
-  for s in $1; do
-    in_list "$s" "$2" || continue
-    in_list "$s" "$out" || out="${out:+$out }$s"
-  done
-  printf '%s' "$out"
-}
-
-# budget <list>: max over the suites' own timeouts plus the setup allowance.
-# A sum would demand hours for a set that shares one job and never takes them.
-budget() {
-  local want="${FLOOR_MIN}" s t
-  for s in $1; do
-    t="$(e2e_suite_timeout "$s")"
-    t=$((${t%m} + SETUP_ALLOWANCE_MIN))
-    [ "$t" -gt "$want" ] && want="$t"
-  done
-  printf '%s' "$want"
-}
-
-prefixed() {
-  local out="" s
-  for s in $1; do out="${out:+$out }e2e-$s"; done
-  printf '%s' "$out"
-}
-
-# leg <name> <runner> <suites>: one matrix entry, or nothing for no suites.
-leg() {
-  [ -n "$3" ] || return 0
-  jq -nc --arg leg "$1" --arg runner "$2" --arg suites "$(prefixed "$3")" \
-    --argjson timeout "$(budget "$3")" \
-    '{leg: $leg, runner: $runner, suites: $suites, timeout: $timeout}'
-}
-
-# emit <base-single> <service-single> <multi>
-emit() {
-  local legs
-  legs=$( { leg base "${BASE_RUNNER}" "$1"; leg service "${SERVICE_RUNNER}" "$2"; } | jq -sc .)
-  log "base leg: ${1:-none}"
-  log "service leg: ${2:-none}"
-  log "multi: ${3:-none}"
-  printf 'single_legs=%s\n' "$legs"
-  printf 'multi_suites=%s\n' "$(prefixed "$3")"
-  printf 'multi_timeout=%s\n' "$(budget "$3")"
-}
-
-# select_for_paths <newline-separated paths> [all]: base set plus matches.
-# With "all", every mapped suite is selected, for a push with no baseline.
-select_for_paths() {
-  local matched="" p s
-  if [ "${2:-}" = all ]; then
-    matched=$(e2e_path_suites_all | tr '\n' ' ')
-  else
-    while IFS= read -r p; do
-      [ -n "$p" ] || continue
-      for s in $(e2e_suites_for_path "$p"); do
-        in_list "$s" "$matched" || { matched="${matched:+$matched }$s"; log "${p} -> ${s}"; }
-      done
-    done <<<"$1"
-  fi
-  # A matched suite runs where it is eligible, preferring one node, so route53
-  # goes to the service leg and lb to the multi job.
-  local extra_single="" extra_multi=""
-  for s in $matched; do
-    if in_list "$s" "${E2E_SUITES_SINGLE}"; then
-      extra_single="${extra_single:+$extra_single }$s"
-    elif in_list "$s" "${E2E_SUITES_MULTI}"; then
-      extra_multi="${extra_multi:+$extra_multi }$s"
-    else
-      die "E2E_PATH_SUITES names '${s}', which no topology can run"
-    fi
-  done
-  local base_single base_multi
-  base_single=$(keep "${E2E_SUITES_PUSH_BASE}" "${E2E_SUITES_SINGLE}")
-  base_multi=$(keep "${E2E_SUITES_PUSH_BASE}" "${E2E_SUITES_MULTI}")
-  # A matched suite already in the base leg runs there, not twice.
-  extra_single=$(for s in $extra_single; do in_list "$s" "$base_single" || printf '%s ' "$s"; done)
-  emit "$base_single" "$(keep "$extra_single" "${E2E_SUITES_SINGLE}")" \
-    "$(keep "$base_multi $extra_multi" "${E2E_SUITES_MULTI}")"
-}
-
-mode="${1:-}"
-case "$mode" in
-  push)
-    [ $# -eq 3 ] || die "usage: $0 push <before> <sha>"
-    before="$2" sha="$3"
-    git cat-file -e "${sha}^{commit}" 2>/dev/null || die "commit ${sha} is not in this checkout"
-    if [ -z "${before//0/}" ]; then
-      log "no previous commit for this push; selecting every mapped suite"
-      select_for_paths "" all
-      exit 0
-    fi
-    if ! git cat-file -e "${before}^{commit}" 2>/dev/null; then
-      git fetch -q --filter=blob:none origin "${before}" 2>/dev/null || true
-    fi
-    if ! git cat-file -e "${before}^{commit}" 2>/dev/null; then
-      log "previous commit ${before} is gone; selecting every mapped suite"
-      select_for_paths "" all
-      exit 0
-    fi
-    # A rename counts as both paths, so moving code out of a service selects it.
-    changed=$(git diff --no-renames --name-only "${before}" "${sha}") || die "git diff ${before} ${sha} failed"
-    log "$(printf '%s\n' "$changed" | grep -c . || true) paths changed ${before:0:9}..${sha:0:9}"
-    select_for_paths "$changed"
-    ;;
-  suites)
-    [ $# -eq 2 ] || die "usage: $0 suites \"<e2e-x ...>\""
-    if [ -z "${2// /}" ]; then
-      select_for_paths ""
-      exit 0
-    fi
-    requested=$(printf '%s' "$2" | sed 's/e2e-//g')
-    emit "$(keep "$requested" "${E2E_SUITES_SINGLE}")" "" "$(keep "$requested" "${E2E_SUITES_MULTI}")"
-    ;;
-  *)
-    die "usage: $0 push <before> <sha> | suites \"<list>\""
-    ;;
-esac

.github/scripts/go-build-cache.sh

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-# Trims GOCACHE to the entries one CI run used. Go refreshes an entry's mtime
-# on use only when it is over an hour old, so "mark" backdates every restored
-# entry first and "trim" drops whatever this run neither read nor wrote.
-set -euo pipefail
-
-cache="$(go env GOCACHE)"
-mark="${RUNNER_TEMP:?}/go-build-cache.mark"
-
-# stale prints each entry this run did not touch and no touched action entry
-# names. Go skips rewriting an output it already holds, so a fresh action
-# entry can point at a backdated output.
-stale() {
-  local keep="${RUNNER_TEMP}/go-build-cache.keep"
-  find "$cache" -mindepth 2 -maxdepth 2 -name '*-a' -newer "$mark" -exec cat {} + |
-    awk '{ print "/" $3 "-d" }' >"$keep"
-  find "$cache" -mindepth 2 -maxdepth 2 ! -newer "$mark" | { grep -vFf "$keep" || true; }
-}
-
-case "${1:-}" in
-mark)
-  mkdir -p "$cache"
-  find "$cache" -mindepth 2 -maxdepth 2 -exec touch -m -d '2 hours ago' {} +
-  touch "$mark"
-  ;;
-stale | trim)
-  if [[ ! -f "$mark" ]]; then
-    echo "go-build-cache: no mark, leaving the cache untrimmed" >&2
-    exit 0
-  fi
-  if [[ "$1" == stale ]]; then
-    stale
-    exit 0
-  fi
-  before=$(du -sm "$cache" | cut -f1)
-  # An entry is a file, or a directory holding one cached executable whose
-  # mtime Go refreshes in place of the binary's, so it goes as a unit.
-  stale | xargs -r rm -rf --
-  echo "trimmed ${before}MB -> $(du -sm "$cache" | cut -f1)MB"
-  ;;
-*)
-  echo "usage: $0 mark|stale|trim" >&2
-  exit 2
-  ;;
-esac

.github/scripts/hypervisor-disk-preflight_test.sh

@@ -0,0 +1,87 @@
+#!/bin/sh
+# hypervisor-disk-preflight_test.sh — drives hypervisor-disk-preflight.sh against
+# a stub ssh that answers for each hypervisor from a canned file, so every
+# verdict is checked without a real host.
+set -eu
+
+SCRIPT_DIR=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
+PREFLIGHT="$SCRIPT_DIR/hypervisor-disk-preflight.sh"
+TMP=$(mktemp -d)
+trap 'rm -rf "$TMP"' EXIT
+
+fails=0
+pass() { echo "  ok   - $1"; }
+fail() { echo "  FAIL - $1"; fails=$((fails + 1)); }
+
+# The stub answers "<root-kb> <pool-kb> <path>" from $FAKE/<host>, or exits 255
+# when that host has no file, the way ssh does for a host it cannot reach.
+mkdir -p "$TMP/bin" "$TMP/hosts"
+cat > "$TMP/bin/ssh" <<'STUB'
+#!/bin/sh
+for a in "$@"; do case $a in *@*) host=${a#*@} ;; esac; done
+cat >/dev/null
+if [ -f "$FAKE/$host" ]; then cat "$FAKE/$host"; exit 0; fi
+echo "ssh: Could not resolve hostname $host" >&2
+exit 255
+STUB
+chmod +x "$TMP/bin/ssh"
+PATH="$TMP/bin:$PATH"
+FAKE="$TMP/hosts"
+export PATH FAKE
+
+cat > "$TMP/env.tfvars" <<'TFVARS'
+nodes = [
+  { name = "wattle", wan_ip = "192.0.2.1", storage_pool = "drive1-pool", base_image = "/x.qcow2" },
+  # { name = "retired", wan_ip = "192.0.2.9", storage_pool = "drive1-pool", base_image = "/x.qcow2" },
+  { name = "banksia", wan_ip = "192.0.2.2", storage_pool = "nvme1-pool", base_image = "/x.qcow2" },
+]
+TFVARS
+
+GiB=1048576
+plenty="$((50 * GiB)) $((200 * GiB)) /mnt/drive1/pool"
+
+# run <label> <want-rc> <want-text>
+run() {
+    rc=0
+    out=$(bash "$PREFLIGHT" "$TMP/env.tfvars" 2>&1) || rc=$?
+    if [ "$rc" -ne "$2" ]; then
+        fail "$1: exit $rc, want $2"
+        echo "$out" | sed 's/^/        /'
+        return
+    fi
+    case $out in
+        *"$3"*) pass "$1" ;;
+        *) fail "$1: output lacks '$3'"; echo "$out" | sed 's/^/        /' ;;
+    esac
+}
+
+echo "-- hypervisor-disk-preflight.sh"
+
+echo "$plenty" > "$FAKE/wattle"
+echo "$plenty" > "$FAKE/banksia"
+run "every host has room" 0 "banksia: root fs 51200 MiB free"
+
+echo "0 $((200 * GiB)) /mnt/drive1/pool" > "$FAKE/wattle"
+run "a full root filesystem fails fast" 1 "::error::hypervisor wattle has 0 MiB free on the filesystem holding /etc/libvirt/qemu"
+
+echo "$plenty" > "$FAKE/wattle"
+echo "$((50 * GiB)) $((3 * GiB)) /mnt/nvme1/pool" > "$FAKE/banksia"
+run "a nearly full pool fails fast" 1 "::error::hypervisor banksia has 3 GiB free in storage pool nvme1-pool"
+
+echo "$plenty" > "$FAKE/banksia"
+rm -f "$FAKE/wattle"
+run "an unreachable host is reported, not failed" 0 "::warning::hypervisor disk preflight: cannot reach wattle"
+
+echo "$plenty" > "$FAKE/wattle"
+echo "$((50 * GiB)) - -" > "$FAKE/banksia"
+run "a pool libvirt does not know is reported, not failed" 0 "pool nvme1-pool (-) not found"
+
+echo "0 0 /x" > "$FAKE/retired"
+echo "$plenty" > "$FAKE/banksia"
+run "a commented-out node is never checked" 0 "wattle: root fs"
+
+if [ "$fails" -ne 0 ]; then
+    echo "$fails failure(s)"
+    exit 1
+fi
+echo "  hypervisor-disk-preflight ok"

.github/scripts/mulga_design_check.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+"""Warn when a PR body has no filled "Mulga design" line. Reads PR_BODY; never fails the job."""
+
+import os
+import re
+
+COMMENT_RE = re.compile(r"<!--.*?-->", re.S)
+SECTION_RE = re.compile(r"^#{1,6}\s*Mulga design\s*$", re.I)
+LINE_RE = re.compile(r"^\s*(Updated|Not needed)\s*:\s*(.*?)\s*$", re.I)
+PLACEHOLDER_RE = re.compile(r"<[^<>]*>")
+
+
+def filled(body):
+    inside = False
+    for line in COMMENT_RE.sub("", body or "").splitlines():
+        if SECTION_RE.match(line):
+            inside = True
+        elif inside and line.lstrip().startswith("#"):
+            return False
+        elif inside:
+            m = LINE_RE.match(line)
+            if m and PLACEHOLDER_RE.sub("", m.group(2)).strip():
+                return True
+    return False
+
+
+def main():
+    if filled(os.environ.get("PR_BODY", "")):
+        print("The Mulga design line is filled in.")
+    else:
+        print('::warning title=Mulga design::Add a line under "## Mulga design": "Updated: <mulga PR or bead id>" or "Not needed: <reason>".')
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

.github/scripts/suite-sets.sh

@@ -66,67 +66,6 @@ E2E_SUITES_MULTI="multinode lb cert quota route53 kvquorum lbrecovery instancere
 E2E_SUITES_SINGLE_RE="$(printf '%s' "${E2E_SUITES_SINGLE}" | tr ' ' '|')"
 E2E_SUITES_MULTI_RE="$(printf '%s' "${E2E_SUITES_MULTI}" | tr ' ' '|')"
 
-# The push gate always runs this set. A push adds to it the suites whose code
-# it changed, by E2E_PATH_SUITES below; a dispatch names its own set instead.
-E2E_SUITES_PUSH_BASE="single multinode cert iam partialblock"
-
-# "suite prefix" pairs: a push changing a path under prefix adds suite. The
-# recovery and fault suites stay nightly, and shared code adds nothing because
-# the base set covers it. Image directories carry each guest's own scripts.
-E2E_PATH_SUITES="
-rds cmd/rds-agent/
-rds internal/rdsgw/
-rds spinifex/agents/rds/
-rds spinifex/domains/rds/
-rds tests/e2e/rds/
-rds scripts/images/rds-mariadb/
-rds scripts/images/rds-postgres/
-ecs cmd/ecs-agent/
-ecs contracts/ecs/
-ecs internal/ecsgw/
-ecs spinifex/agents/ecs/
-ecs spinifex/domains/ecs/
-ecs tests/e2e/ecs/
-ecs scripts/images/ecs-agent/
-eks cmd/eks-
-eks contracts/eks/
-eks internal/eksgw/
-eks spinifex/agents/eks/
-eks spinifex/domains/eks/
-eks tests/e2e/eks/
-eks scripts/images/eks-node/
-rds scripts/images/common/
-ecs scripts/images/common/
-eks scripts/images/common/
-rds scripts/build-system-image.sh
-ecs scripts/build-system-image.sh
-eks scripts/build-system-image.sh
-route53 spinifex/domains/route53/
-route53 tests/e2e/route53/
-lb cmd/lb-agent/
-lb spinifex/agents/elbv2/
-lb spinifex/domains/elbv2/
-lb tests/e2e/lb/
-"
-
-# Every suite E2E_PATH_SUITES can name, once each, in table order.
-#   e2e_path_suites_all
-e2e_path_suites_all() {
-  printf '%s\n' "${E2E_PATH_SUITES}" | awk 'NF == 2 && !seen[$1]++ { print $1 }'
-}
-
-# The suites a change to <path> triggers, one per line.
-#   e2e_suites_for_path <path>
-e2e_suites_for_path() {
-  local path="$1" suite prefix
-  while read -r suite prefix; do
-    [ -n "${prefix}" ] || continue
-    case "${path}" in
-      "${prefix}"*) printf '%s\n' "${suite}" ;;
-    esac
-  done <<<"${E2E_PATH_SUITES}"
-}
-
 # What every e2e-nightly permutation cell must prove, deliberately narrower
 # than the two sets above: those cells have a 35-minute budget and exist to show
 # that every install / network / host-OS combination boots and serves. The

.github/scripts/test_mulga_design_check.py

@@ -0,0 +1,23 @@
+import unittest
+
+from mulga_design_check import filled
+
+
+class FilledTest(unittest.TestCase):
+    def test_accepts_either_form(self):
+        self.assertTrue(filled("## Mulga design\nUpdated: mulga#275"))
+        self.assertTrue(filled("## Mulga design\n\nnot needed: internal refactor\n## Next"))
+
+    def test_rejects_unanswered(self):
+        self.assertFalse(filled(""))
+        self.assertFalse(filled("## Mulga design\n<!-- Updated: x -->"))
+        self.assertFalse(filled("## Mulga design\nUpdated: <mulga PR or bead id>"))
+        self.assertFalse(filled("## Mulga design\nUpdated:"))
+
+    def test_scoped_to_the_section(self):
+        self.assertFalse(filled("Updated: mulga#1"))
+        self.assertFalse(filled("## Mulga design\n## Other\nUpdated: mulga#1"))
+
+
+if __name__ == "__main__":
+    unittest.main()

.github/scripts/wait-for-memory_test.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+# wait-for-memory_test.sh — drives wait-for-memory.sh against a fake meminfo
+# that a background writer changes mid-wait, so each verdict is checked without
+# a loaded host.
+set -eu
+
+SCRIPT_DIR=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
+WAIT="$SCRIPT_DIR/wait-for-memory.sh"
+TMP=$(mktemp -d)
+trap 'rm -rf "$TMP"' EXIT
+
+fails=0
+pass() { echo "  ok   - $1"; }
+fail() { echo "  FAIL - $1"; fails=$((fails + 1)); }
+
+meminfo() { printf 'MemTotal:       65536000 kB\nMemAvailable:   %s kB\n' "$(( $1 * 1024 ))" > "$TMP/meminfo"; }
+MEMINFO="$TMP/meminfo"
+MEM_WAIT_POLL_S=1
+export MEMINFO MEM_WAIT_POLL_S
+
+meminfo 30000
+if MEM_WAIT_TIMEOUT_S=5 bash "$WAIT" 26624 > "$TMP/out" 2>&1; then
+  pass "enough memory returns at once"
+else
+  fail "enough memory returns at once: $(cat "$TMP/out")"
+fi
+
+meminfo 21577
+( sleep 2; meminfo 30000 ) &
+if MEM_WAIT_TIMEOUT_S=20 bash "$WAIT" 26624 > "$TMP/out" 2>&1 && grep -q waiting "$TMP/out"; then
+  pass "memory freed mid-wait is admitted"
+else
+  fail "memory freed mid-wait is admitted: $(cat "$TMP/out")"
+fi
+wait
+
+meminfo 21577
+if MEM_WAIT_TIMEOUT_S=2 bash "$WAIT" 26624 > "$TMP/out" 2>&1; then
+  fail "memory that never frees fails: exited 0"
+elif grep -q '::error::need 26624 MiB available, have 21577 MiB' "$TMP/out" && grep -q 'RSS' "$TMP/out"; then
+  pass "memory that never frees fails and names the biggest processes"
+else
+  fail "memory that never frees fails and names the biggest processes: $(cat "$TMP/out")"
+fi
+
+[ "$fails" -eq 0 ] || { echo "wait-for-memory: $fails failed"; exit 1; }
+echo "wait-for-memory: all passed"

.github/workflows/actions.lock

@@ -50,6 +50,8 @@ workflows:
     '.github/workflows/image-scripts.yml':
         - 'actions/checkout@v7.0.1'
         - 'actions/setup-go@v7.0.0'
+    '.github/workflows/mulga-design.yml':
+        - 'actions/checkout@v7.0.1'
     '.github/workflows/perf-3node.yml':
         - 'actions/checkout@v7.0.1'
         - 'actions/create-github-app-token@v3.3.0'

.github/workflows/dev-release.yml

@@ -30,10 +30,6 @@ concurrency:
 jobs:
   prerelease:
     runs-on: ubuntu-26.04
-    env:
-      # Dev prereleases, newest published first: GitHub lists releases by tag name
-      # as text, so list order is not build order. The install Worker uses this rule.
-      DEV_RELEASES_JQ: '[.[] | select(.draft == false and .prerelease and .published_at != null and (.tag_name | test("-dev(\\.|$)")))] | sort_by(.published_at) | reverse'
     steps:
       # Full history and tags, because the tag name is git describe and a shallow
       # clone has no tag to describe against.
@@ -168,12 +164,12 @@ jobs:
               exit 1
           fi
           echo "latest is still $latest"
-          dev="$(gh api "repos/$GITHUB_REPOSITORY/releases?per_page=100" --jq "$DEV_RELEASES_JQ | .[0].tag_name")"
+          dev="$(gh api "repos/$GITHUB_REPOSITORY/releases?per_page=20" --jq 'map(select(.prerelease))[0].tag_name')"
           [ "$dev" = "$TAG" ] || { echo "::error::the dev channel resolves to $dev, not $TAG"; exit 1; }
 
-      # Kept rather than unbounded: the Worker reads one page of releases to resolve
-      # the channel, so enough prereleases would eventually push the newest off it.
-      # Five leaves a few recent builds to roll back to.
+      # Kept rather than unbounded: the Worker reads the first page of releases to
+      # resolve the channel, so enough prereleases would eventually push the real
+      # ones off it. Five leaves a few recent builds to roll back to.
       - name: Prune old dev prereleases
         if: steps.version.outputs.exists != 'true'
         env:
@@ -181,7 +177,7 @@ jobs:
         run: |
           set -euo pipefail
           gh api "repos/$GITHUB_REPOSITORY/releases?per_page=100" \
-              --jq "$DEV_RELEASES_JQ | .[5:] | .[].tag_name" \
+              --jq 'map(select(.prerelease and (.tag_name | endswith("-dev")))) | .[5:] | .[].tag_name' \
               > stale.txt
           while read -r tag; do
               [ -n "$tag" ] || continue

.github/workflows/e2e-nightly.yml

@@ -6,32 +6,11 @@ name: E2E Nightly
 # `main` and `dev` as separate nightlies, and it would always execute `main`'s
 # copy of this file — leaving a fix to the workflow itself untestable until it
 # had already shipped. A dispatch takes both the file and the source from its ref.
-#
-# Cells (matrix cells are defined in .github/e2e-cells.json):
-#
-#   Single node                       Three nodes
-#    1  Debian 13, DHCP                 8  Debian 13, DHCP
-#    2  Ubuntu 26.04, static            9  Ubuntu 26.04, static
-#    3  Ubuntu 26.04, DHCP             10  Ubuntu 26.04, DHCP
-#   17  tofu examples                  29  storage fault injection
-#   18  reboot                         30  routed NAT
-#   19  routed NAT                     31  instance recovery
-#   25  eks                            32  load balancer recovery
-#   26  ecs                            33  KV bucket quorum under node loss
-#   27  rds                            37  Oracle Linux 10, DHCP
-#   34  Oracle Linux 10, DHCP          38  Oracle Linux 10, routed NAT
-#   35  Oracle Linux 10, reboot
-#   36  Oracle Linux 10, routed NAT
-#
-#   Standalone jobs
-#   20  bare metal (PXE)               23  predastore throughput
-#   21  ISO, single node               24  predastore fault injection
-#   22  ISO, three nodes               28  guest disk performance (bare metal)
 on:
   workflow_dispatch:
     inputs:
       cells:
-        description: "Comma-separated cell numbers, no spaces, e.g. 1,25,27 (blank = all). The cell list is at the top of .github/workflows/e2e-nightly.yml."
+        description: "Comma-separated cell numbers to run, no spaces (blank = all). 1-3, 8-10, 17-19 tofu permutation matrix, 34-36 Oracle Linux single node (basic, reboot, routed NAT), 37-38 Oracle Linux on three nodes (multi-node subset with IPsec, routed NAT), 20 baremetal, 21-22 ISO, 23 predastore throughput, 24 predastore fault injection, 25-27 service suites (eks, ecs, rds), 28 guest disk performance, 29 storage fault injection, 30 routed NAT on three nodes, 31 instance recovery on three nodes, 32 load balancer recovery on three nodes, 33 KV bucket quorum under node loss on three nodes"
         required: false
 
 permissions:
@@ -1038,7 +1017,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ env.GIT_BRANCH }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: mulga/spinifex
 
       - uses: actions/checkout@v7.0.1
@@ -1296,7 +1275,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ env.GIT_BRANCH }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: mulga/spinifex
 
       - uses: actions/checkout@v7.0.1
@@ -1444,7 +1423,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ github.ref_name }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: spinifex
 
       - name: Checkout Predastore
@@ -1568,7 +1547,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ github.ref_name }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: spinifex
 
       - name: Checkout Predastore

.github/workflows/e2e.yml

@@ -12,15 +12,13 @@ on:
       - go.sum
       - Makefile
       - tests/e2e/**
-      - scripts/images/**
-      - scripts/build-system-image.sh
       - .github/workflows/e2e.yml
   workflow_dispatch:
     inputs:
       suites:
         description: "Space-separated Make targets to run (e.g. 'e2e-single e2e-multinode e2e-cert e2e-lb e2e-eks e2e-iam e2e-rds')"
         required: false
-        default: "e2e-single e2e-multinode e2e-cert e2e-iam"
+        default: "e2e-single e2e-multinode e2e-cert e2e-lb e2e-iam"
       test_run:
         description: "Optional regex for -test.run (e.g. '^TestMultinodeIPSec$'). Empty = run all tests in suite."
         required: false
@@ -33,75 +31,86 @@ permissions:
 
 env:
   GIT_BRANCH: ${{ github.ref_name }}
+  SUITES: ${{ inputs.suites || 'e2e-single e2e-multinode e2e-cert e2e-lb e2e-iam e2e-partialblock' }}
   TEST_RUN: ${{ inputs.test_run || '' }}
   SPINIFEX_OTLP_ENDPOINT: ${{ vars.SPINIFEX_OTLP_ENDPOINT || 'http://192.168.1.13:8200' }}
   SPINIFEX_OTEL_ATTRS: ci.run_id=${{ github.run_id }},ci.workflow=${{ github.workflow }}
 
 jobs:
-  # A push runs the base set plus the suites its changed paths map to in
-  # suite-sets.sh; a dispatch runs its suites input, or the base set if empty.
-  # Budgets come from the suites' own timeouts there.
+  # The inner timeout must fire before the outer one. `go test` reports where it
+  # stopped and the suite's own failure; a job cancelled on timeout reports only
+  # "The operation was canceled" and takes the artifacts with it.
+  #
+  # A job budget cannot be a literal here because the suite set is a dispatch
+  # input: storagefault asks for 90m and diskperf for 180m, both eligible on one
+  # node, so any fixed number is either wrong for them or wasteful for everyone
+  # else. Resolving it from suite-sets.sh keeps the one source of truth and
+  # leaves the default push set at exactly the 60m it has always had.
   plan:
-    name: Select Suites
+    name: Resolve Job Budgets
     runs-on: ubuntu-26.04
     timeout-minutes: 5
     outputs:
-      single_legs: ${{ steps.select.outputs.single_legs }}
-      multi_suites: ${{ steps.select.outputs.multi_suites }}
-      multi_timeout: ${{ steps.select.outputs.multi_timeout }}
+      single_timeout: ${{ steps.budgets.outputs.single_timeout }}
+      multi_timeout: ${{ steps.budgets.outputs.multi_timeout }}
     steps:
-      # Full history without file contents: the diff needs both commits' trees.
       - uses: actions/checkout@v7.0.1
         with:
           path: spinifex
-          fetch-depth: 0
-          filter: blob:none
           sparse-checkout: .github/scripts
 
-      - name: Select suites
-        id: select
-        working-directory: spinifex
+      - name: Resolve Budgets
+        id: budgets
         env:
-          EVENT: ${{ github.event_name }}
-          BEFORE: ${{ github.event.before }}
-          IN_SUITES: ${{ inputs.suites }}
+          # Provision, install and teardown around the suites, plus the headroom
+          # a multi-suite job needs for whatever ran before the one that hangs.
+          SETUP_ALLOWANCE_MIN: 15
+          # What the job has always had. Kept as a floor so resolving the budget
+          # can only ever raise it, never quietly shorten an existing run.
+          FLOOR_MIN: 60
         run: |
-          set -euo pipefail
-          SELECT=.github/scripts/e2e-select.sh
-          if [ "${EVENT}" = push ]; then
-            bash "${SELECT}" push "${BEFORE}" "${GITHUB_SHA}" | tee -a "$GITHUB_OUTPUT"
-          else
-            bash "${SELECT}" suites "${IN_SUITES}" | tee -a "$GITHUB_OUTPUT"
-          fi
+          . "${GITHUB_WORKSPACE}/spinifex/.github/scripts/suite-sets.sh"
+          # Only max() is a sound bound: the suites share one job, so a sum would
+          # demand hours for a set that has never taken them. Max is what makes
+          # the hanging suite panic on its own timeout first, which is the point.
+          budget() {
+            local want="${FLOOR_MIN}" s t
+            for s in $(echo "${SUITES}" | sed 's/e2e-//g' | tr ' ' '\n' | grep -xE "$1"); do
+              t="$(e2e_suite_timeout "${s}")"
+              t=$(( ${t%m} + SETUP_ALLOWANCE_MIN ))
+              [ "${t}" -gt "${want}" ] && want="${t}"
+            done
+            echo "${want}"
+          }
+          single=$(budget "${E2E_SUITES_SINGLE_RE}")
+          multi=$(budget "${E2E_SUITES_MULTI_RE}")
+          echo "single_timeout=${single}" >> "$GITHUB_OUTPUT"
+          echo "multi_timeout=${multi}" >> "$GITHUB_OUTPUT"
+          echo "suites='${SUITES}' -> single ${single}m, multi ${multi}m"
 
   e2e_single:
-    # The base leg keeps the job and artifact names it always had: mulga's
-    # registry intake finds a run's results by them.
-    name: ${{ matrix.leg == 'base' && 'Single-Node E2E' || format('Single-Node E2E ({0})', matrix.leg) }}
-    # `base` runs on ci-single; `service`, on ci-pseudo, carries the matched
-    # single-node suites so a long one stays off the base leg's critical path.
-    if: needs.plan.outputs.single_legs != '[]'
+    name: Single-Node E2E
+    # The dispatch check gates on exactly the suites this job's Run step
+    # allow-lists, i.e. E2E_SUITES_SINGLE in .github/scripts/suite-sets.sh —
+    # an `if:` expression cannot source that file, so this one list is
+    # hand-mirrored and must be updated with it. Gating on a suite the job
+    # won't run — lb, which only executes in the multinode job — would
+    # provision a tofu VM and pay the Spinifex install only to run nothing and
+    # tear down. Push triggers keep running via the null-check on
+    # inputs.suites.
+    if: github.event_name != 'workflow_dispatch' || contains(github.event.inputs.suites, 'e2e-single') || contains(github.event.inputs.suites, 'e2e-iam') || contains(github.event.inputs.suites, 'e2e-cert') || contains(github.event.inputs.suites, 'e2e-eks') || contains(github.event.inputs.suites, 'e2e-ecs') || contains(github.event.inputs.suites, 'e2e-storagegrowth') || contains(github.event.inputs.suites, 'e2e-partialblock') || contains(github.event.inputs.suites, 'e2e-rds')
     needs: plan
-    runs-on: [self-hosted, "${{ matrix.runner }}"]
-    timeout-minutes: ${{ matrix.timeout }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.plan.outputs.single_legs) }}
+    runs-on: [self-hosted, ci-single]
+    timeout-minutes: ${{ fromJSON(needs.plan.outputs.single_timeout) }}
     env:
-      SUITES: ${{ matrix.suites }}
-      # Both legs can run on banksia at once, so every host path carries the leg.
-      TOFU_LOG: /tmp/e2e-tofu-single-${{ github.run_id }}-${{ matrix.leg }}.log
-      ARTIFACT_DIR: /tmp/spinifex-e2e-artifacts-${{ github.run_id }}-${{ matrix.leg }}
-      # The base leg keeps the cell name it always had, so its history in
-      # Elastic and telemetry continues; any other leg appends its name.
-      E2E_CELL: ${{ matrix.leg == 'base' && 'single' || format('single-{0}', matrix.leg) }}
+      TOFU_LOG: /tmp/e2e-tofu-single-${{ github.run_id }}.log
+      ARTIFACT_DIR: /tmp/spinifex-e2e-artifacts-${{ github.run_id }}
       # Job-level env wins over the workflow-level default. This job and
       # e2e_multi share one run id and both name their hosts node1/node2/node3,
       # so without ci.cell their telemetry collapses into one bucket. This job
       # is where "Bootstrap via Binary Install" bakes SPINIFEX_OTEL_ATTRS into
       # the VM's telemetry.env, so the label has to be set here.
-      SPINIFEX_OTEL_ATTRS: ci.run_id=${{ github.run_id }},ci.workflow=${{ github.workflow }},ci.cell=${{ matrix.leg == 'base' && 'single' || format('single-{0}', matrix.leg) }}
+      SPINIFEX_OTEL_ATTRS: ci.run_id=${{ github.run_id }},ci.workflow=${{ github.workflow }},ci.cell=single
     steps:
       - name: Reap Orphan Procs
         run: |
@@ -171,7 +180,7 @@ jobs:
       - name: Resolve CI job id
         uses: $/.github/actions/otel-job-id
         with:
-          job-name: ${{ matrix.leg == 'base' && 'Single-Node E2E' || format('Single-Node E2E ({0})', matrix.leg) }}
+          job-name: Single-Node E2E
 
       - name: Build Install Artifacts
         working-directory: mulga/scripts/tofu-cluster
@@ -215,12 +224,6 @@ jobs:
           echo "wan_ip=${WAN_IP}" >> "$GITHUB_OUTPUT"
           echo "ssh_key=${SSH_KEY}" >> "$GITHUB_OUTPUT"
 
-      # build-system-image.sh reuses a raw image under ten minutes old from
-      # its build directory, and every runner on banksia shares the default
-      # one in /tmp, so a job could test another commit's guest agent.
-      - name: Use a per-job image build directory
-        run: echo "SYSTEM_IMAGE_BUILD_DIR=${RUNNER_TEMP}/system-image-build" >> "$GITHUB_ENV"
-
       # The eks suite's CreateCluster boots a control-plane VM from the
       # eks-node AMI, so that AMI must exist in the VM's image store before the
       # suite runs. build-system-image.sh customizes the image with libguestfs
@@ -244,7 +247,7 @@ jobs:
           group_open "make build-eks-node-image"
           make build-eks-node-image
           group_close
-          ok "raw: $(du -h "${SYSTEM_IMAGE_BUILD_DIR}/eks-node-image-build/eks-node-alpine.raw" | cut -f1)"
+          ok "raw: $(du -h /tmp/eks-node-image-build/eks-node-alpine.raw | cut -f1)"
 
       - name: Import eks-node AMI on VM
         if: contains(env.SUITES, 'e2e-eks')
@@ -256,16 +259,13 @@ jobs:
           SSH_OPTS=(-o StrictHostKeyChecking=no -i "${{ steps.vm.outputs.ssh_key }}")
           VM=tf-user@${{ steps.vm.outputs.wan_ip }}
           banner "import eks-node AMI to VM image store"
-          # The VM's /tmp is a tmpfs and scp writes each raw at its full size,
-          # so every import removes its file before the next image arrives.
           scp "${SSH_OPTS[@]}" \
-            "${SYSTEM_IMAGE_BUILD_DIR}/eks-node-image-build/eks-node-alpine.raw" \
+            /tmp/eks-node-image-build/eks-node-alpine.raw \
             "$VM":/tmp/eks-node-alpine.raw
           ssh "${SSH_OPTS[@]}" "$VM" \
             "spx admin images import --file /tmp/eks-node-alpine.raw \
                --distro alpine --version ${ALPINE_VERSION} --arch x86_64 \
-               --boot-mode bios --ami-name ${AMI_NAME} --tag ${SYSTEM_TAG}; \
-               rc=\$?; rm -f /tmp/eks-node-alpine.raw; exit \$rc" >/dev/null 2>&1
+               --boot-mode bios --ami-name ${AMI_NAME} --tag ${SYSTEM_TAG}" >/dev/null 2>&1
           ok "eks-node AMI imported"
 
       # The eks data-plane subtest (TestEKS/KubectlGetNodes) drives the full
@@ -299,40 +299,6 @@ jobs:
           EOF
           ok "kubectl installed on VM"
 
-      # The ecs suite boots its container instance from the ecs-node AMI, found
-      # by its managed-by tag, so the tag matters. The build directory is named
-      # for the manifest's IMAGE_NAME (ecs-agent), not for the make target.
-      - name: Build ecs-node AMI (libguestfs, runner)
-        if: contains(env.SUITES, 'e2e-ecs')
-        working-directory: spinifex
-        run: |
-          set -euo pipefail
-          # direct backend = no libvirt. Set here rather than in the script:
-          # it has to be in the environment the build itself runs in.
-          export LIBGUESTFS_BACKEND=direct
-          "${GITHUB_WORKSPACE}/spinifex/.github/scripts/ensure-libguestfs.sh"
-          make build-ecs-node-image
-
-      - name: Import ecs-node AMI on VM
-        if: contains(env.SUITES, 'e2e-ecs')
-        run: |
-          set -euo pipefail
-          source "${GITHUB_WORKSPACE}/spinifex/.github/scripts/ci-fmt.sh"
-          eval "$(grep -E '^(ALPINE_VERSION|AMI_NAME|SYSTEM_TAG)=' \
-            spinifex/scripts/images/ecs-agent/manifest.conf)"
-          SSH_OPTS=(-o StrictHostKeyChecking=no -i "${{ steps.vm.outputs.ssh_key }}")
-          VM=tf-user@${{ steps.vm.outputs.wan_ip }}
-          banner "import ecs-node AMI to VM image store"
-          scp "${SSH_OPTS[@]}" \
-            "${SYSTEM_IMAGE_BUILD_DIR}/ecs-agent-image-build/ecs-agent-alpine.raw" \
-            "$VM":/tmp/ecs-agent-alpine.raw
-          ssh "${SSH_OPTS[@]}" "$VM" \
-            "spx admin images import --file /tmp/ecs-agent-alpine.raw \
-               --distro alpine --version ${ALPINE_VERSION} --arch x86_64 \
-               --boot-mode bios --ami-name ${AMI_NAME} --tag ${SYSTEM_TAG}; \
-               rc=\$?; rm -f /tmp/ecs-agent-alpine.raw; exit \$rc" >/dev/null 2>&1
-          ok "ecs-node AMI imported"
-
       # CreateDBInstance boots the DB VM from an RDS AMI, so both engines' images
       # must be in the VM's image store before the suite runs — same split as the
       # eks-node pair above: build on the runner (needs source + network), import
@@ -355,7 +321,7 @@ jobs:
             group_open "make build-${IMAGE}-image"
             make "build-${IMAGE}-image"
             group_close
-            ok "raw: $(du -h "${SYSTEM_IMAGE_BUILD_DIR}/${IMAGE}-image-build/${IMAGE}-alpine.raw" | cut -f1)"
+            ok "raw: $(du -h "/tmp/${IMAGE}-image-build/${IMAGE}-alpine.raw" | cut -f1)"
           done
 
       - name: Import RDS AMIs on VM
@@ -377,13 +343,12 @@ jobs:
             for tag in ${SYSTEM_TAG}; do TAG_ARGS="${TAG_ARGS} --tag ${tag}"; done
             banner "import ${IMAGE} AMI to VM image store"
             scp "${SSH_OPTS[@]}" \
-              "${SYSTEM_IMAGE_BUILD_DIR}/${IMAGE}-image-build/${IMAGE}-alpine.raw" \
+              "/tmp/${IMAGE}-image-build/${IMAGE}-alpine.raw" \
               "$VM":"/tmp/${IMAGE}-alpine.raw"
             ssh "${SSH_OPTS[@]}" "$VM" \
               "spx admin images import --file /tmp/${IMAGE}-alpine.raw \
                  --distro alpine --version ${ALPINE_VERSION} --arch x86_64 \
-                 --boot-mode bios --ami-name ${AMI_NAME}${TAG_ARGS}; \
-                 rc=\$?; rm -f /tmp/${IMAGE}-alpine.raw; exit \$rc" >/dev/null 2>&1
+                 --boot-mode bios --ami-name ${AMI_NAME}${TAG_ARGS}" >/dev/null 2>&1
             ok "${IMAGE} AMI imported"
           done
 
@@ -561,7 +526,7 @@ jobs:
         uses: $/.github/actions/junit-to-es
         with:
           junit-glob: ${{ env.ARTIFACT_DIR }}/junit-*.xml
-          cell: ${{ env.E2E_CELL }}
+          cell: single
 
       - name: Analyze e2e failures
         if: always()
@@ -581,7 +546,7 @@ jobs:
       - uses: actions/upload-artifact@v7.0.2
         if: always()
         with:
-          name: ${{ matrix.leg == 'base' && format('e2e-artifacts-{0}', github.run_id) || format('e2e-artifacts-{0}-{1}', github.run_id, matrix.leg) }}
+          name: e2e-artifacts-${{ github.run_id }}
           path: ${{ env.ARTIFACT_DIR }}
           if-no-files-found: warn
           retention-days: 14
@@ -624,7 +589,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v7.0.2
         with:
-          name: ${{ matrix.leg == 'base' && format('tofu-log-single-{0}', github.run_id) || format('tofu-log-single-{0}-{1}', github.run_id, matrix.leg) }}
+          name: tofu-log-single-${{ github.run_id }}
           path: ${{ env.TOFU_LOG }}
           if-no-files-found: ignore
           retention-days: 14
@@ -640,13 +605,15 @@ jobs:
 
   e2e_multi:
     name: Multi-Node E2E
-    # Runs when the plan job selected any multi-node suite, and only then.
-    if: needs.plan.outputs.multi_suites != ''
+    # The dispatch check gates on exactly the suites this job's Run step
+    # allow-lists (multinode|lb|cert) so lb — which only runs here — still
+    # provisions the 3-node env when requested on its own, and the env stays
+    # unprovisioned when none of them are asked for.
+    if: github.event_name != 'workflow_dispatch' || contains(github.event.inputs.suites, 'e2e-multinode') || contains(github.event.inputs.suites, 'e2e-lb') || contains(github.event.inputs.suites, 'e2e-cert')
     needs: plan
     runs-on: [self-hosted, ci-multi]
     timeout-minutes: ${{ fromJSON(needs.plan.outputs.multi_timeout) }}
     env:
-      SUITES: ${{ needs.plan.outputs.multi_suites }}
       TOFU_LOG: /tmp/e2e-tofu-multi-${{ github.run_id }}.log
       ARTIFACT_DIR: /tmp/spinifex-e2e-multi-artifacts-${{ github.run_id }}
       # See the matching note on e2e_single: ci.cell is what separates this
@@ -1103,10 +1070,7 @@ jobs:
   e2e_status:
     name: Report E2E Status
     if: always()
-    # plan is a dependency because a failed plan skips both e2e jobs, and a
-    # skipped job counts as passed below: without it a broken selection would
-    # report green having run nothing.
-    needs: [plan, e2e_single, e2e_multi]
+    needs: [e2e_single, e2e_multi]
     runs-on: ubuntu-26.04
     timeout-minutes: 5
     steps:
@@ -1115,16 +1079,15 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           REPORT_SHA: ${{ github.sha }}
         run: |
-          plan_ok=true; single_ok=true; multi_ok=true
-          [ "${{ needs.plan.result }}" = success ] || plan_ok=false
+          single_ok=true; multi_ok=true
           case "${{ needs.e2e_single.result }}" in success|skipped) ;; *) single_ok=false ;; esac
           case "${{ needs.e2e_multi.result }}" in success|skipped) ;; *) multi_ok=false ;; esac
-          if $plan_ok && $single_ok && $multi_ok; then
+          if $single_ok && $multi_ok; then
             STATE="success"
             DESC="E2E suites passed"
           else
             STATE="failure"
-            DESC="E2E failed: plan=${{ needs.plan.result }} single=${{ needs.e2e_single.result }} multi=${{ needs.e2e_multi.result }}"
+            DESC="E2E failed: single=${{ needs.e2e_single.result }} multi=${{ needs.e2e_multi.result }}"
           fi
           gh api "repos/${{ github.repository }}/statuses/${REPORT_SHA}" \
             -f state="$STATE" \
@@ -1141,7 +1104,7 @@ jobs:
   # status-report check.
   e2e_es_summary:
     name: ES CI Run Summary
-    needs: [plan, e2e_single, e2e_multi]
+    needs: [e2e_single, e2e_multi]
     if: always()
     runs-on: [self-hosted, ci-single]
     timeout-minutes: 5
@@ -1153,11 +1116,6 @@ jobs:
       # this host, so no credentials are needed for the POST.
       MULGA_ES_SINK: ${{ vars.MULGA_ES_SINK || '192.168.1.13:9200' }}
     steps:
-      # The workspace outlives the run on a self-hosted runner, and the status
-      # files are collected recursively, so an earlier run's would count here.
-      - name: Clear previous summary downloads
-        run: rm -rf "${GITHUB_WORKSPACE}/es-summary-single" "${GITHUB_WORKSPACE}/es-summary-multi"
-
       # Either leg may not have run (e.g. a workflow_dispatch that only
       # requested single-node suites), so a missing artifact is tolerated —
       # the aggregation script below treats an absent suite-status.txt as
@@ -1166,7 +1124,7 @@ jobs:
         uses: actions/download-artifact@v8.0.2
         continue-on-error: true
         with:
-          pattern: e2e-artifacts-${{ github.run_id }}*
+          name: e2e-artifacts-${{ github.run_id }}
           path: ${{ github.workspace }}/es-summary-single
 
       - name: Download multi-node artifacts
@@ -1186,7 +1144,6 @@ jobs:
           BRANCH: ${{ github.head_ref || github.ref_name }}
           SHA: ${{ github.sha }}
           SERVER_URL: ${{ github.server_url }}
-          PLAN_RESULT: ${{ needs.plan.result }}
           SINGLE_RESULT: ${{ needs.e2e_single.result }}
           MULTI_RESULT: ${{ needs.e2e_multi.result }}
           SINGLE_DIR: ${{ github.workspace }}/es-summary-single
@@ -1194,8 +1151,7 @@ jobs:
         run: |
           set -euo pipefail
 
-          # One subdirectory per single-node leg's artifact.
-          SINGLE_STATUS=$(find "${SINGLE_DIR}" -name suite-status.txt 2>/dev/null | sort || true)
+          SINGLE_STATUS="${SINGLE_DIR}/suite-status.txt"
           MULTI_STATUS="${MULTI_DIR}/suite-status.txt"
 
           # Collect "<suite>: FAILED" lines from both legs' suite-status.txt
@@ -1204,9 +1160,7 @@ jobs:
           # rather than a bash array so this stays correct under `set -u`
           # even when nothing failed.
           FAILED_SUITES=""
-          # SINGLE_STATUS is a newline-separated list, so it is split here.
-          # shellcheck disable=SC2086
-          for f in ${SINGLE_STATUS} "$MULTI_STATUS"; do
+          for f in "$SINGLE_STATUS" "$MULTI_STATUS"; do
             [ -f "$f" ] || continue
             while IFS= read -r line; do
               case "$line" in
@@ -1226,7 +1180,7 @@ jobs:
           case "$MULTI_RESULT" in success | skipped) ;; *) multi_ok=false ;; esac
 
           STATE=success
-          if [ "$PLAN_RESULT" != success ] || [ "$single_ok" != true ] || [ "$multi_ok" != true ] || [ "$FAILED_COUNT" -gt 0 ]; then
+          if [ "$single_ok" != true ] || [ "$multi_ok" != true ] || [ "$FAILED_COUNT" -gt 0 ]; then
             STATE=failure
           fi
 

.github/workflows/mulga-design.yml

@@ -0,0 +1,33 @@
+name: Mulga design
+
+# Reminds the author to say whether the Mulga design records need to change.
+# It reads only the pull request body, uses no secrets, and warns without ever
+# failing: the check is a prompt, not a gate.
+
+on:
+  pull_request:
+    branches:
+      - dev
+    types: [opened, edited, reopened]
+
+permissions:
+  contents: read
+
+jobs:
+  mulga_design:
+    name: Mulga design line
+    if: ${{ !endsWith(github.actor, '[bot]') }}
+    runs-on: ubuntu-26.04
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v7.0.1
+        with:
+          sparse-checkout: .github/scripts
+
+      - name: Check the Mulga design line
+        env:
+          PR_BODY: ${{ github.event.pull_request.body }}
+        working-directory: .github/scripts
+        run: |
+          python3 -m unittest -q test_mulga_design_check
+          python3 mulga_design_check.py

.github/workflows/perf-3node.yml

@@ -113,7 +113,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ env.GIT_BRANCH }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: spinifex
 
       - uses: actions/checkout@v7.0.1

.github/workflows/publish-system-ami.yml

@@ -84,7 +84,7 @@ jobs:
 
       - name: Resolve sibling release tags from go.mod
         id: siblings
-        run: bash spinifex/.github/scripts/resolve-release-sibling-refs.sh spinifex/go.mod
+        run: bash spinifex/.github/resolve-release-sibling-refs.sh spinifex/go.mod
 
       - name: Checkout Viperblock
         uses: actions/checkout@v7.0.1

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Resolve sibling release tags from go.mod
         id: siblings
-        run: bash spinifex/.github/scripts/resolve-release-sibling-refs.sh spinifex/go.mod
+        run: bash spinifex/.github/resolve-release-sibling-refs.sh spinifex/go.mod
 
       - name: Checkout Predastore
         uses: actions/checkout@v7.0.1
@@ -85,7 +85,7 @@ jobs:
 
       - name: Resolve sibling release tags from go.mod
         id: siblings
-        run: bash spinifex/.github/scripts/resolve-release-sibling-refs.sh spinifex/go.mod
+        run: bash spinifex/.github/resolve-release-sibling-refs.sh spinifex/go.mod
 
       - name: Checkout Predastore
         uses: actions/checkout@v7.0.1
@@ -335,7 +335,7 @@ jobs:
 
       - name: Resolve sibling release tags from go.mod
         id: siblings
-        run: bash spinifex/.github/scripts/resolve-release-sibling-refs.sh spinifex/go.mod
+        run: bash spinifex/.github/resolve-release-sibling-refs.sh spinifex/go.mod
 
       - name: Checkout Predastore
         uses: actions/checkout@v7.0.1

.github/workflows/segscan-oracle.yml

@@ -34,7 +34,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: spinifex
 
       - name: Checkout Viperblock

.github/workflows/spinifex.yml

@@ -20,12 +20,6 @@ on:
 permissions:
   contents: read
 
-# A newer push to the same pull request supersedes its run. Pushes and dispatches
-# get a group of their own, so every commit on dev and main keeps its result.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   build_and_test:
     name: Build and Test
@@ -42,7 +36,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: spinifex
 
       - name: Checkout Viperblock
@@ -105,13 +99,6 @@ jobs:
           key: gobuild-${{ github.job }}-${{ github.run_id }}
           restore-keys: gobuild-${{ github.job }}-
 
-      # Go refreshes an entry's mtime on use only when it is over an hour old, so
-      # restored entries are backdated past that before any Go command runs and
-      # the trim below can tell this run's working set from the last run's.
-      - name: Mark Go build cache
-        if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main' }}
-        run: spinifex/.github/scripts/go-build-cache.sh mark
-
       - name: Setup Go Workspace
         run: go work init ./spinifex ./viperblock ./predastore ./northstar ./bluebottle
 
@@ -144,12 +131,19 @@ jobs:
       - name: Check Diff Coverage
         run: cd spinifex && scripts/diff-coverage.sh coverage.out --base HEAD~1
 
-      # Keeps what this run read or wrote and drops the rest, so the saved entry
-      # is one run's working set however often dev is pushed. A red run may have
-      # stopped early and used only part of the set, so it saves untrimmed.
+      # Compiled output stays valid whatever the tests said, and skipping the
+      # save on a red run would leave the next one rebuilding it, so this is
+      # gated on the branch rather than on success.
+      # Go bumps an entry's mtime when a run uses it, so this run's working set
+      # survives and objects superseded by later commits do not. Runs after the
+      # work, so it costs this job nothing and only shrinks what the next reads.
       - name: Trim Go build cache
-        if: ${{ success() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
-        run: spinifex/.github/scripts/go-build-cache.sh trim
+        if: ${{ !cancelled() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
+        run: |
+          C="$(go env GOCACHE)"
+          before=$(du -sm "$C" | cut -f1)
+          find "$C" -type f -mmin +240 -delete
+          echo "trimmed ${before}MB -> $(du -sm "$C" | cut -f1)MB"
 
       - name: Save Go build cache
         if: ${{ !cancelled() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
@@ -160,7 +154,6 @@ jobs:
 
   race_detection:
     name: Race Detection
-    if: ${{ github.event_name != 'pull_request' }}
     runs-on: ubuntu-26.04
 
     steps:
@@ -173,7 +166,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: spinifex
 
       - name: Checkout Viperblock
@@ -236,25 +229,22 @@ jobs:
           key: gobuild-${{ github.job }}-${{ github.run_id }}
           restore-keys: gobuild-${{ github.job }}-
 
-      # Go refreshes an entry's mtime on use only when it is over an hour old, so
-      # restored entries are backdated past that before any Go command runs and
-      # the trim below can tell this run's working set from the last run's.
-      - name: Mark Go build cache
-        if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main' }}
-        run: spinifex/.github/scripts/go-build-cache.sh mark
-
       - name: Setup Go Workspace
         run: go work init ./spinifex ./viperblock ./predastore ./northstar ./bluebottle
 
       - name: Run Tests with Race Detector
         run: make -C spinifex test-race GOTESTFLAGS=-count=1
 
-      # Keeps what this run read or wrote and drops the rest, so the saved entry
-      # is one run's working set however often dev is pushed. A red run may have
-      # stopped early and used only part of the set, so it saves untrimmed.
+      # Go bumps an entry's mtime when a run uses it, so this run's working set
+      # survives and objects superseded by later commits do not. Runs after the
+      # work, so it costs this job nothing and only shrinks what the next reads.
       - name: Trim Go build cache
-        if: ${{ success() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
-        run: spinifex/.github/scripts/go-build-cache.sh trim
+        if: ${{ !cancelled() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
+        run: |
+          C="$(go env GOCACHE)"
+          before=$(du -sm "$C" | cut -f1)
+          find "$C" -type f -mmin +240 -delete
+          echo "trimmed ${before}MB -> $(du -sm "$C" | cut -f1)MB"
 
       - name: Save Go build cache
         if: ${{ !cancelled() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
@@ -278,7 +268,7 @@ jobs:
         id: siblings
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: bash .github/scripts/resolve-sibling-refs.sh
+        run: bash .github/resolve-sibling-refs.sh
         working-directory: spinifex
 
       - name: Checkout Viperblock
@@ -341,13 +331,6 @@ jobs:
           key: gobuild-${{ github.job }}-${{ github.run_id }}
           restore-keys: gobuild-${{ github.job }}-
 
-      # Go refreshes an entry's mtime on use only when it is over an hour old, so
-      # restored entries are backdated past that before any Go command runs and
-      # the trim below can tell this run's working set from the last run's.
-      - name: Mark Go build cache
-        if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main' }}
-        run: spinifex/.github/scripts/go-build-cache.sh mark
-
       - name: Setup Go Workspace
         run: go work init ./spinifex ./viperblock ./predastore ./northstar ./bluebottle
 
@@ -364,16 +347,16 @@ jobs:
         if: ${{ !cancelled() }}
         run: make -C spinifex test-integration
 
-      - name: Run Gated Suites
-        if: ${{ !cancelled() }}
-        run: make -C spinifex test-gated GOTESTFLAGS=-count=1
-
-      # Keeps what this run read or wrote and drops the rest, so the saved entry
-      # is one run's working set however often dev is pushed. A red run may have
-      # stopped early and used only part of the set, so it saves untrimmed.
+      # Go bumps an entry's mtime when a run uses it, so this run's working set
+      # survives and objects superseded by later commits do not. Runs after the
+      # work, so it costs this job nothing and only shrinks what the next reads.
       - name: Trim Go build cache
-        if: ${{ success() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
-        run: spinifex/.github/scripts/go-build-cache.sh trim
+        if: ${{ !cancelled() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}
+        run: |
+          C="$(go env GOCACHE)"
+          before=$(du -sm "$C" | cut -f1)
+          find "$C" -type f -mmin +240 -delete
+          echo "trimmed ${before}MB -> $(du -sm "$C" | cut -f1)MB"
 
       - name: Save Go build cache
         if: ${{ !cancelled() && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main') }}

.github/workflows/ui.yml

@@ -30,12 +30,6 @@ on:
 permissions:
   contents: read
 
-# A newer push to the same pull request supersedes its run. Pushes and dispatches
-# get a group of their own, so every commit on dev and main keeps its result.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   ui_build_and_test:
     name: UI Build and Test

.gitignore

@@ -27,7 +27,6 @@ build/microvm/sqs-worker/.stage.*/
 build/microvm/lambda-runtime/vmlinuz
 build/microvm/lambda-runtime/initramfs.cpio.gz
 build/microvm/lambda-runtime/.stage.*/
-build/microvm/lambda-testlink-runtime/
 build/qboot/
 !spinifex/runtime/roles/spinifexui/frontend/dist/
 tmp/

Makefile

@@ -42,15 +42,11 @@ ifdef QUIET
   _COVQ  = 2>&1 | { grep -Ev '^\s*(ok|PASS|\?|=== RUN|--- PASS:)\s' | grep -v 'coverage: 0\.0%' || true; }; exit $${PIPESTATUS[0]}
   _RACEQ = 2>&1 | { grep -Ev '^\s*(ok|PASS|\?|=== RUN|--- PASS:)\s' || true; }; exit $${PIPESTATUS[0]}
   _SECQ  = >
-  _HDR   = :
-  _RUNSH = sh "$$t" >"$$log" 2>&1 || { echo "-- $$t"; cat "$$log"; exit 1; }
 else
   _Q     =
   _COVQ  =
   _RACEQ =
   _SECQ  = 2>&1 | tee
-  _HDR   = echo -e
-  _RUNSH = echo "-- $$t"; sh "$$t" || exit 1
 endif
 
 build: go_build build-installer build-lb-agent generate-aws-model-coverage
@@ -82,35 +78,6 @@ go_build:
 	@echo -e "\n....Building $(GO_PROJECT_NAME)"
 	go build $(GO_BUILD_MOD) -ldflags "$(LDFLAGS)" -o ./bin/$(GO_PROJECT_NAME) cmd/spinifex/main.go
 
-# Controlled-test only: builds the tagged daemon and its hard-kill initializer
-# together, pinning the initializer's digest into that daemon build. The daemon
-# keeps its symbols so the pin can be read back from the binary.
-# LAMBDA_IMAGE_DIGEST is the test-link runtime image digest that
-# build-lambda-testlink-image prints; it is read raw and validated before use.
-LAMBDA_TESTLINK_DIR := ./bin/lambda-testlink
-LAMBDA_TESTLINK_PKG := github.com/mulgadc/spinifex/spinifex/runtime/daemon
-LAMBDA_TESTLINK_PIN := $(LAMBDA_TESTLINK_PKG).lambdaHardKillSHA256
-LAMBDA_DIGEST_RE := ^[0-9a-f]{64}$$
-build-lambda-testlink: override export LAMBDA_IMAGE_DIGEST := $(value LAMBDA_IMAGE_DIGEST)
-build-lambda-testlink:
-	@[[ "$$LAMBDA_IMAGE_DIGEST" =~ $(LAMBDA_DIGEST_RE) ]] || { echo "LAMBDA_IMAGE_DIGEST must be 64 lowercase hex digits"; exit 1; }
-	@host=$$(uname -m); goos=$$(go env GOOS); goarch=$$(go env GOARCH); \
-	test "$$host" = x86_64 && test "$$goos/$$goarch" = linux/amd64 || { echo "the test link supports only an x86_64 host building linux/amd64, not $$host building $$goos/$$goarch"; exit 1; }
-	@rm -f $(LAMBDA_TESTLINK_DIR)/hardkill.so $(LAMBDA_TESTLINK_DIR)/$(GO_PROJECT_NAME)
-	@mkdir -p $(LAMBDA_TESTLINK_DIR).tmp
-	@rm -f $(LAMBDA_TESTLINK_DIR).tmp/hardkill.so $(LAMBDA_TESTLINK_DIR).tmp/$(GO_PROJECT_NAME)
-	cc -std=c17 -O2 -Wall -Wextra -Werror -shared -fPIC -o $(LAMBDA_TESTLINK_DIR).tmp/hardkill.so spinifex/runtime/compute/lambda/testlink/hardkill/hardkill.c -lrt
-	scripts/check-glibc-ceiling.sh 2.34 $(LAMBDA_TESTLINK_DIR).tmp/hardkill.so
-	@digest=$$(sha256sum $(LAMBDA_TESTLINK_DIR).tmp/hardkill.so | cut -d' ' -f1); \
-	test $${#digest} -eq 64 || { echo "initializer digest missing"; exit 1; }; \
-	echo "initializer sha256 $$digest"; \
-	pin="-X $(LAMBDA_TESTLINK_PIN)=$$digest -X $(LAMBDA_TESTLINK_PKG).lambdaImageDigest=$$LAMBDA_IMAGE_DIGEST"; \
-	LAMBDA_TESTLINK_INITIALIZER=$(abspath $(LAMBDA_TESTLINK_DIR).tmp/hardkill.so) go test -count=1 -tags lambdatestlink -ldflags "$$pin" -run '^TestLambda(HardKillPin|ImageDigestPin)$$' ./spinifex/runtime/daemon/ && \
-	go build $(GO_BUILD_MOD) -tags lambdatestlink -ldflags "$(subst -s -w ,,$(LDFLAGS)) $$pin" -o $(LAMBDA_TESTLINK_DIR).tmp/$(GO_PROJECT_NAME) cmd/spinifex/main.go
-	@mkdir -p $(LAMBDA_TESTLINK_DIR)
-	mv $(LAMBDA_TESTLINK_DIR).tmp/hardkill.so $(LAMBDA_TESTLINK_DIR).tmp/$(GO_PROJECT_NAME) $(LAMBDA_TESTLINK_DIR)/
-	@rmdir $(LAMBDA_TESTLINK_DIR).tmp
-
 build-installer:
 	@echo -e "\n....Building spinifex-installer"
 	go build -ldflags "-s -w" -o ./bin/spinifex-installer cmd/installer/main.go
@@ -226,24 +193,6 @@ bin/lambda-agent: go.mod go.sum $$(call go_local_srcs,./cmd/lambda-agent)
 	GOWORK=off CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags '-s -w' -o $@ ./cmd/lambda-agent
 
 build-lambda-runtime-microvm-image: $(LAMBDA_RUNTIME_MICROVM_ARTIFACTS) ## Build the Lambda runtime microVM kernel and initramfs (not shipped)
-	GOWORK=off go run ./cmd/lambda-image-agent-tag $(LAMBDA_RUNTIME_MICROVM_OUT_DIR)/initramfs.cpio.gz absent
-
-# Controlled-test only: a separately built guest whose agent has the
-# lambdatestlink tag, in its own outputs, never touching bin/lambda-agent or the
-# default image. It prints the digest to pass as LAMBDA_IMAGE_DIGEST.
-LAMBDA_TESTLINK_IMAGE_DIR := $(MICROVM_OUT_DIR)/lambda-testlink-runtime
-build-lambda-testlink-image: ## Build the test-link Lambda guest image and print its digest (not shipped)
-	@host=$$(uname -m); goos=$$(go env GOOS); goarch=$$(go env GOARCH); \
-	test "$$host" = x86_64 && test "$$goos/$$goarch" = linux/amd64 || { echo "the test link supports only an x86_64 host building linux/amd64, not $$host building $$goos/$$goarch"; exit 1; }
-	$(MAKE) --no-print-directory $(MICROVM_OUT_DIR)/qboot.rom
-	@mkdir -p bin $(LAMBDA_TESTLINK_IMAGE_DIR)
-	GOWORK=off GOFLAGS= CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -tags lambdatestlink -ldflags '-s -w' -o bin/lambda-agent-testlink ./cmd/lambda-agent
-	./scripts/build-lambda-runtime-microvm-image.sh bin/lambda-agent-testlink $(LAMBDA_TESTLINK_IMAGE_DIR)
-	GOWORK=off go run ./cmd/lambda-image-agent-tag $(LAMBDA_TESTLINK_IMAGE_DIR)/initramfs.cpio.gz present
-	install -m 0644 $(MICROVM_OUT_DIR)/qboot.rom $(LAMBDA_TESTLINK_IMAGE_DIR)/qboot.rom
-	@digest=$$(GOWORK=off go run -tags lambdatestlink ./cmd/lambda-image-digest $(LAMBDA_TESTLINK_IMAGE_DIR)) && \
-	[[ "$$digest" =~ $(LAMBDA_DIGEST_RE) ]] || { echo "image digest not computed"; exit 1; }; \
-	echo "LAMBDA_IMAGE_DIGEST=$$digest"
 
 # qboot is the microvm firmware. The source tarball ships with each release
 # because qboot is GPL-2.0.
@@ -291,30 +240,27 @@ preflight:
 NODE_SCRIPTS := scripts/setup.sh scripts/setup-ovn.sh scripts/install-node.sh scripts/smoke-test.sh scripts/node-reset.sh scripts/uninstall-spx.sh scripts/lib/distro.sh scripts/lib/stage-sqs-store-microvm.sh
 
 test-build-scripts:
-	@$(_HDR) "\n....Running build/scripts/**/*_test.sh...."
-	@log=$$(mktemp); trap 'rm -f "$$log"' EXIT; for t in $$(find build/scripts -name '*_test.sh' | sort); do \
-		$(_RUNSH); \
+	@echo -e "\n....Running build/scripts/**/*_test.sh...."
+	@for t in $$(find build/scripts -name '*_test.sh' | sort); do \
+		echo "-- $$t"; \
+		sh "$$t" || exit 1; \
 	done
-	@$(_HDR) "\n....Running scripts/*_test.sh, scripts/lib/*_test.sh and scripts/appliance/*_test.sh...."
-	@log=$$(mktemp); trap 'rm -f "$$log"' EXIT; for t in $$( (find scripts -maxdepth 1 -name '*_test.sh'; find scripts/lib scripts/appliance -name '*_test.sh') | sort); do \
-		$(_RUNSH); \
+	@echo -e "\n....Running scripts/*_test.sh, scripts/lib/*_test.sh and scripts/appliance/*_test.sh...."
+	@for t in $$( (find scripts -maxdepth 1 -name '*_test.sh'; find scripts/lib scripts/appliance -name '*_test.sh') | sort); do \
+		echo "-- $$t"; \
+		sh "$$t" || exit 1; \
 	done
-	@$(_HDR) "\n....Running scripts/terraform/latitude-spx/*_test.sh...."
-	@log=$$(mktemp); trap 'rm -f "$$log"' EXIT; for t in $$(find scripts/terraform/latitude-spx -maxdepth 1 -name '*_test.sh' | sort); do \
-		$(_RUNSH); \
+	@echo -e "\n....Running .github/scripts/*_test.sh...."
+	@for t in $$(find .github/scripts -maxdepth 1 -name '*_test.sh' | sort); do \
+		echo "-- $$t"; \
+		sh "$$t" || exit 1; \
 	done
-	@$(_HDR) "\n....Running .github/scripts/*_test.sh...."
-	@log=$$(mktemp); trap 'rm -f "$$log"' EXIT; for t in $$(find .github/scripts -maxdepth 1 -name '*_test.sh' | sort); do \
-		$(_RUNSH); \
-	done
-	$(_Q)shellcheck -S warning .github/scripts/hypervisor-disk-preflight.sh \
-		.github/scripts/wait-for-memory.sh \
-		.github/scripts/go-build-cache.sh \
-		.github/scripts/e2e-select.sh
-	@$(_HDR) "\n....Running shellcheck over build/scripts/**/*.sh + the node scripts...."
-	$(_Q)shellcheck -S warning $$(find build/scripts -name '*.sh' | sort) $(NODE_SCRIPTS)
-	$(_Q)shellcheck -S warning -x scripts/build-oracle-appliance.sh $$(find scripts/appliance -name '*.sh' | sort)
-	@$(_HDR) "  test-build-scripts ok"
+	shellcheck -S warning .github/scripts/hypervisor-disk-preflight.sh .github/scripts/hypervisor-disk-preflight_test.sh \
+		.github/scripts/wait-for-memory.sh .github/scripts/wait-for-memory_test.sh
+	@echo -e "\n....Running shellcheck over build/scripts/**/*.sh + the node scripts...."
+	shellcheck -S warning $$(find build/scripts -name '*.sh' | sort) $(NODE_SCRIPTS)
+	shellcheck -S warning -x scripts/build-oracle-appliance.sh $$(find scripts/appliance -name '*.sh' | sort)
+	@echo "  test-build-scripts ok"
 
 # E2E harness unit tests. Build-tagged `e2e` so they're skipped by the
 # default `go test ./spinifex/...`. Runs with mocked AWS clients — no
@@ -345,16 +291,6 @@ test-integration:
 	@$(MAKE) --no-print-directory generate-aws-model-coverage
 	@echo "AWS operation coverage: $(AWS_MODEL_OPERATION_COVERAGE_DIR)"
 
-# Suites the unit tiers skip: the three-node SQS R3 scenarios behind
-# SPINIFEX_SQS_R3 and the lambdatestlink-tagged tests. CI runs these on every PR.
-test-gated:
-	@echo -e "\n....Running env- and tag-gated suites...."
-	$(_Q)LOG_IGNORE=1 SPINIFEX_SQS_R3=1 go test $(GOTESTFLAGS) -timeout 180s -run '^TestR3$$' ./spinifex/domains/sqs/message/jetstream/ $(_RACEQ)
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -tags=lambdatestlink -timeout 120s ./cmd/lambda-agent/ ./spinifex/agents/lambda/hostlink/ ./spinifex/runtime/compute/lambda/guestconn/ ./spinifex/runtime/compute/lambda/testlink/ ./spinifex/domains/network/host/ $(_RACEQ)
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -tags=lambdatestlink -timeout 120s -run '^TestLambdaTestLink(Executor|Reply)_' ./spinifex/runtime/roles/awsgw/ $(_RACEQ)
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -tags=lambdatestlink,lambdatestlinkseam -timeout 120s -run '^TestLambdaTestLinkSeam_' ./spinifex/runtime/roles/awsgw/ $(_RACEQ)
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -tags=lambdatestlink -timeout 120s -run '^TestLambdaTestLink' ./spinifex/runtime/daemon/ $(_RACEQ)
-
 generate-aws-model-coverage:
 	@go run ./cmd/aws-model-coverage -out $(AWS_MODEL_OPERATION_COVERAGE_DIR) -json $(AWS_MODEL_OPERATION_COVERAGE_DIR)/coverage.json
 
@@ -390,7 +326,8 @@ test-cover:
 # Run unit tests with race detector
 test-race:
 	@echo -e "\n....Running tests with race detector for $(GO_PROJECT_NAME)...."
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -race -timeout 300s ./spinifex/... ./cmd/... ./internal/... ./contracts/... ./architecture/... $(_RACEQ)
+	$(_Q)LOG_IGNORE=1 SPINIFEX_SQS_R3=1 go test $(GOTESTFLAGS) -race -timeout 300s ./spinifex/... ./cmd/... ./internal/... ./contracts/... ./architecture/... $(_RACEQ)
+	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -race -tags=lambdatestlink -timeout 120s ./cmd/lambda-agent/ ./spinifex/agents/lambda/hostlink/ $(_RACEQ)
 
 # Unit tests for in-repo GitHub Actions (e.g. .github/actions/e2e-analyze).
 # Kept out of `test-cover` so coverage % isn't diluted by CI-only tooling.
@@ -601,7 +538,7 @@ distro-arm64:
 distro-clean:
 	rm -rf dist/
 
-.PHONY: test-package-check build build-lambda-testlink build-lambda-testlink-image build-ui test-ui-e2e ui-e2e-container ui-baselines build-installer build-lb-agent build-ecs-agent build-system-image build-eks-node-image import-eks-node-image publish-eks-node-image build-ecs-node-image import-ecs-node-image build-rds-postgres-image import-rds-postgres-image build-rds-mariadb-image import-rds-mariadb-image build-microvm-image build-sqs-worker-microvm-image build-lambda-runtime-microvm-image install-microvm install-sqs-worker-microvm go_build preflight test test-cover test-race diff-coverage bench fuzz test-actions test-images test-build-scripts test-harness test-integration test-gated generate-aws-model-coverage aws-model-coverage test-segscan-oracle \
+.PHONY: test-package-check build build-ui test-ui-e2e ui-e2e-container ui-baselines build-installer build-lb-agent build-ecs-agent build-system-image build-eks-node-image import-eks-node-image publish-eks-node-image build-ecs-node-image import-ecs-node-image build-rds-postgres-image import-rds-postgres-image build-rds-mariadb-image import-rds-mariadb-image build-microvm-image build-sqs-worker-microvm-image build-lambda-runtime-microvm-image install-microvm install-sqs-worker-microvm go_build preflight test test-cover test-race diff-coverage bench fuzz test-actions test-images test-build-scripts test-harness test-integration generate-aws-model-coverage aws-model-coverage test-segscan-oracle \
 	deploy reinstall clean \
 	install-system install-go install-aws quickinstall \
 	lint fix govulncheck nilaway \

README.md

@@ -70,8 +70,8 @@ The platform serves **405 AWS API operations** across the services below. See ex
 | **RDS** | Databases | PostgreSQL and MariaDB, with automated backups | Available |
 | **Route 53** | DNS | [Northstar](https://github.com/mulgadc/northstar): authoritative DNS with hosted zones | Available |
 | **Bedrock** | AI deployment | vLLM for text generation and Hugging Face TEI for embeddings and reranking | Q4 2026 |
-| **Lambda** | Serverless functions | QEMU `microvm` execution environments | Q1 2027 |
-| **SQS** | Message queues | A dedicated NATS JetStream store in a per-Region QEMU `microvm` guest | Q1 2027 |
+| **Lambda** | Serverless functions | | Q1 2027 |
+| **SQS** | Message queues | | Q1 2027 |
 
 Roadmap services ship under the same AWS API surface, so code written for AWS today works the moment they land. [Track what's shipped in the release notes](https://github.com/mulgadc/spinifex/releases).
 

cmd/lambda-agent/connect.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 
-	lambdav1 "github.com/mulgadc/spinifex/contracts/lambda/v1"
 	"github.com/mulgadc/spinifex/spinifex/agents/lambda/hostlink"
 )
 
@@ -30,20 +29,20 @@ func defaultStartup() startup {
 
 // connect loads the identity, seals fw_cfg whether or not the load succeeded,
 // then dials the host. Under TLS 1.3 a host refusal is seen only on first read.
-func (s startup) connect(ctx context.Context) (*tls.Conn, lambdav1.Scope, int, error) {
+func (s startup) connect(ctx context.Context) (*tls.Conn, int, error) {
 	id, loadErr := hostlink.LoadIdentity(s.fwCfgDir)
 	if err := hostlink.SealFwCfg(s.fwCfgRoot, s.unload); err != nil {
-		return nil, "", exitRefused, errors.Join(loadErr, err)
+		return nil, exitRefused, errors.Join(loadErr, err)
 	}
 	if loadErr != nil {
-		return nil, "", exitRefused, loadErr
+		return nil, exitRefused, loadErr
 	}
 	conn, err := hostlink.Dial(ctx, id)
 	if err != nil {
 		if ctx.Err() != nil {
 			err = fmt.Errorf("%w: %w", err, context.Cause(ctx))
 		}
-		return nil, "", exitLink, err
+		return nil, exitLink, err
 	}
-	return conn, id.Scope, 0, nil
+	return conn, 0, nil
 }

cmd/lambda-agent/grant_testlink.go

@@ -1,66 +0,0 @@
-//go:build lambdatestlink
-
-package main
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	lambdav1 "github.com/mulgadc/spinifex/contracts/lambda/v1"
-	"github.com/mulgadc/spinifex/spinifex/agents/lambda/hostlink"
-)
-
-const entryGrant = "test-grant"
-
-// testGrant is the grant the host launched this VM under.
-type testGrant struct {
-	grantID, attemptID, environmentID string
-	generation                        uint64
-}
-
-// readGrant reads the test-grant fw_cfg entry: grant ID, attempt ID,
-// environment ID and generation, one per line.
-func readGrant(fwCfgDir string) (testGrant, error) {
-	b, err := os.ReadFile(filepath.Join(fwCfgDir, entryGrant, "raw"))
-	if err != nil {
-		return testGrant{}, fmt.Errorf("read %s: %w", entryGrant, err)
-	}
-	lines := strings.Split(strings.TrimSuffix(string(b), "\n"), "\n")
-	if len(lines) != 4 {
-		return testGrant{}, errors.New(entryGrant + " entry malformed")
-	}
-	g := testGrant{grantID: lines[0], attemptID: lines[1], environmentID: lines[2]}
-	g.generation, err = strconv.ParseUint(lines[3], 10, 64)
-	if err != nil || g.generation == 0 || g.grantID == "" || g.attemptID == "" || g.environmentID == "" {
-		return testGrant{}, errors.New(entryGrant + " entry malformed")
-	}
-	return g, nil
-}
-
-// checkBinding refuses a run unless the grant names the authenticated environment
-// generation, the request carries that grant and its deadline is still ahead. The
-// clock check is a local guard only: it cannot detect skew or a superseded grant.
-func checkBinding(scope lambdav1.Scope, g testGrant, req hostlink.Request, now time.Time) error {
-	parts := strings.Split(string(scope), "/")
-	if len(parts) != 5 {
-		return errors.New("authenticated scope malformed")
-	}
-	if parts[3] != g.environmentID || parts[4] != strconv.FormatUint(g.generation, 10) {
-		return errors.New("grant is not for the authenticated environment generation")
-	}
-	if req.GrantID != g.grantID || req.AttemptID != g.attemptID {
-		return errors.New("request does not carry this VM's grant")
-	}
-	if req.DeadlineMs <= 0 {
-		return errors.New("request has no deadline")
-	}
-	if !now.Before(time.UnixMilli(req.DeadlineMs)) {
-		return errors.New("request deadline already passed")
-	}
-	return nil
-}

cmd/lambda-agent/helpers_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-const scope lambdav1.Scope = "ap-southeast-2/000000000001/fn-1/env-1/1"
+const scope lambdav1.Scope = "ap-southeast-2/000000000001/fn-1/env-1/gen-1"
 
 // guest is a fake fw_cfg tree; unload removes it as unloading the module would.
 type guest struct {

cmd/lambda-agent/package_testlink.go

@@ -18,7 +18,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"unicode"
 
 	"golang.org/x/sys/unix"
 )
@@ -29,7 +28,6 @@ import (
 const (
 	entryPackageSize   = "test-package-size"
 	entryPackageSHA256 = "test-package-sha256"
-	entryHandler       = "test-handler"
 
 	devMaxZipBytes    = 16 << 20
 	devMaxUnzipBytes  = 64 << 20
@@ -39,9 +37,8 @@ const (
 )
 
 type packageSpec struct {
-	size    int64
-	sha256  [sha256.Size]byte
-	handler string
+	size   int64
+	sha256 [sha256.Size]byte
 }
 
 type unpackLimits struct {
@@ -79,13 +76,6 @@ func readPackageSpec(fwCfgDir string) (packageSpec, error) {
 		return spec, errors.New("package sha256 is not 64 hex digits")
 	}
 	copy(spec.sha256[:], b)
-	if spec.handler, err = read(entryHandler); err != nil {
-		return spec, err
-	}
-	if spec.handler == "" || len(spec.handler) > 128 || strings.IndexFunc(spec.handler, unicode.IsSpace) >= 0 ||
-		strings.ContainsRune(spec.handler, 0) {
-		return spec, errors.New("handler must be 1..128 characters with no whitespace")
-	}
 	return spec, nil
 }
 

cmd/lambda-agent/package_testlink_test.go

@@ -12,7 +12,6 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
-	"strings"
 	"syscall"
 	"testing"
 
@@ -166,23 +165,19 @@ func TestUnpackChecksSizeAndHash(t *testing.T) {
 func TestReadPackageSpecBounds(t *testing.T) {
 	sum := "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 	cases := map[string]struct {
-		size, hash, handler string
-		want                string
+		size, hash string
+		want       string
 	}{
-		"valid":            {"10", sum, "bootstrap.h", ""},
-		"zero":             {"0", sum, "bootstrap.h", "outside"},
-		"too large":        {"16777217", sum, "bootstrap.h", "outside"},
-		"not hex":          {"10", "zz", "bootstrap.h", "64 hex digits"},
-		"short":            {"10", sum[:62], "bootstrap.h", "64 hex digits"},
-		"empty handler":    {"10", sum, "", "handler"},
-		"handler space":    {"10", sum, "a b", "handler"},
-		"128-char handler": {"10", sum, strings.Repeat("h", 128), ""},
-		"129-char handler": {"10", sum, strings.Repeat("h", 129), "handler"},
+		"valid":     {"10", sum, ""},
+		"zero":      {"0", sum, "outside"},
+		"too large": {"16777217", sum, "outside"},
+		"not hex":   {"10", "zz", "64 hex digits"},
+		"short":     {"10", sum[:62], "64 hex digits"},
 	}
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
 			dir := t.TempDir()
-			for n, v := range map[string]string{entryPackageSize: tc.size, entryPackageSHA256: tc.hash, entryHandler: tc.handler} {
+			for n, v := range map[string]string{entryPackageSize: tc.size, entryPackageSHA256: tc.hash} {
 				require.NoError(t, os.MkdirAll(filepath.Join(dir, n), 0o700))
 				require.NoError(t, os.WriteFile(filepath.Join(dir, n, "raw"), []byte(v), 0o600))
 			}
@@ -190,7 +185,6 @@ func TestReadPackageSpecBounds(t *testing.T) {
 			if tc.want == "" {
 				require.NoError(t, err)
 				assert.Equal(t, int64(10), spec.size)
-				assert.Equal(t, tc.handler, spec.handler)
 				return
 			}
 			assert.ErrorContains(t, err, tc.want)

cmd/lambda-agent/start_tcp.go

@@ -25,7 +25,7 @@ func start(ctx context.Context) int {
 
 // run authenticates to the host and holds the connection until it closes.
 func (s startup) run(ctx context.Context) (int, error) {
-	conn, _, code, err := s.connect(ctx)
+	conn, code, err := s.connect(ctx)
 	if err != nil {
 		return code, err
 	}

cmd/lambda-agent/start_testlink.go

@@ -5,8 +5,8 @@ package main
 import (
 	"context"
 	"errors"
+	"flag"
 	"fmt"
-	"io"
 	"log/slog"
 	"net"
 	"net/http"
@@ -24,6 +24,8 @@ const (
 	taskRoot    = "/var/task"
 )
 
+var handler = flag.String("handler", os.Getenv("_HANDLER"), "function handler passed to the bootstrap")
+
 // testlink relays one invocation over the test carrier on the authenticated
 // connection; the carrier is not the guest protocol.
 type testlink struct {
@@ -52,14 +54,13 @@ func start(ctx context.Context) int {
 func (t testlink) run(parent context.Context) (int, error) {
 	// The package values are fw_cfg entries, so read them before connect seals it.
 	spec, specErr := readPackageSpec(t.fwCfgDir)
-	grant, grantErr := readGrant(t.fwCfgDir)
-	conn, scope, code, err := t.connect(parent)
+	conn, code, err := t.connect(parent)
 	if err != nil {
-		return code, errors.Join(err, specErr, grantErr)
+		return code, errors.Join(err, specErr)
 	}
 	defer conn.Close()
-	if err := errors.Join(specErr, grantErr); err != nil {
-		return exitRefused, err
+	if specErr != nil {
+		return exitRefused, specErr
 	}
 	link := hostlink.NewTestStream(conn)
 
@@ -75,16 +76,6 @@ func (t testlink) run(parent context.Context) (int, error) {
 	if parent.Err() != nil {
 		return exitLink, context.Cause(parent)
 	}
-	// Nothing of the tenant's is installed or run for an unbound request.
-	if err := checkBinding(scope, grant, first, time.Now()); err != nil {
-		return exitRefused, err
-	}
-	// A host that sent no credential is refused before anything is installed.
-	if first.Credential == nil || !first.Credential.Complete() {
-		return exitRefused, errors.New("first frame carries no execution credential")
-	}
-	cred := *first.Credential
-	first.Credential = nil
 	if err := t.pkg.install(spec); err != nil {
 		return exitRefused, fmt.Errorf("install package: %w", err)
 	}
@@ -100,7 +91,12 @@ func (t testlink) run(parent context.Context) (int, error) {
 
 	ctx, cancel := context.WithCancelCause(parent)
 	defer cancel(nil)
-	cmd, err := t.startBootstrap(ctx, bootstrapEnv(ln.Addr().String(), spec.handler, cred))
+	cmd, err := t.startBootstrap(ctx, []string{
+		"AWS_LAMBDA_RUNTIME_API=" + ln.Addr().String(),
+		"_HANDLER=" + *handler,
+		"LAMBDA_TASK_ROOT=" + taskRoot,
+		"PATH=/bin:/sbin:/usr/bin",
+	})
 	if err != nil {
 		return exitLink, fmt.Errorf("start bootstrap: %w", err)
 	}
@@ -108,11 +104,7 @@ func (t testlink) run(parent context.Context) (int, error) {
 	go func() {
 		defer close(exited)
 		err := cmd.Wait()
-		// Once a response is being received the result stands, so only an
-		// exit before that cancels the invocation.
-		if srv.BootstrapExited() {
-			cancel(fmt.Errorf("bootstrap exited: %w", err))
-		}
+		cancel(fmt.Errorf("bootstrap exited: %w", err))
 	}()
 
 	err = agent.Run(ctx, &oneInvocation{Link: link, first: &first}, srv)
@@ -124,32 +116,11 @@ func (t testlink) run(parent context.Context) (int, error) {
 	return exitClosed, nil
 }
 
-// bootstrapEnv is the bootstrap's whole environment: the runtime variables and
-// the execution role's three credential variables.
-func bootstrapEnv(runtimeAPI, handler string, cred hostlink.Credential) []string {
-	return []string{
-		"AWS_LAMBDA_RUNTIME_API=" + runtimeAPI,
-		"_HANDLER=" + handler,
-		"LAMBDA_TASK_ROOT=" + taskRoot,
-		"PATH=/bin:/sbin:/usr/bin",
-		"AWS_ACCESS_KEY_ID=" + cred.AccessKeyID,
-		"AWS_SECRET_ACCESS_KEY=" + cred.SecretAccessKey,
-		"AWS_SESSION_TOKEN=" + cred.SessionToken,
-	}
-}
-
-// shutdownGrace is how long past the invocation deadline the agent waits for
-// the host's shutdown frame once its result is written.
-const shutdownGrace = 2 * time.Second
-
 // oneInvocation serves the host's first request and then stops the agent:
-// each test VM runs a single invocation. After the result is written it waits
-// for the host's shutdown frame or EOF, so the result is not cut off by the
-// poweroff that follows the agent's exit.
+// each test VM runs a single invocation.
 type oneInvocation struct {
 	hostlink.Link
-	first      *hostlink.Request
-	deadlineMs int64
+	first *hostlink.Request
 }
 
 var _ hostlink.Link = (*oneInvocation)(nil)
@@ -158,36 +129,10 @@ func (o *oneInvocation) Next(ctx context.Context) (hostlink.Request, error) {
 	if err := ctx.Err(); err != nil {
 		return hostlink.Request{}, err
 	}
-	if o.first != nil {
-		req := *o.first
-		o.first = nil
-		o.deadlineMs = req.DeadlineMs
-		return req, nil
+	if o.first == nil {
+		return hostlink.Request{}, hostlink.ErrShutdown
 	}
-	return hostlink.Request{}, o.awaitShutdown(ctx)
-}
-
-// awaitShutdown reads the host's next frame and always ends the agent: with
-// ErrShutdown for a shutdown frame, EOF, a stray frame or an expired wait.
-func (o *oneInvocation) awaitShutdown(ctx context.Context) error {
-	end := time.UnixMilli(o.deadlineMs)
-	if now := time.Now(); end.Before(now) {
-		end = now
-	}
-	wctx, cancel := context.WithDeadline(ctx, end.Add(shutdownGrace))
-	defer cancel()
-	_, err := o.Link.Next(wctx)
-	switch {
-	case errors.Is(err, hostlink.ErrShutdown), errors.Is(err, io.EOF):
-		return hostlink.ErrShutdown
-	case err == nil:
-		slog.Warn("lambda-agent: frame after the invocation was not dispatched")
-		return hostlink.ErrShutdown
-	case ctx.Err() != nil:
-		return err
-	case wctx.Err() != nil:
-		slog.Warn("lambda-agent: no shutdown from the host; exiting")
-		return hostlink.ErrShutdown
-	}
-	return err
+	req := *o.first
+	o.first = nil
+	return req, nil
 }

cmd/lambda-agent/start_testlink_test.go

@@ -13,7 +13,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
-	"strings"
 	"testing"
 	"time"
 
@@ -26,18 +25,12 @@ import (
 
 const helperEnv = "LAMBDA_AGENT_TEST_BOOTSTRAP"
 
-// helperHandlerOut names the file the helper bootstrap writes its _HANDLER to.
-const helperHandlerOut = "LAMBDA_AGENT_TEST_HANDLER_OUT"
-
 // TestHelperBootstrap is the fake function bootstrap, run as a subprocess: it
 // echoes one invocation through the Runtime API, then waits for the next.
 func TestHelperBootstrap(t *testing.T) {
 	if os.Getenv(helperEnv) != "1" {
 		return
 	}
-	if out := os.Getenv(helperHandlerOut); out != "" {
-		require.NoError(t, os.WriteFile(out, []byte(os.Getenv("_HANDLER")), 0o600))
-	}
 	base := "http://" + os.Getenv("AWS_LAMBDA_RUNTIME_API") + "/2018-06-01/runtime/invocation/"
 	resp, err := http.Get(base + "next")
 	require.NoError(t, err)
@@ -48,30 +41,14 @@ func TestHelperBootstrap(t *testing.T) {
 	post, err := http.Post(base+id+"/response", "application/json", bytes.NewReader(body))
 	require.NoError(t, err)
 	post.Body.Close()
-	if os.Getenv(helperExitAfterPost) == "1" {
-		return
-	}
 	_, _ = http.Get(base + "next")
 }
 
-// helperExitAfterPost makes the helper bootstrap exit once its response is posted.
-const helperExitAfterPost = "LAMBDA_AGENT_TEST_EXIT_AFTER_POST"
-
-// testGrantEntry grants g-1 for attempt a-1 on the fixture scope's env-1/1.
-const testGrantEntry = "g-1\na-1\nenv-1\n1\n"
-
-// testHandler is the handler the fixture's host configures.
-const testHandler = "bootstrap.fixture"
-
 type bootstrapStarts struct {
 	n       int
 	started chan struct{}
 	task    string
 	sealed  bool
-	// handlerOut receives the _HANDLER the bootstrap process itself saw.
-	handlerOut string
-	// env is the environment the agent gave the bootstrap.
-	env []string
 }
 
 // testlink builds a guest whose fw_cfg also carries a controlled package,
@@ -84,16 +61,9 @@ func (b *bootstrapStarts) testlink(t *testing.T, entries map[string][]byte) test
 	sum := sha256.Sum256(zipBytes)
 	entries[entryPackageSize] = []byte(strconv.Itoa(len(zipBytes)))
 	entries[entryPackageSHA256] = []byte(hex.EncodeToString(sum[:]))
-	if _, ok := entries[entryHandler]; !ok {
-		entries[entryHandler] = []byte(testHandler)
-	}
-	if _, ok := entries[entryGrant]; !ok {
-		entries[entryGrant] = []byte(testGrantEntry)
-	}
 	g := newGuest(t, entries)
 	b.started = make(chan struct{}, 1)
 	b.task = t.TempDir()
-	b.handlerOut = filepath.Join(t.TempDir(), "handler")
 	return testlink{
 		startup: g.startup(),
 		pkg: taskPackage{
@@ -105,10 +75,9 @@ func (b *bootstrapStarts) testlink(t *testing.T, entries map[string][]byte) test
 		runtimeAddr: "127.0.0.1:0",
 		startBootstrap: func(ctx context.Context, env []string) (*exec.Cmd, error) {
 			b.n++
-			b.env = env
 			b.started <- struct{}{}
 			cmd := exec.CommandContext(ctx, os.Args[0], "-test.run=^TestHelperBootstrap$")
-			cmd.Env = append(env, helperEnv+"=1", helperHandlerOut+"="+b.handlerOut)
+			cmd.Env = append(env, helperEnv+"=1")
 			return cmd, cmd.Start()
 		},
 	}
@@ -144,7 +113,7 @@ func TestTestlinkServesOneInvocationThenStops(t *testing.T) {
 	case <-time.After(100 * time.Millisecond):
 	}
 	hs := hostlink.NewTestStream(conn)
-	req := hostlink.Request{Credential: &testCredential, GrantID: "g-1", AttemptID: "a-1", RequestID: "r-1", DeadlineMs: time.Now().Add(5 * time.Second).UnixMilli(), Payload: []byte(`{"a":40,"b":2}`)}
+	req := hostlink.Request{GrantID: "g-1", AttemptID: "a-1", RequestID: "r-1", DeadlineMs: time.Now().Add(5 * time.Second).UnixMilli(), Payload: []byte(`{"a":40,"b":2}`)}
 	require.NoError(t, hs.HostSend(req))
 	got, err := hs.HostResult(ctx)
 	require.NoError(t, err)
@@ -163,154 +132,10 @@ func TestTestlinkServesOneInvocationThenStops(t *testing.T) {
 		assert.Error(t, err, "agent answered a second invocation")
 	}
 	assert.Equal(t, 1, b.n)
-	seen, err := os.ReadFile(b.handlerOut)
-	require.NoError(t, err, "bootstrap process did not report its handler")
-	assert.Equal(t, testHandler, string(seen), "bootstrap process not given the configured handler")
 	assert.True(t, b.sealed, "task dir not made read-only")
 	assert.FileExists(t, filepath.Join(b.task, "lib", "data.txt"))
-	assert.ElementsMatch(t, []string{
-		"AWS_LAMBDA_RUNTIME_API=" + envValue(b.env, "AWS_LAMBDA_RUNTIME_API"),
-		"_HANDLER=" + testHandler,
-		"LAMBDA_TASK_ROOT=" + taskRoot,
-		"PATH=/bin:/sbin:/usr/bin",
-		"AWS_ACCESS_KEY_ID=" + testCredential.AccessKeyID,
-		"AWS_SECRET_ACCESS_KEY=" + testCredential.SecretAccessKey,
-		"AWS_SESSION_TOKEN=" + testCredential.SessionToken,
-	}, b.env, "the bootstrap gets exactly the runtime and credential variables")
-	assert.NotEmpty(t, envValue(b.env, "AWS_LAMBDA_RUNTIME_API"))
 }
 
-var testCredential = hostlink.Credential{AccessKeyID: "ASIAGUESTKEY", SecretAccessKey: "guest-secret", SessionToken: "guest-token"}
-
-func envValue(env []string, name string) string {
-	for _, kv := range env {
-		if v, ok := strings.CutPrefix(kv, name+"="); ok {
-			return v
-		}
-	}
-	return ""
-}
-
-// A first frame without a complete credential installs and runs nothing.
-func TestTestlinkFrameWithoutCredentialNeverStartsBootstrap(t *testing.T) {
-	for name, cred := range map[string]*hostlink.Credential{
-		"none":       nil,
-		"incomplete": {AccessKeyID: "ASIAGUESTKEY"},
-	} {
-		t.Run(name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			h := newHost(t)
-			h.accept(ctx)
-			var b bootstrapStarts
-			done := runTestlinkAsync(ctx, b.testlink(t, h.entries()))
-			conn := h.guest(t)
-			defer conn.Close()
-			require.NoError(t, hostlink.NewTestStream(conn).HostSend(hostlink.Request{Credential: cred, GrantID: "g-1", AttemptID: "a-1",
-				RequestID: "r-1", DeadlineMs: time.Now().Add(5 * time.Second).UnixMilli(), Payload: []byte(`{}`)}))
-
-			res := wait(t, done, "agent to stop")
-			assert.Equal(t, exitRefused, res.code)
-			assert.ErrorContains(t, res.err, "no execution credential")
-			assert.Zero(t, b.n)
-			assert.False(t, b.sealed)
-			assert.NoFileExists(t, filepath.Join(b.task, "bootstrap"), "package installed")
-		})
-	}
-}
-
-// A bootstrap that posts its response and exits at once does not cost the
-// host the result; the agent then waits for the host's shutdown.
-func TestTestlinkBootstrapExitingAfterResponseStillDelivers(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-	h := newHost(t)
-	h.accept(ctx)
-	var b bootstrapStarts
-	tl := b.testlink(t, h.entries())
-	start := tl.startBootstrap
-	tl.startBootstrap = func(ctx context.Context, env []string) (*exec.Cmd, error) {
-		return start(ctx, append(env, helperExitAfterPost+"=1"))
-	}
-	done := runTestlinkAsync(ctx, tl)
-
-	conn := h.guest(t)
-	defer conn.Close()
-	hs := hostlink.NewTestStream(conn)
-	payload := bytes.Repeat([]byte("0123456789"), 300_000)
-	req := hostlink.Request{Credential: &testCredential, GrantID: "g-1", AttemptID: "a-1", RequestID: "r-1", DeadlineMs: time.Now().Add(5 * time.Second).UnixMilli(), Payload: payload}
-	require.NoError(t, hs.HostSend(req))
-	got, err := hs.HostResult(ctx)
-	require.NoError(t, err)
-	assert.Equal(t, hostlink.Response{GrantID: "g-1", AttemptID: "a-1", RequestID: "r-1", Payload: payload}, got)
-
-	require.NoError(t, hs.HostShutdown())
-	res := wait(t, done, "agent to stop after the host's shutdown")
-	assert.Equal(t, exitClosed, res.code)
-	assert.NoError(t, res.err)
-}
-
-// The agent stays up for the host's shutdown rather than exiting as soon as
-// its result is written, and never dispatches a stray frame.
-func TestOneInvocationAfterResult(t *testing.T) {
-	first := hostlink.Request{RequestID: "r-1", DeadlineMs: time.Now().Add(time.Minute).UnixMilli()}
-	cases := map[string]struct {
-		next func(context.Context) (hostlink.Request, error)
-		want error
-	}{
-		"shutdown frame": {func(context.Context) (hostlink.Request, error) { return hostlink.Request{}, hostlink.ErrShutdown }, hostlink.ErrShutdown},
-		"eof":            {func(context.Context) (hostlink.Request, error) { return hostlink.Request{}, io.EOF }, hostlink.ErrShutdown},
-		"a second request is not dispatched": {func(context.Context) (hostlink.Request, error) {
-			return hostlink.Request{RequestID: "r-2"}, nil
-		}, hostlink.ErrShutdown},
-	}
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			o := &oneInvocation{Link: stubLink{tc.next}, first: &first}
-			_, err := o.Next(context.Background())
-			require.NoError(t, err)
-			req, err := o.Next(context.Background())
-			require.ErrorIs(t, err, tc.want)
-			assert.Empty(t, req.RequestID)
-		})
-	}
-	t.Run("host never sends shutdown", func(t *testing.T) {
-		past := first
-		past.DeadlineMs = time.Now().Add(-time.Second).UnixMilli()
-		o := &oneInvocation{Link: stubLink{func(ctx context.Context) (hostlink.Request, error) {
-			<-ctx.Done()
-			return hostlink.Request{}, ctx.Err()
-		}}, first: &past}
-		_, err := o.Next(context.Background())
-		require.NoError(t, err)
-		start := time.Now()
-		_, err = o.Next(context.Background())
-		require.ErrorIs(t, err, hostlink.ErrShutdown)
-		assert.GreaterOrEqual(t, time.Since(start), shutdownGrace-100*time.Millisecond, "waited the grace")
-	})
-	t.Run("parent cancel is not a shutdown", func(t *testing.T) {
-		o := &oneInvocation{Link: stubLink{func(ctx context.Context) (hostlink.Request, error) {
-			<-ctx.Done()
-			return hostlink.Request{}, ctx.Err()
-		}}, first: &first}
-		_, _ = o.Next(context.Background())
-		ctx, cancel := context.WithCancel(context.Background())
-		cancel()
-		_, err := o.Next(ctx)
-		require.ErrorIs(t, err, context.Canceled)
-	})
-}
-
-type stubLink struct {
-	next func(context.Context) (hostlink.Request, error)
-}
-
-var _ hostlink.Link = stubLink{}
-
-func (l stubLink) Next(ctx context.Context) (hostlink.Request, error) { return l.next(ctx) }
-
-func (stubLink) Complete(context.Context, hostlink.Response) error { return nil }
-
 func TestTestlinkShutdownBeforeInvocationNeverStartsBootstrap(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
@@ -393,8 +218,7 @@ func TestTestlinkBadPackageNeverStartsBootstrap(t *testing.T) {
 
 	conn := h.guest(t)
 	defer conn.Close()
-	require.NoError(t, hostlink.NewTestStream(conn).HostSend(hostlink.Request{Credential: &testCredential, GrantID: "g-1", AttemptID: "a-1", RequestID: "r-1",
-		DeadlineMs: time.Now().Add(5 * time.Second).UnixMilli()}))
+	require.NoError(t, hostlink.NewTestStream(conn).HostSend(hostlink.Request{RequestID: "r-1"}))
 	res := wait(t, done, "agent to stop")
 	assert.Equal(t, exitRefused, res.code)
 	assert.ErrorContains(t, res.err, "install package")
@@ -420,87 +244,3 @@ func TestTestlinkMissingPackageSpecRefuses(t *testing.T) {
 	_, err := os.Stat(tl.fwCfgRoot)
 	assert.ErrorIs(t, err, os.ErrNotExist, "fw_cfg not sealed")
 }
-
-// A request that does not carry this VM's grant, or a grant for another
-// environment generation than the one authenticated, installs and runs
-// nothing of the tenant's.
-func TestTestlinkUnboundRequestNeverStartsBootstrap(t *testing.T) {
-	cases := map[string]struct {
-		grant            string
-		grantID, attempt string
-		deadlineMs       int64
-		want             string
-	}{
-		"frame with no deadline":      {testGrantEntry, "g-1", "a-1", -1, "no deadline"},
-		"frame with expired deadline": {testGrantEntry, "g-1", "a-1", time.Now().Add(-time.Second).UnixMilli(), "deadline already passed"},
-		"frame for another grant":     {testGrantEntry, "g-2", "a-1", 0, "does not carry this VM's grant"},
-		"frame for another attempt":   {testGrantEntry, "g-1", "a-2", 0, "does not carry this VM's grant"},
-		"frame with no grant":         {testGrantEntry, "", "", 0, "does not carry this VM's grant"},
-		"grant for another env":       {"g-1\na-1\nenv-2\n1\n", "g-1", "a-1", 0, "not for the authenticated environment"},
-		"grant for another gen":       {"g-1\na-1\nenv-1\n2\n", "g-1", "a-1", 0, "not for the authenticated environment"},
-	}
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			h := newHost(t)
-			h.accept(ctx)
-			var b bootstrapStarts
-			entries := h.entries()
-			entries[entryGrant] = []byte(tc.grant)
-			done := runTestlinkAsync(ctx, b.testlink(t, entries))
-			conn := h.guest(t)
-			defer conn.Close()
-			deadline := time.Now().Add(5 * time.Second).UnixMilli()
-			switch {
-			case tc.deadlineMs < 0:
-				deadline = 0
-			case tc.deadlineMs > 0:
-				deadline = tc.deadlineMs
-			}
-			req := hostlink.Request{Credential: &testCredential, GrantID: tc.grantID, AttemptID: tc.attempt, RequestID: "r-1",
-				DeadlineMs: deadline, Payload: []byte(`{}`)}
-			require.NoError(t, hostlink.NewTestStream(conn).HostSend(req))
-
-			res := wait(t, done, "agent to stop")
-			assert.Equal(t, exitRefused, res.code)
-			assert.ErrorContains(t, res.err, tc.want)
-			assert.Zero(t, b.n)
-			assert.False(t, b.sealed)
-			assert.NoFileExists(t, filepath.Join(b.task, "bootstrap"), "package installed")
-		})
-	}
-}
-
-// A missing or malformed grant entry refuses before any frame is awaited.
-func TestTestlinkBadGrantEntryRefuses(t *testing.T) {
-	cases := map[string]*string{
-		"missing":       nil,
-		"too few lines": ptr("g-1\na-1\nenv-1\n"),
-		"generation 0":  ptr("g-1\na-1\nenv-1\n0\n"),
-		"empty grant":   ptr("\na-1\nenv-1\n1\n"),
-	}
-	for name, grant := range cases {
-		t.Run(name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			h := newHost(t)
-			h.accept(ctx)
-			var b bootstrapStarts
-			entries := h.entries()
-			if grant != nil {
-				entries[entryGrant] = []byte(*grant)
-			}
-			tl := b.testlink(t, entries)
-			if grant == nil {
-				require.NoError(t, os.RemoveAll(filepath.Join(tl.fwCfgDir, entryGrant)))
-			}
-			res := wait(t, runTestlinkAsync(ctx, tl), "agent to stop")
-			assert.Equal(t, exitRefused, res.code)
-			assert.ErrorContains(t, res.err, entryGrant)
-			assert.Zero(t, b.n)
-		})
-	}
-}
-
-func ptr(s string) *string { return &s }

cmd/lambda-image-agent-tag/main.go

@@ -1,224 +0,0 @@
-// Command lambda-image-agent-tag checks whether the lambda-agent archived in a
-// built Lambda guest initramfs carries the lambdatestlink build tag. Build
-// information is recorded by the build; it is not proof of how the agent behaves.
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"debug/buildinfo"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"slices"
-	"strconv"
-	"strings"
-)
-
-const (
-	agentPath    = "usr/local/bin/lambda-agent"
-	maxArchive   = 1 << 30
-	maxAgent     = 256 << 20
-	maxName      = 4096
-	newcHeader   = 110
-	trailerName  = "TRAILER!!!"
-	modeTypeMask = 0o170000
-	modeDir      = 0o040000
-	modeRegular  = 0o100000
-)
-
-var agentParents = []string{"usr", "usr/local", "usr/local/bin"}
-
-func main() {
-	if len(os.Args) != 3 || (os.Args[2] != "present" && os.Args[2] != "absent") {
-		fmt.Fprintln(os.Stderr, "usage: lambda-image-agent-tag <initramfs.cpio.gz> present|absent")
-		os.Exit(2)
-	}
-	if err := run(os.Args[1], os.Args[2] == "present"); err != nil {
-		fmt.Fprintf(os.Stderr, "%s: %v\n", os.Args[1], err)
-		os.Exit(1)
-	}
-}
-
-func run(path string, want bool) error {
-	fi, err := os.Lstat(path)
-	if err != nil {
-		return err
-	}
-	if !fi.Mode().IsRegular() {
-		return errors.New("not a regular file")
-	}
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	agent, err := archivedAgent(f)
-	if err != nil {
-		return err
-	}
-	return checkTag(agent, want)
-}
-
-// archivedAgent returns the single agent entry after checking listed names,
-// entry types, the agent's link count and zero-only padding after the trailer.
-// It is not a full kernel-equivalent parser; 070702 CRCs, for one, are unchecked.
-func archivedAgent(r io.Reader) ([]byte, error) {
-	zr, err := gzip.NewReader(bufio.NewReader(r))
-	if err != nil {
-		return nil, fmt.Errorf("not a readable gzip archive: %w", err)
-	}
-	raw, err := io.ReadAll(io.LimitReader(zr, maxArchive+1))
-	if err != nil {
-		return nil, fmt.Errorf("not a readable gzip archive: %w", err)
-	}
-	if len(raw) > maxArchive {
-		return nil, fmt.Errorf("archive larger than %d bytes", maxArchive)
-	}
-
-	seen := map[string]bool{}
-	var agent []byte
-	off := 0
-	for {
-		e, next, err := parseEntry(raw, off)
-		if err != nil {
-			return nil, fmt.Errorf("entry at offset %d: %w", off, err)
-		}
-		off = next
-		if e.name == trailerName {
-			break
-		}
-		if !canonical(e.name) {
-			return nil, fmt.Errorf("entry name %q is not canonical", e.name)
-		}
-		if seen[e.name] {
-			return nil, fmt.Errorf("entry %q appears more than once", e.name)
-		}
-		seen[e.name] = true
-		for _, p := range agentParents {
-			if e.name == p && e.mode&modeTypeMask != modeDir {
-				return nil, fmt.Errorf("%s is not a directory", p)
-			}
-		}
-		if e.name == agentPath {
-			for _, p := range agentParents {
-				if !seen[p] {
-					return nil, fmt.Errorf("%s has no %s directory entry before it", agentPath, p)
-				}
-			}
-			if e.mode&modeTypeMask != modeRegular {
-				return nil, fmt.Errorf("%s is not a regular file", agentPath)
-			}
-			if e.nlink != 1 {
-				return nil, fmt.Errorf("%s has %d links, want 1", agentPath, e.nlink)
-			}
-			if len(e.data) > maxAgent {
-				return nil, fmt.Errorf("%s is larger than %d bytes", agentPath, maxAgent)
-			}
-			agent = e.data
-		}
-	}
-	if i := bytes.IndexFunc(raw[off:], func(r rune) bool { return r != 0 }); i >= 0 {
-		return nil, fmt.Errorf("data after the archive trailer at offset %d", off+i)
-	}
-	if agent == nil {
-		return nil, fmt.Errorf("no %s entry", agentPath)
-	}
-	return agent, nil
-}
-
-type entry struct {
-	name  string
-	mode  uint64
-	nlink uint64
-	data  []byte
-}
-
-func parseEntry(raw []byte, off int) (entry, int, error) {
-	if len(raw)-off < newcHeader {
-		return entry{}, 0, errors.New("truncated header")
-	}
-	h := raw[off : off+newcHeader]
-	if m := string(h[:6]); m != "070701" && m != "070702" {
-		return entry{}, 0, fmt.Errorf("magic %q is not newc", m)
-	}
-	field := func(i int) (uint64, error) {
-		return strconv.ParseUint(string(h[6+8*i:14+8*i]), 16, 32)
-	}
-	mode, err1 := field(1)
-	nlink, err2 := field(4)
-	size, err3 := field(6)
-	nameSize, err4 := field(11)
-	if err := errors.Join(err1, err2, err3, err4); err != nil {
-		return entry{}, 0, fmt.Errorf("bad header field: %w", err)
-	}
-	if nameSize < 2 || nameSize > maxName {
-		return entry{}, 0, fmt.Errorf("name size %d out of range", nameSize)
-	}
-	nameEnd := off + newcHeader + int(nameSize)
-	dataOff := align4(nameEnd)
-	if dataOff > len(raw) || size > uint64(len(raw)-dataOff) {
-		return entry{}, 0, errors.New("truncated entry")
-	}
-	dataEnd := dataOff + int(size)
-	if dataEnd > len(raw) || align4(dataEnd) > len(raw) {
-		return entry{}, 0, errors.New("truncated entry")
-	}
-	name := raw[off+newcHeader : nameEnd]
-	if name[len(name)-1] != 0 || bytes.IndexByte(name[:len(name)-1], 0) >= 0 {
-		return entry{}, 0, errors.New("name is not one NUL-terminated string")
-	}
-	return entry{name: string(name[:len(name)-1]), mode: mode, nlink: nlink, data: raw[dataOff:dataEnd]}, align4(dataEnd), nil
-}
-
-func align4(n int) int { return (n + 3) &^ 3 }
-
-// canonical accepts "." and relative names with no empty, "." or ".." component.
-func canonical(name string) bool {
-	if name == "." {
-		return true
-	}
-	if name == "" || strings.HasPrefix(name, "/") {
-		return false
-	}
-	for c := range strings.SplitSeq(name, "/") {
-		if c == "" || c == "." || c == ".." {
-			return false
-		}
-	}
-	return true
-}
-
-func checkTag(agent []byte, want bool) error {
-	info, err := buildinfo.Read(bytes.NewReader(agent))
-	if err != nil {
-		return fmt.Errorf("no Go build information in %s: %w", agentPath, err)
-	}
-	return decide(info, want)
-}
-
-// decide refuses build information with no recorded settings, since their
-// absence does not show the tag was absent.
-func decide(info *buildinfo.BuildInfo, want bool) error {
-	if len(info.Settings) == 0 {
-		return fmt.Errorf("%s records no build settings", agentPath)
-	}
-	if hasTag(info, "lambdatestlink") != want {
-		return fmt.Errorf("%s: lambdatestlink build tag present=%v, want %v", agentPath, !want, want)
-	}
-	return nil
-}
-
-func hasTag(info *buildinfo.BuildInfo, tag string) bool {
-	for _, s := range info.Settings {
-		if s.Key != "-tags" {
-			continue
-		}
-		if slices.Contains(strings.Split(s.Value, ","), tag) {
-			return true
-		}
-	}
-	return false
-}

cmd/lambda-image-agent-tag/main_test.go

@@ -1,154 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"compress/gzip"
-	"debug/buildinfo"
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime/debug"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-type fileEntry struct {
-	name  string
-	mode  uint32
-	nlink uint32
-	data  string
-}
-
-func dir(name string) fileEntry { return fileEntry{name: name, mode: modeDir | 0o755, nlink: 2} }
-func file(name, data string) fileEntry {
-	return fileEntry{name: name, mode: modeRegular | 0o755, nlink: 1, data: data}
-}
-func symlink(name, target string) fileEntry {
-	return fileEntry{name: name, mode: 0o120777, nlink: 1, data: target}
-}
-
-// newc writes entries and a trailer in the format the kernel unpacks.
-func newc(entries ...fileEntry) []byte {
-	var b bytes.Buffer
-	for i, e := range append(entries, fileEntry{name: trailerName, nlink: 1}) {
-		fmt.Fprintf(&b, "070701%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X%08X",
-			i+1, e.mode, 0, 0, e.nlink, 0, len(e.data), 0, 0, 0, 0, len(e.name)+1, 0)
-		b.WriteString(e.name)
-		b.WriteByte(0)
-		pad(&b)
-		b.WriteString(e.data)
-		pad(&b)
-	}
-	return b.Bytes()
-}
-
-func pad(b *bytes.Buffer) {
-	for b.Len()%4 != 0 {
-		b.WriteByte(0)
-	}
-}
-
-func gz(parts ...[]byte) []byte {
-	var b bytes.Buffer
-	for _, p := range parts {
-		w := gzip.NewWriter(&b)
-		_, _ = w.Write(p)
-		_ = w.Close()
-	}
-	return b.Bytes()
-}
-
-func withAgent(agent fileEntry) []byte {
-	return newc(dir("."), dir("usr"), dir("usr/local"), dir("usr/local/bin"), agent, file("init", "#!/bin/sh"))
-}
-
-func TestArchivedAgent_ReturnsTheOneArchivedAgent(t *testing.T) {
-	got, err := archivedAgent(bytes.NewReader(gz(withAgent(file(agentPath, "agent-bytes")))))
-	require.NoError(t, err)
-	require.Equal(t, "agent-bytes", string(got))
-
-	padded := append(withAgent(file(agentPath, "agent-bytes")), make([]byte, 1024)...)
-	got, err = archivedAgent(bytes.NewReader(gz(padded)))
-	require.NoError(t, err, "zero padding after the trailer")
-	require.Equal(t, "agent-bytes", string(got))
-}
-
-func TestArchivedAgent_Refuses(t *testing.T) {
-	parents := []fileEntry{dir("."), dir("usr"), dir("usr/local"), dir("usr/local/bin")}
-	agent := file(agentPath, "untagged")
-	small := newc(append(parents, agent)...)
-	second := newc(append(parents[1:], file(agentPath, "tagged"))...)
-	// The second archive starts inside what would be the first one's final block.
-	sameBlock := append(append([]byte{}, small...), second...)
-	for len(sameBlock)%512 != 0 {
-		sameBlock = append(sameBlock, 0)
-	}
-
-	for name, archive := range map[string][]byte{
-		"aliased duplicate":            gz(newc(append(parents, agent, file("././"+agentPath, "tagged"))...)),
-		"leading slash alias":          gz(newc(append(parents, agent, file("/"+agentPath, "tagged"))...)),
-		"dot-dot component":            gz(newc(append(parents, agent, file("usr/local/../local/bin/lambda-agent", "x"))...)),
-		"empty component":              gz(newc(append(parents, agent, file("usr//local/bin/lambda-agent", "x"))...)),
-		"exact duplicate":              gz(newc(append(parents, agent, file(agentPath, "tagged"))...)),
-		"duplicate directory":          gz(newc(dir("usr"), dir("usr"), dir("usr/local"), dir("usr/local/bin"), agent)),
-		"missing directory entry":      gz(newc(dir("usr"), dir("usr/local/bin"), agent)),
-		"directory after the agent":    gz(newc(dir("usr"), dir("usr/local"), agent, dir("usr/local/bin"))),
-		"parent is a symlink":          gz(newc(dir("usr"), dir("usr/local"), symlink("usr/local/bin", "elsewhere"), agent)),
-		"agent is a symlink":           gz(newc(append(parents, symlink(agentPath, "/bin/sh"))...)),
-		"hard-linked agent":            gz(newc(append(parents, fileEntry{name: agentPath, mode: modeRegular | 0o755, nlink: 2, data: "x"})...)),
-		"no agent":                     gz(newc(parents...)),
-		"second archive appended":      gz(small, second),
-		"second archive in same block": gz(sameBlock),
-		"non-zero byte after trailer":  gz(append(append([]byte{}, small...), 0, 0, 1)),
-		"truncated archive":            gz(small[:len(small)-20]),
-		"not newc":                     gz([]byte("not cpio at all, but long enough to fill one newc header: " + string(make([]byte, 120)))),
-		"not gzip":                     small,
-	} {
-		t.Run(name, func(t *testing.T) {
-			_, err := archivedAgent(bytes.NewReader(archive))
-			require.Error(t, err)
-		})
-	}
-}
-
-func TestRun_RefusesASymlinkedImagePath(t *testing.T) {
-	d := t.TempDir()
-	img := filepath.Join(d, "initramfs.cpio.gz")
-	require.NoError(t, os.WriteFile(img, gz(withAgent(file(agentPath, "x"))), 0o644))
-	require.NoError(t, os.Symlink(img, filepath.Join(d, "link")))
-	require.ErrorContains(t, run(filepath.Join(d, "link"), false), "not a regular file")
-}
-
-func TestHasTag_MatchesWholeTagsOnly(t *testing.T) {
-	info := func(tags string) *buildinfo.BuildInfo {
-		return &buildinfo.BuildInfo{Settings: []debug.BuildSetting{{Key: "-buildmode", Value: "exe"}, {Key: "-tags", Value: tags}}}
-	}
-	require.True(t, hasTag(info("lambdatestlink,fips140v1.0"), "lambdatestlink"))
-	require.False(t, hasTag(info("fips140v1.0"), "lambdatestlink"))
-	require.False(t, hasTag(info("lambdatestlinkx,xlambdatestlink"), "lambdatestlink"))
-	require.False(t, hasTag(&buildinfo.BuildInfo{}, "lambdatestlink"))
-}
-
-// The test binary carries real build information, so checkTag reads it and
-// refuses the opposite answer; bytes with no build information are refused.
-func TestCheckTag_ReadsRealBuildInformation(t *testing.T) {
-	exe, err := os.Executable()
-	require.NoError(t, err)
-	raw, err := os.ReadFile(exe)
-	require.NoError(t, err)
-	info, err := buildinfo.Read(bytes.NewReader(raw))
-	require.NoError(t, err)
-	tagged := hasTag(info, "lambdatestlink")
-	require.NoError(t, checkTag(raw, tagged))
-	require.Error(t, checkTag(raw, !tagged))
-	require.Error(t, checkTag([]byte("not a Go binary"), false))
-}
-
-func TestDecide_RefusesMissingBuildSettings(t *testing.T) {
-	require.ErrorContains(t, decide(&buildinfo.BuildInfo{}, false), "no build settings")
-	require.ErrorContains(t, decide(&buildinfo.BuildInfo{}, true), "no build settings")
-	untagged := &buildinfo.BuildInfo{Settings: []debug.BuildSetting{{Key: "-buildmode", Value: "exe"}}}
-	require.NoError(t, decide(untagged, false))
-	require.Error(t, decide(untagged, true))
-}

cmd/lambda-image-digest/main.go

@@ -1,26 +0,0 @@
-//go:build lambdatestlink
-
-// Command lambda-image-digest prints the test-link runtime image digest of one
-// directory, selecting the boot files the same way the daemon does. The digest
-// identifies the bytes; it does not authenticate where they came from.
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/mulgadc/spinifex/spinifex/runtime/compute/lambda/testlink"
-)
-
-func main() {
-	if len(os.Args) != 2 {
-		fmt.Fprintln(os.Stderr, "usage: lambda-image-digest <image-dir>")
-		os.Exit(2)
-	}
-	digest, err := testlink.DirDigest(os.Args[1])
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-	fmt.Println(digest)
-}

contracts/cluster/v1/facts.go

@@ -56,8 +56,6 @@ type NodeFacts struct {
 	Memory      MemoryFacts       `json:"memory"`
 	NICs        []NICFacts        `json:"nics"`
 	Planes      []PlaneFacts      `json:"planes"`
-	Disks       []DiskFacts       `json:"disks,omitempty"`
-	Filesystems []FilesystemFacts `json:"filesystems,omitempty"`
 	Sources     map[string]string `json:"sources"`
 }
 
@@ -136,42 +134,6 @@ type MemoryGroup struct {
 	Serials       []string `json:"serials,omitempty"`
 }
 
-// DiskFacts is one physical drive as sysfs reports it. Transport is nvme, sata,
-// usb or virtio, and empty when the device path names none, as a RAID
-// controller's virtual disk does.
-type DiskFacts struct {
-	Name       string `json:"name"`
-	Path       string `json:"path"`
-	SizeBytes  uint64 `json:"size_bytes"`
-	Model      string `json:"model,omitempty"`
-	Transport  string `json:"transport,omitempty"`
-	Rotational bool   `json:"rotational,omitempty"`
-	Removable  bool   `json:"removable,omitempty"`
-}
-
-// FilesystemFacts is one mounted block-device or ZFS filesystem. BindOf names
-// the directory a bind mount shows; Disk names the drives under it. Error says
-// why Usage is missing or stale.
-type FilesystemFacts struct {
-	Mount  string           `json:"mount"`
-	Source string           `json:"source"`
-	Disk   string           `json:"disk,omitempty"`
-	Type   string           `json:"type"`
-	BindOf string           `json:"bind_of,omitempty"`
-	Usage  *FilesystemUsage `json:"usage,omitempty"`
-	Error  string           `json:"error,omitempty"`
-	// ID identifies the mount on its node, so a filesystem replaced at the
-	// same path is read afresh. Empty for a mount the daemon cannot see.
-	ID string `json:"-"`
-}
-
-// FilesystemUsage is a filesystem's last statfs reading, as df counts it.
-type FilesystemUsage struct {
-	SizeBytes  uint64 `json:"size_bytes"`
-	UsedBytes  uint64 `json:"used_bytes"`
-	AvailBytes uint64 `json:"avail_bytes"`
-}
-
 // NICFacts is one physical network interface and, where LLDP reports it, the
 // switch port it is cabled to.
 type NICFacts struct {

contracts/lambda/v1/README.md

@@ -21,7 +21,7 @@ Tenant code may be able to reach the listener, but it cannot open the agent's co
 **Authentication:** mutual TLS 1.3, bound to the environment ID and realization generation, using material the user runtime cannot read (ADR-0009:S17).
 For each generation the executor creates ephemeral self-signed host and guest certificates whose single URI SAN is `spinifex-lambda://<Region>/<account>/<function ID>/<environment ID>/<generation>/<role>`, with role `host` or `guest`.
 Each end validates the peer certificate against the one pinned peer certificate and separately requires that URI SAN with the opposite role; hostname verification is not relied on.
-ALPN carries the L-GUEST major version, `spinifex-lambda-guest/1`, and an unsupported version fails the handshake. Builds with the `lambdatestlink` tag offer only `spinifex-lambda-testlink/2` on both host and guest, whose first frame carries the execution-role credential, so a test-link end and a release end fail the handshake; release builds are unchanged.
+ALPN carries the L-GUEST major version, `spinifex-lambda-guest/1`, and an unsupported version fails the handshake.
 Under TLS 1.3 the guest's handshake can complete before the host refuses its certificate, so the guest treats the connection as accepted only after the host's first message.
 
 **Bootstrap material:** the executor passes these fw_cfg entries under `opt/spinifex/lambda/`, and the agent reads them as root and unloads `qemu_fw_cfg` before user code starts.

docs/COMMANDS.md

@@ -19,7 +19,7 @@ Every service is `PartOf=spinifex.target` and ordered by its own `After=`/`Wants
 | `spinifex-predastore.service` | `spx service predastore start` | S3-compatible object storage, serving that host's nodes and the S3 gate among them |
 | `spinifex-northstar.service` | `spx service northstar start` | Authoritative DNS for `*.spx3.net`, recursive via upstream forwarders, syncing zones from its S3 bucket |
 | `spinifex-viperblock.service` | `spx service viperblock start` | Block storage with the NBD plugin. `KillMode=process`: nbdkit serving a guest survives a restart of this unit |
-| `spinifex-daemon.service` | `spx service spinifex start` | VM orchestration, NATS subscriptions, health endpoint. Two `ExecStartPre` steps run first: `spx admin hostnet check`, and `spx admin node-facts collect`, which runs as root and whose failure does not stop the daemon. `KillMode=process`: guest QEMU survives a restart and the new daemon reattaches. `SIGHUP` reloads config |
+| `spinifex-daemon.service` | `spx service spinifex start` | VM orchestration, NATS subscriptions, health endpoint. `KillMode=process`: guest QEMU survives a restart and the new daemon reattaches. `SIGHUP` reloads config |
 | `spinifex-awsgw.service` | `spx service awsgw start` | AWS-compatible gateway: SigV4 auth, IAM policy enforcement, TLS. Also serves the Private Admin API |
 | `spinifex-vpcd.service` | `spx service vpcd start` | VPC daemon: translates `vpc.*` NATS events to OVN logical switches, ports and routers |
 | `spinifex-ui.service` | `spx service spinifex-ui start` | Web UI serving the React frontend |
@@ -129,7 +129,6 @@ Operational commands for inspecting cluster state. These fan out NATS requests t
 |---------|-------|-------------|
 | `spx admin preflight` | `--quiet` (print only non-OK rows) | Reports whether this host has the privileged helper scripts and sudoers grants the installed build depends on. `spx version` knows the build but not the host: `setup.sh` and `setup-ovn.sh` install those assets, and a binary-swap deploy (`make deploy`, or a manual copy) skips them. It also reports any running service still executing a replaced binary — overwriting `/usr/local/bin/spx` while `spinifex.target` is up does not move services onto it, so each keeps executing the replaced inode until it restarts and a node can serve a mixture of two builds indefinitely. Checks compare content, not existence, so a present-but-stale asset is caught. On x86_64 it also checks that the QEMU binary the daemon will run lists the `microvm` machine type and that the microvm firmware `/usr/share/spinifex/microvm/qboot.rom` is installed, since load balancers boot on both. It runs the host network check `spinifex-daemon` and `spinifex-vpcd` run before they start, and fails while firewalld or ufw is active, since the Spinifex nftables policy is the only supported node firewall. It reports a Warning, without failing, when systemd-resolved is active but `/etc/resolv.conf` is not its stub, since lookups then bypass the route that sends Spinifex names to northstar. Exits non-zero if any asset is Missing, Stale, Ungranted, Unsupported or Failed. |
 | `spx admin node js-probe` | `--timeout` (default: 10s) | Round-trips a canary key through the cluster-state KV bucket and exits non-zero if the write or the read-back fails. JetStream can latch a write error per message block and keep serving reads — nats-server's filestore records the failure on the block and returns it on every later write, and nothing clears it short of a restart. The HTTP health endpoint reports the server-wide JetStream state, which that latch never touches, so only an actual write observes it. |
-| `spx admin node-facts collect` | — | Runs `dmidecode`, `ethtool`, `udevadm`, `networkctl lldp` and `systemd-detect-virt`, and writes their raw output to `/etc/spinifex/node-facts/`, readable by the spinifex group. `spinifex-daemon.service` runs it as a root `ExecStartPre` because the daemon itself is unprivileged; the daemon parses the files when the operator console asks. A probe that fails writes no new file, so a file from an earlier successful run can remain and the console reads it as available; a source with no file is shown as unavailable. |
 | `spx admin banner` | `--boot-check` | Writes the node information banner to `/etc/issue` (shown before login on the physical/serial console) and `/etc/motd` (shown after SSH login). With `--boot-check` it also detects a management IP that has changed since last boot and updates `/etc/spinifex/node.conf` accordingly. |
 
 ### Storage Inspection
@@ -137,7 +136,6 @@ Operational commands for inspecting cluster state. These fan out NATS requests t
 | Command | Flags | Description |
 |---------|-------|-------------|
 | `spx admin volumes orphans` | — | Lists volumes the storage provider holds that the control plane has no record of. Their blocks consume space but they have no API handle, so they can be neither described nor deleted through the EC2 API. **Reports only, never deletes**: the evidence that an orphan is still wanted is the record that went missing, so removal is an operator decision taken per volume. It also lists UEFI variable stores nothing owns: a `uefi/i-*/` prefix with no instance record and no store record, a `uefi/ami-*/` prefix with no AMI document, and a store record that is not `deleting` and has no instance record. These are reported and never deleted, because an absent instance record is not proof of a terminate. |
-| `spx admin volumes obligations` | — | Lists the open unpublish obligations, oldest first: a volume export that a force detach, or a terminate whose unmount did not complete, left on the node that held the attachment. Each row names the volume, the node, the instance and the age, plus attempts and the last error once the node has tried. The node settles each one once it answers; an obligation stays open while its node is down and closes without the node only once the node has been removed from the cluster. **Reports only.** |
 | `spx admin volumes unsealed` | — | Lists volumes a node has open, or had open, without a confirmed seal to the backend — the node named holds writes predastore may not have. Starting such a volume elsewhere is refused while that node is alive (its daemon heartbeat is under 60 seconds old, or cannot be read) and is otherwise allowed, in which case it opens from the last checkpoint that did reach the backend. This is the list of volumes where that would cost something. |
 | `spx admin storage status` | `--endpoint` (default: this node's AWS gateway), `--region` (default: this node's region), `--ca-bundle` (default: this node's CA) | Sends the signed `GetStorageStatus` action to the AWS gateway with credentials from the standard AWS chain (e.g. `AWS_PROFILE=spinifex`) and prints what the console's Service Metrics page shows: predastore encoding, meta and blob node counts, cluster health, a meta node table (health, raft state, leader, term, commit and applied index) and the blob nodes. Cluster health is `Degraded` when any meta node is unreachable or the nodes reporting raft state do not agree on one leader. A meta node read only through its host's `/readyz` shows healthy with blank raft fields. |
 
@@ -157,9 +155,8 @@ Operational commands for inspecting cluster state. These fan out NATS requests t
 | `spx admin account list --remote` | `--endpoint` (default: this node's AWS gateway), `--region` (default: this node's region), `--ca-bundle` (default: this node's CA) | Same listing read through `POST /admin/ListAccounts` over SigV4 instead of NATS, so an off-cluster operator or the load-test harness sees its tenants without SSH access to a node. Credentials come from the standard AWS credential chain: on a cluster node that means `AWS_PROFILE=spinifex` (there is no default profile, so without it the command fails to find credentials), or equivalent credentials; the caller must be an IAM user in the super-admin account holding `spinifex:ListAccounts`. |
 | `spx admin account quota get <account-id>` | `--endpoint` (default: this node's AWS gateway), `--region` (default: this node's region), `--ca-bundle` (default: this node's CA) | Reads the limits in force for one account through `POST /admin/GetAccountQuota` over SigV4, and reports for each dimension whether it came from the `[quota]` block in `awsgw.toml` (`config`) or from an override stored against the account (`override`). Credentials come from the standard AWS chain; the caller must be an IAM user in the super-admin account holding `spinifex:GetAccountQuota`. |
 | `spx admin account quota set <account-id>` | `--vcpus`, `--vpcs`, `--subnets`, `--eips`, `--volumes`, `--volumes-gib`, `--rds-instances`, `--load-balancers`, `--clear`, plus `--endpoint`, `--region`, `--ca-bundle` | Overrides individual limits for one account through `POST /admin/PutAccountQuota`, leaving every dimension not named inheriting the configured baseline. `-1` uncaps a dimension; `0` is a real limit that denies every request on it. `--clear` removes the whole override record and cannot be combined with a limit flag. The account must already exist. Prints the resulting limits, so a caller never has to guess what it applied. The caller must hold `spinifex:PutAccountQuota`. |
-| `spx admin account delete <account-id>` | `--dry-run`, `--force`, `--non-finalizing` (hidden), `--yes` (requires `--name`), `--name` (account name, must match the stored record), `--endpoint`, `--region`, `--ca-bundle`, `--client-token` | Always runs through `POST /admin/DeleteAccount` over SigV4 and follows `DescribeAccountDeletion` to completion; the CLI never tears an account down in its own process, so a CLI delete and an API delete cannot race. Credentials come from the standard AWS chain; the caller must be an IAM user in the super-admin account holding `spinifex:DeleteAccount` and `spinifex:DescribeAccountDeletion`. Prints the inventory it is about to remove → confirms the account name (prompted unless `--name` is given) → marks the account `TERMINATING`, which blocks its credentials cluster-wide → deletes its resources in dependency order (compute, attachments, storage, network, platform, identity, account), waiting for each stage to actually drain before starting the next → seals the account's quota override record so no later write can recreate it, which needs every gateway node the cluster configures to answer a read-only probe first (otherwise nothing is sealed and the account stays `TERMINATING`) → releases the name reservation and quota counter → deletes the account record. Anything that will not delete is reported as **stuck** with the reason, and the account stays `TERMINATING` so the residue keeps an owner. `000000000000` and `000000000001` are refused. `--dry-run` lists and changes nothing. The compute stage reaps ECS clusters, EKS nodegroups and clusters, and RDS instances before it reaps plain instances, because their backing VMs belong to the system account and a tenant-scoped instance listing cannot see them. The storage stage reaps the account's S3 buckets: uploads in flight are aborted, then the objects are removed a page at a time, then the bucket. Only buckets the account owns are ever listed, so the shared platform buckets are out of reach rather than filtered out. Platform-managed serving endpoints are reaped ahead of instances, because only their own delete releases the ENI and attached data volume alongside the VM, and spot instance requests are cancelled first so a live request cannot launch a replacement for something already terminated. The network stage reaps load balancers, then target groups, then NAT gateways and egress-only internet gateways before the subnets, security groups and addresses they hold. The platform stage reaps ACM certificates. |
+| `spx admin account delete <account-id>` | `--dry-run`, `--force`, `--yes` (requires `--name`), `--name` (account name, must match the stored record), `--endpoint`, `--region`, `--ca-bundle`, `--client-token` | Always runs through `POST /admin/DeleteAccount` over SigV4 and follows `DescribeAccountDeletion` to completion; the CLI never tears an account down in its own process, so a CLI delete and an API delete cannot race. Credentials come from the standard AWS chain; the caller must be an IAM user in the super-admin account holding `spinifex:DeleteAccount` and `spinifex:DescribeAccountDeletion`. Prints the inventory it is about to remove → confirms the account name (prompted unless `--name` is given) → marks the account `TERMINATING`, which blocks its credentials cluster-wide → deletes its resources in dependency order (compute, attachments, storage, network, platform, identity, account), waiting for each stage to actually drain before starting the next → seals the account's quota override record so no later write can recreate it, which needs every gateway node the cluster configures to answer a read-only probe first (otherwise nothing is sealed and the account stays `TERMINATING`) → releases the name reservation and quota counter → deletes the account record. Anything that will not delete is reported as **stuck** with the reason, and the account stays `TERMINATING` so the residue keeps an owner. `000000000000` and `000000000001` are refused. `--dry-run` lists and changes nothing. The compute stage reaps ECS clusters, EKS nodegroups and clusters, and RDS instances before it reaps plain instances, because their backing VMs belong to the system account and a tenant-scoped instance listing cannot see them. The storage stage reaps the account's S3 buckets: uploads in flight are aborted, then the objects are removed a page at a time, then the bucket. Only buckets the account owns are ever listed, so the shared platform buckets are out of reach rather than filtered out. Platform-managed serving endpoints are reaped ahead of instances, because only their own delete releases the ENI and attached data volume alongside the VM, and spot instance requests are cancelled first so a live request cannot launch a replacement for something already terminated. The network stage reaps load balancers, then target groups, then NAT gateways and egress-only internet gateways before the subnets, security groups and addresses they hold. The platform stage reaps ACM certificates. |
 | `spx admin account delete --force` | as above | Escalates only for resources the ordinary API refuses: it clears a volume attachment in the control plane without the guest's cooperation (`ec2.ForceDetachVolume`), hard-destroys after a graceful attempt times out, and treats an already-missing resource as deleted. It never reorders the stages and never widens scope beyond the account. Use it once the guest is being destroyed — this is the escape from a volume stuck attached to an instance that will not terminate, where neither can otherwise be deleted. |
-| `spx admin account delete --non-finalizing` | as above | An exercise run, not a finalising delete, but the cleanup is real. Marks the account `TERMINATING`, deletes the resources of each EC2 platform kind the evaluation found quiesced (for example key pairs, empty placement groups and orphaned tags), re-reads the owner inventory against that cleanup, and ends `EXERCISED` with the account still `TERMINATING`. No other stage runs and the account record, name reservation and quota are left in place. It refuses `--force` and `--dry-run`. |
 | `spx admin account delete --remote` | as above | Accepted for existing scripts and ignored: every delete already goes through the admin API. |
 | `spx admin principal create <name>` | `--grant` (repeatable or comma-separated; default: every admin method — `CreateAccount`, `DeleteAccount`, `DescribeAccountDeletion`, `GetAccountQuota`, `ListAccounts`, `PutAccountQuota`) | Creates an IAM user in the super-admin account with an inline `spx-admin-methods` policy allowing the requested methods, revokes any access key left from a previous run, and mints one new key. Each method is named rather than granted as `spinifex:*`, so a later addition to the admin surface is not authorised by an existing key. The principal's grants are exactly that one policy: re-running with fewer `--grant` values narrows it, and any other inline policy on the user is removed, so a rename cannot leave a wider grant behind. The secret is printed once; store it in a secret manager or an AWS profile, never in a config file. `admin` is refused as a name — it is the account's own administrator and rotating its key would revoke the bootstrap credential. |
 | `spx admin principal list` | — | Lists every principal in the super-admin account with its access-key count and what it may call. An attached policy is reported by name (`AdministratorAccess (attached)`) rather than expanded, which is how an unscoped principal is spotted. |

docs/DESIGN.md

@@ -111,9 +111,7 @@ Daemons (`spinifex/runtime/daemon/daemon.go`) subscribe to NATS topics and handl
 When a daemon handles `RunInstances`:
 
 1. **Resource Check**: Validates CPU/memory availability via `ResourceManager`
-2. **Volume Generation**: Creates boot and EFI volumes via Viperblock
-   A UEFI instance whose record carries a variable store pointer has no EFI volume: its `vars.fd` is fetched from the object under `uefi/` in the configured Predastore bucket that the pointer names, recorded in the `spinifex-uefi-stores` JetStream bucket (or reused when `seeded.json` on this node already names the same object) after a firmware architecture and VARS size check, and a record with both or neither is refused.
-   RunInstances still creates the EFI volume, nothing writes `vars.fd` back to the object store yet, and a terminated instance's store is removed by a cluster-wide reaper.
+2. **Volume Generation**: Creates the boot volume through the EBS provider and, for a UEFI guest, seeds its variable store as an object under `uefi/<instance-id>/` with a store record in `spinifex-uefi-stores` and a pointer on the instance record
 3. **Volume Mount**: Publishes each volume through the EBS provider contract (`PublishVolume` on `ebs.provider.v1.{node}.mount`), receives its export
 4. **QEMU Launch**: Builds and executes QEMU command with NBD-backed disks
 5. **QMP Monitoring**: Establishes QEMU Machine Protocol connection for VM management
@@ -227,9 +225,6 @@ It may keep writing for 40 seconds after the last write the store acknowledged,
 A slow acknowledgement therefore shortens the remaining validity rather than extending it, and an acquisition acknowledged after its validity has already run out is refused as retryable.
 
 For a holder that cannot renew, a timer is armed for the validity deadline, leaving a nominal 5 seconds before the entry can expire; when it fires, the export's nbdkit is fenced with SIGKILL (`volume_fence.go`).
-The kill comes first: the read that names the winner (bounded at 2 seconds) and the notice to the daemon follow it, so a hung lease store cannot hold the writer alive.
-The notice is a request that viperblockd repeats every 2 seconds until the local daemon replies with `VolumeFencedAck`, because the fence often runs while the node's NATS server is restarting.
-On the notice the daemon moves the guest using the volume to `error` with state reason `Server.VolumeFenced` and SIGKILLs its QEMU immediately rather than shutting it down gracefully, because there is no disk left to flush to; it only stops the guest process and removes its taps, and never terminates the instance or deletes a volume.
 The fence runs on its own goroutine, so Go scheduling, that goroutine and process termination all delay the kill, and enough delay can use up the whole margin; a kill held in uninterruptible sleep, which the fence waits up to 30 seconds for, is the extreme case.
 Once a lease is lost or has lapsed it stays lost: a renewal that succeeds afterwards is ignored, and another open on the same node cannot share it while the fence runs.
 

docs/compute/vpc-networking/README.md

@@ -315,7 +315,7 @@ prefix_len = 24
 
 ### Host access to instances (jumpbox pattern)
 
-The spinifex host automatically reaches every instance's **private IP**: each node converges a host route into OVN (`<vpc-cidr> via <gateway-transit-ip> dev spx-nat-host`) for every attached VPC, and the IGW attach exempts the transit net from SNAT, so replies to host-initiated connections come back un-NATted. No per-instance setup. This only exists in routed NAT mode; other modes install no host routes. Every node runs this loop itself, on each intent change, on a nudge from the local IGW hooks and every 30 seconds, so a node that missed the attach event still gets the route. A route is removed on every node when no attached VPC holds its CIDR any more, such as after a detach. When several attached VPCs share one CIDR, the bootstrap VPC wins, then the lowest VPC ID, so detaching one gateway repoints the route to another attached VPC instead of removing it.
+The spinifex host automatically reaches every instance's **private IP**: IGW attach installs a host route into OVN (`<vpc-cidr> via <gateway-transit-ip> dev spx-nat-host`) and exempts the transit net from SNAT, so replies to host-initiated connections come back un-NATted. No per-instance setup.
 
 Security groups still apply and the default SG is closed to the host, same as AWS — open SSH/ICMP from the transit net first:
 

docs/coverage/ec2/README.md

@@ -43,21 +43,6 @@ A missing `Name`, `BlockDeviceMappings` or root snapshot answers `MissingParamet
 Registering with `--ena-support`, `--no-ena-support` and neither, copying the image, and three refusals were run on a three-node cluster with the AWS CLI.
 Launching an instance from an `EnaSupport` image was not run, so the launch path is unchanged by construction and not by test.
 
-### CreateSnapshot Error Mapping
-
-`CreateSnapshot` drains and snapshots the volume inside the EBS provider.
-A provider that cannot snapshot a volume because it is in use, as the `qemunbd` provider cannot for an attached volume, answers `ErrVolumeInUse`, which becomes `IncorrectState` with the message `The volume 'vol-...' is in use. Detach it before creating a snapshot.`
-The `viperblockd` provider drains a mounted export and snapshots it, so an attached volume succeeds there.
-A provider that cannot answer now, for example because another node holds the volume, answers `ServiceUnavailable` so the caller retries.
-Any other provider failure is `ServerInternal`.
-The snapshot taken for `CreateImage` maps these errors the same way.
-
-### EBS Encryption by Default Follows the Platform
-
-Whether new volumes are encrypted is decided by the platform's encryption key, not by the account.
-`GetEbsEncryptionByDefault` and `EnableEbsEncryptionByDefault` report `true` when the platform has an encryption key configured and `false` otherwise, and `EnableEbsEncryptionByDefault` does not change that.
-`DisableEbsEncryptionByDefault` is refused with `OperationNotPermitted` and the message `EBS encryption by default cannot be disabled: this platform encrypts every volume` while the platform encrypts, and answers `false` where it does not.
-
 ### Operations
 
 | Operation |

docs/security/network-connections/README.md

@@ -99,7 +99,7 @@ behavior in other words.
 | 4432 | Formation server | HTTPS | Cluster (bootstrap only) | Cluster join coordination; active only while a join token is valid. Binds the node's `--bind` (lan) address. See *Formation port lifecycle* below. | Short-lived bearer token + TLS¹ |
 | 4222 | spinifex-nats (client) | NATS + TLS | Cluster | Internal service bus for EC2/EBS/VPC/S3 handlers | Token + mutual TLS (cluster CA) |
 | 4248 | spinifex-nats (cluster) | NATS + TLS | Cluster | Inter-node NATS federation | Token + mutual TLS (cluster CA) |
-| 5001 | iperf2 (admin network test) | TCP | Cluster, any plane | Throughput test between two nodes, started only by the super-admin account. Listens on one plane address for the length of one test, then exits. Runs with no capabilities. | None — peer-scoped by firewall, and the client is refused unless the target address is the one the named target node reports on that plane |
+| 5001 | iperf2 (admin network test) | TCP | Cluster, any plane | Throughput test between two nodes, started only by the super-admin account. Listens on one plane address for the length of one test, then exits. Runs with no capabilities. | None — peer-scoped by firewall, and the client may only target its own plane subnet |
 | 5300 | northstar | DNS (UDP + TCP) | Cluster | Forward target for every node's per-instance DNS shim, dialled cross-node. Binds the wildcard by design. | None — restrict by firewall |
 | 6660 | predastore (blob node) | QUIC / UDP | Cluster | Erasure-coded object shard transport between hosts. Multi-node clusters only — see *Predastore ports* below. | TLS 1.3, server certificate verified against the cluster CA |
 | 7660 | predastore (meta node) | QUIC / UDP | Cluster | Raft consensus over global state — buckets and the object index — between hosts. Multi-node clusters only. | TLS 1.3, server certificate verified against the cluster CA |

docs/testing/e2e-coverage.md

@@ -110,7 +110,7 @@ Three entry points, in the order they run:
 
 ### `iam` — everything IAM and STS
 
-Policy evaluation against live requests rather than unit-level: a deny applying to the next request without a new credential, resource-scoped grants naming one key pair, a user rename needing `iam:UpdateUser` on both the old and the new name, `aws:SourceIp` seeing the real client address, assumed-role sessions carrying role policies, and revocation stopping one key alone.
+Policy evaluation against live requests rather than unit-level: a deny applying to the next request without a new credential, resource-scoped grants naming one key pair, `aws:SourceIp` seeing the real client address, assumed-role sessions carrying role policies, and revocation stopping one key alone.
 
 ### `cert` — the cluster CA and TLS identity
 

internal/awsmodel/ec2error_test.go

@@ -77,8 +77,8 @@ func TestEC2ErrorCatalogMetadataAndClasses(t *testing.T) {
 	if catalog.metadata.VerifiedOn == "" {
 		t.Fatal("verifiedOn is empty")
 	}
-	if len(catalog.codes) != 116 {
-		t.Fatalf("catalog code count = %d, want 116", len(catalog.codes))
+	if len(catalog.codes) != 115 {
+		t.Fatalf("catalog code count = %d, want 115", len(catalog.codes))
 	}
 	if catalog.codes["InvalidParameterValue"] != ec2ErrorClassClient {
 		t.Fatal("InvalidParameterValue is not classified as client")

internal/awsmodel/models/ec2/error-codes.json

@@ -1,6 +1,6 @@
 {
   "source": "https://docs.aws.amazon.com/ec2/latest/devguide/errors-overview.html",
-  "verifiedOn": "2026-11-04",
+  "verifiedOn": "2026-08-05",
   "commonClient": [
     "AuthFailure",
     "Blocked",
@@ -95,7 +95,6 @@
     "InvalidVolumeID.Malformed",
     "InvalidVpcID.NotFound",
     "InvalidVpcRange",
-    "NatGatewayNotFound",
     "OperationNotPermitted",
     "ReservationCapacityExceeded",
     "Resource.AlreadyAssociated",

internal/ecsgw/client.go

@@ -7,10 +7,9 @@ package ecsgw
 
 import (
 	"bytes"
-	"crypto/sha256"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
-	"encoding/hex"
 	"fmt"
 	"io"
 	"net/http"
@@ -18,8 +17,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	v4 "github.com/aws/aws-sdk-go/aws/signer/v4"
+
 	"github.com/mulgadc/bluebottle/pkg/tlsconfig"
-	"github.com/mulgadc/spinifex/internal/gwsign"
 )
 
 // targetPrefix is the X-Amz-Target service prefix the gateway's ECS dispatch
@@ -27,26 +28,31 @@ import (
 // suffix); this one mirrors the AWS JSON 1.1 convention.
 const targetPrefix = "AmazonEC2ContainerServiceV20141113."
 
+// CredentialsFunc yields the current SigV4 credentials. It is called once per
+// request so a provider backed by IMDS can rotate instance-role creds (and their
+// session token) transparently. Must be safe for concurrent use.
+type CredentialsFunc func(ctx context.Context) (accessKey, secretKey, sessionToken string, err error)
+
 // Client posts SigV4-signed AWS JSON 1.1 requests to the gateway for service
 // "ecs". One client is reused for register/heartbeat/state/poll.
 type Client struct {
 	baseURL    string
-	signer     *gwsign.Signer
+	creds      CredentialsFunc
 	region     string
 	httpClient *http.Client
 }
 
 // New builds a client. caPath optionally pins the gateway TLS CA; empty relies on
-// the system trust store. signer supplies the per-call instance-role credentials.
+// the system trust store. creds supplies the per-call instance-role credentials.
 // region defaults to us-east-1 when empty (SigV4 requires a non-empty region).
 // timeout bounds a single call — callers needing a long-poll pass a larger value
 // than the default register/heartbeat timeout.
-func New(baseURL, caPath string, signer *gwsign.Signer, region string, timeout time.Duration) (*Client, error) {
+func New(baseURL, caPath string, creds CredentialsFunc, region string, timeout time.Duration) (*Client, error) {
 	if baseURL == "" {
 		return nil, fmt.Errorf("ecsgw: baseURL is required")
 	}
-	if signer == nil {
-		return nil, fmt.Errorf("ecsgw: signer is required")
+	if creds == nil {
+		return nil, fmt.Errorf("ecsgw: credentials func is required")
 	}
 	if region == "" {
 		region = "us-east-1"
@@ -73,7 +79,7 @@ func New(baseURL, caPath string, signer *gwsign.Signer, region string, timeout t
 
 	return &Client{
 		baseURL: strings.TrimRight(baseURL, "/"),
-		signer:  signer,
+		creds:   creds,
 		region:  region,
 		httpClient: &http.Client{
 			Timeout:   timeout,
@@ -84,7 +90,7 @@ func New(baseURL, caPath string, signer *gwsign.Signer, region string, timeout t
 
 // Call SigV4-signs and POSTs body under X-Amz-Target "<prefix><action>" to the
 // gateway root, returning the 2xx response body. Credentials are fetched per call
-// and the signer emits X-Amz-Security-Token for instance-role (temporary)
+// and the v4 signer emits X-Amz-Security-Token for instance-role (temporary)
 // creds, so the gateway's ASIA path verifies them. No retry; callers wrap.
 func (c *Client) Call(action string, body []byte) ([]byte, error) {
 	req, err := http.NewRequest(http.MethodPost, c.baseURL+"/", bytes.NewReader(body))
@@ -94,8 +100,12 @@ func (c *Client) Call(action string, body []byte) ([]byte, error) {
 	req.Header.Set("Content-Type", "application/x-amz-json-1.1")
 	req.Header.Set("X-Amz-Target", targetPrefix+action)
 
-	sum := sha256.Sum256(body)
-	if err := c.signer.Sign(req, hex.EncodeToString(sum[:]), "ecs", c.region); err != nil {
+	akid, secret, token, err := c.creds(req.Context())
+	if err != nil {
+		return nil, fmt.Errorf("retrieve credentials: %w", err)
+	}
+	signer := v4.NewSigner(credentials.NewStaticCredentials(akid, secret, token))
+	if _, err := signer.Sign(req, bytes.NewReader(body), "ecs", c.region, time.Now()); err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
 

internal/ecsgw/client_test.go

@@ -1,29 +1,24 @@
 package ecsgw
 
 import (
+	"context"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/mulgadc/bluebottle/pkg/sigv4"
-	"github.com/mulgadc/spinifex/internal/gwsign"
 )
 
-const testSecret = "secret"
-
-// testSigner signs with a fixed temporary credential set (with a session token,
-// as IMDS instance-role creds carry).
-func testSigner() *gwsign.Signer {
-	return gwsign.New(credentials.NewStaticCredentialsProvider("ASIATEST", testSecret, "session-token-xyz"))
+// testCreds returns a fixed temporary credential set (with a session token, as
+// IMDS instance-role creds carry).
+func testCreds(context.Context) (string, string, string, error) {
+	return "ASIATEST", "secret", "session-token-xyz", nil
 }
 
 func newTestClient(t *testing.T, srv *httptest.Server) *Client {
 	t.Helper()
-	c, err := New(srv.URL, "", testSigner(), "ap-southeast-2", time.Second)
+	c, err := New(srv.URL, "", testCreds, "ap-southeast-2", time.Second)
 	if err != nil {
 		t.Fatalf("New: %v", err)
 	}
@@ -35,14 +30,7 @@ func newTestClient(t *testing.T, srv *httptest.Server) *Client {
 // 2xx body.
 func TestClient_CallSignsAndTargets(t *testing.T) {
 	var gotTarget, gotAuth, gotBody, gotToken string
-	var verifyErr error
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// sigv4.Parse reads and hashes the body itself, then restores it.
-		sr, err := sigv4.Parse(r)
-		if err == nil {
-			_, err = sr.Verify(testSecret, "ap-southeast-2", "ecs")
-		}
-		verifyErr = err
 		gotTarget = r.Header.Get("X-Amz-Target")
 		gotAuth = r.Header.Get("Authorization")
 		gotToken = r.Header.Get("X-Amz-Security-Token")
@@ -57,9 +45,6 @@ func TestClient_CallSignsAndTargets(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Call: %v", err)
 	}
-	if verifyErr != nil {
-		t.Fatalf("gateway-side SigV4 verify failed: %v", verifyErr)
-	}
 	if string(out) != `{"ok":true}` {
 		t.Errorf("body = %q", out)
 	}
@@ -93,10 +78,10 @@ func TestClient_CallErrorStatus(t *testing.T) {
 }
 
 func TestNew_Validation(t *testing.T) {
-	if _, err := New("", "", testSigner(), "r", 0); err == nil {
+	if _, err := New("", "", testCreds, "r", 0); err == nil {
 		t.Error("want error for empty baseURL")
 	}
 	if _, err := New("https://gw:9999", "", nil, "r", 0); err == nil {
-		t.Error("want error for nil signer")
+		t.Error("want error for nil credentials func")
 	}
 }

internal/gwsign/signer.go

@@ -15,7 +15,6 @@ import (
 	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 	"github.com/mulgadc/spinifex/internal/imdscreds"
 )
 
@@ -24,12 +23,6 @@ type Signer struct {
 	provider aws.CredentialsProvider
 }
 
-// New returns a Signer over provider. Wrap a provider that fetches remotely in
-// aws.NewCredentialsCache, since Sign retrieves on every call.
-func New(provider aws.CredentialsProvider) *Signer {
-	return &Signer{provider: provider}
-}
-
 // NewStatic returns a Signer using fixed long-lived keys (no session token).
 func NewStatic(accessKey, secretKey string) *Signer {
 	return &Signer{provider: credentials.NewStaticCredentialsProvider(accessKey, secretKey, "")}
@@ -58,9 +51,8 @@ func NewInstanceRole() *Signer {
 }
 
 // newInstanceRole reads from the IMDS root base; "" means the default endpoint.
-// optFns adjust the SDK IMDS client, e.g. its retryer; none keeps the defaults.
-func newInstanceRole(base string, optFns ...func(*imds.Options)) *Signer {
-	return &Signer{provider: aws.NewCredentialsCache(imdscreds.NewProvider(nil, base, optFns...))}
+func newInstanceRole(base string) *Signer {
+	return &Signer{provider: aws.NewCredentialsCache(imdscreds.NewProvider(nil, base))}
 }
 
 // EnsureCredentials retrieves once from the provider, surfacing the error so a

internal/gwsign/signer_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 	"github.com/mulgadc/bluebottle/pkg/sigv4"
 )
 
@@ -125,41 +124,27 @@ func TestNewIMDS_BuildsProvider(t *testing.T) {
 	}
 }
 
-// imdsStub serves one instance-role credential over IMDSv2. It echoes the token
-// TTL header as real IMDS does, so the SDK client caches the token rather than
-// re-fetching it, through the retry backoff, on every later call.
-func imdsStub(t *testing.T, accessKey, expiration string) *httptest.Server {
-	t.Helper()
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/latest/api/token":
-			w.Header().Set("X-Aws-Ec2-Metadata-Token-Ttl-Seconds", "21600")
-			_, _ = w.Write([]byte("token"))
-		case "/latest/meta-data/iam/security-credentials/":
-			_, _ = w.Write([]byte("sqsWorkerRole"))
-		case "/latest/meta-data/iam/security-credentials/sqsWorkerRole":
-			_, _ = w.Write([]byte(`{"Code":"Success","AccessKeyId":"` + accessKey + `","SecretAccessKey":"s","Token":"t","Expiration":"` + expiration + `"}`))
-		default:
-			http.NotFound(w, r)
-		}
-	}))
-	t.Cleanup(srv.Close)
-	return srv
-}
-
-// singleAttempt disables IMDS client retries so an unreachable endpoint fails
-// on the first attempt instead of after the SDK's 1s-per-retry backoff.
-func singleAttempt(o *imds.Options) { o.Retryer = aws.NopRetryer{} }
-
 // The instance-role signer ignores environment keys and signs only with the
 // credentials the metadata service issues.
 func TestNewInstanceRole_UsesOnlyIMDS(t *testing.T) {
 	t.Setenv("AWS_ACCESS_KEY_ID", testAccessKey)
 	t.Setenv("AWS_SECRET_ACCESS_KEY", testSecretKey)
 	const imdsKey = "ASIAIMDSONLYEXAMPLE1"
-	srv := imdsStub(t, imdsKey, "2099-01-01T00:00:00Z")
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/latest/api/token":
+			_, _ = w.Write([]byte("token"))
+		case "/latest/meta-data/iam/security-credentials/":
+			_, _ = w.Write([]byte("sqsWorkerRole"))
+		case "/latest/meta-data/iam/security-credentials/sqsWorkerRole":
+			_, _ = w.Write([]byte(`{"Code":"Success","AccessKeyId":"` + imdsKey + `","SecretAccessKey":"s","Token":"t","Expiration":"2099-01-01T00:00:00Z"}`))
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	t.Cleanup(srv.Close)
 
-	s := newInstanceRole(srv.URL, singleAttempt)
+	s := newInstanceRole(srv.URL)
 	req := httptest.NewRequest(http.MethodPost, "https://gw.example/", nil)
 	if err := s.Sign(req, emptySHA, testService, testRegion); err != nil {
 		t.Fatal(err)
@@ -169,7 +154,7 @@ func TestNewInstanceRole_UsesOnlyIMDS(t *testing.T) {
 	}
 
 	srv.Close()
-	cold := newInstanceRole(srv.URL, singleAttempt)
+	cold := newInstanceRole(srv.URL)
 	if err := cold.EnsureCredentials(context.Background()); err == nil {
 		t.Fatal("environment keys were used when IMDS was unreachable")
 	}
@@ -179,8 +164,19 @@ func TestNewInstanceRole_UsesOnlyIMDS(t *testing.T) {
 // IMDS must fail the sign rather than reuse the expired key with a new expiry.
 func TestNewInstanceRole_FailedRefreshErrorsInsteadOfStaleKey(t *testing.T) {
 	const staleKey = "ASIASTALEEXAMPLE0001"
-	srv := imdsStub(t, staleKey, "2000-01-01T00:00:00Z")
-	s := newInstanceRole(srv.URL, singleAttempt)
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/latest/api/token":
+			_, _ = w.Write([]byte("token"))
+		case "/latest/meta-data/iam/security-credentials/":
+			_, _ = w.Write([]byte("sqsWorkerRole"))
+		case "/latest/meta-data/iam/security-credentials/sqsWorkerRole":
+			_, _ = w.Write([]byte(`{"Code":"Success","AccessKeyId":"` + staleKey + `","SecretAccessKey":"s","Token":"t","Expiration":"2000-01-01T00:00:00Z"}`))
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	s := newInstanceRole(srv.URL)
 	if err := s.EnsureCredentials(t.Context()); err != nil {
 		t.Fatalf("first retrieve: %v", err)
 	}

internal/imdscreds/imdscreds.go

@@ -21,25 +21,38 @@ import (
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 )
 
+// Credentials is a resolved instance-role credential set with parsed expiry.
+type Credentials struct {
+	AccessKeyID     string
+	SecretAccessKey string
+	SessionToken    string
+	Expiration      time.Time
+}
+
 // Fetch resolves the instance role then its credentials via the SDK's IMDSv2
 // client and the ec2rolecreds provider. base is the IMDS root, e.g.
 // http://169.254.169.254/latest.
-func Fetch(client *http.Client, base string) (aws.Credentials, error) {
+func Fetch(client *http.Client, base string) (Credentials, error) {
 	creds, err := NewProvider(client, base).Retrieve(context.Background())
 	if err != nil {
-		return aws.Credentials{}, fmt.Errorf("fetch IMDS credentials: %w", err)
+		return Credentials{}, fmt.Errorf("fetch IMDS credentials: %w", err)
 	}
 	if creds.AccessKeyID == "" || creds.SecretAccessKey == "" {
-		return aws.Credentials{}, fmt.Errorf("IMDS credentials missing access/secret key")
+		return Credentials{}, fmt.Errorf("IMDS credentials missing access/secret key")
 	}
-	return creds, nil
+	return Credentials{
+		AccessKeyID:     creds.AccessKeyID,
+		SecretAccessKey: creds.SecretAccessKey,
+		SessionToken:    creds.SessionToken,
+		Expiration:      creds.Expires,
+	}, nil
 }
 
 // NewProvider builds an ec2rolecreds provider against base, an IMDS root URL
-// such as http://169.254.169.254/latest. client and optFns are passed to
-// NewClient.
-func NewProvider(client *http.Client, base string, optFns ...func(*imds.Options)) aws.CredentialsProvider {
-	imdsClient := NewClient(client, base, optFns...)
+// such as http://169.254.169.254/latest. A nil client uses the SDK IMDS
+// client's default HTTP client.
+func NewProvider(client *http.Client, base string) aws.CredentialsProvider {
+	imdsClient := NewClient(client, base)
 	return noExtendOnFailure{provider: ec2rolecreds.New(func(o *ec2rolecreds.Options) {
 		o.Client = imdsClient
 	})}
@@ -71,15 +84,16 @@ func (p noExtendOnFailure) AdjustExpiresBy(creds aws.Credentials, dur time.Durat
 	return p.provider.AdjustExpiresBy(creds, dur)
 }
 
-// NewClient builds an SDK IMDS client against base, an IMDS root URL with or
-// without a trailing /latest. A nil client uses the SDK's default HTTP client;
-// optFns adjust the options after the defaults here, as imds.New applies them.
-func NewClient(client *http.Client, base string, optFns ...func(*imds.Options)) *imds.Client {
+// NewClient builds an SDK IMDS client against base, an IMDS root URL such as
+// http://169.254.169.254/latest. A trailing /latest is stripped since the
+// client appends its own; both forms of base keep working. A nil client uses
+// the SDK IMDS client's default HTTP client.
+func NewClient(client *http.Client, base string) *imds.Client {
 	opts := imds.Options{Endpoint: rootEndpoint(base)}
 	if client != nil {
 		opts.HTTPClient = client
 	}
-	return imds.New(opts, optFns...)
+	return imds.New(opts)
 }
 
 // rootEndpoint strips a trailing /latest from base so it can be used as the

internal/imdscreds/imdscreds_test.go

@@ -1,11 +1,9 @@
 package imdscreds
 
 import (
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
-	"sync/atomic"
 	"testing"
 	"time"
 
@@ -62,8 +60,8 @@ func TestFetch_OK(t *testing.T) {
 	if got.AccessKeyID != "AKIATEST" || got.SecretAccessKey != "secrettest" || got.SessionToken != "sessiontoken" {
 		t.Errorf("creds mismatch: %+v", got)
 	}
-	if !got.Expires.Equal(exp) {
-		t.Errorf("Expires = %v, want %v", got.Expires, exp)
+	if !got.Expiration.Equal(exp) {
+		t.Errorf("Expiration = %v, want %v", got.Expiration, exp)
 	}
 }
 
@@ -134,46 +132,3 @@ func TestNewProvider_WithholdsExtendOnFailure(t *testing.T) {
 		t.Error("provider dropped AdjustExpiresBy, which a caller using an ExpiryWindow relies on")
 	}
 }
-
-// Behind aws.CredentialsCache, as the ecs-agent uses it, a refresh that fails
-// against an expired credential must surface as an error rather than hand back
-// the dead key with a pushed-out expiry.
-func TestNewProvider_CachedFailedRefreshErrors(t *testing.T) {
-	var hits atomic.Int32
-	mux := http.NewServeMux()
-	mux.HandleFunc("/latest/api/token", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("X-Aws-Ec2-Metadata-Token-Ttl-Seconds", "21600")
-		_, _ = w.Write([]byte("v2-token"))
-	})
-	mux.HandleFunc("/latest/meta-data/iam/security-credentials/", func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == "/latest/meta-data/iam/security-credentials/" {
-			_, _ = w.Write([]byte("node-role"))
-			return
-		}
-		if hits.Add(1) > 1 {
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		_ = json.NewEncoder(w).Encode(map[string]string{
-			"Code":            "Success",
-			"AccessKeyId":     "AKIA",
-			"SecretAccessKey": "secret",
-			"Expiration":      time.Now().Add(-time.Minute).UTC().Format(time.RFC3339),
-		})
-	})
-	srv := httptest.NewServer(mux)
-	t.Cleanup(srv.Close)
-
-	cache := aws.NewCredentialsCache(NewProvider(srv.Client(), srv.URL+"/latest"))
-	first, err := cache.Retrieve(context.Background())
-	if err != nil {
-		t.Fatalf("first Retrieve: %v", err)
-	}
-	got, err := cache.Retrieve(context.Background())
-	if err == nil {
-		t.Fatalf("refresh failure was reported as success: %+v", got)
-	}
-	if got.Expires.After(first.Expires) {
-		t.Errorf("expiry extended on refresh failure: %v -> %v", first.Expires, got.Expires)
-	}
-}

internal/stsauth/stsauth.go

@@ -8,8 +8,8 @@ package stsauth
 import (
 	"fmt"
 	"net/http"
+	"time"
 
-	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/aws"
 	awscreds "github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -20,15 +20,24 @@ import (
 // scope and the gateway does not enforce a specific value.
 const defaultRegion = "us-east-1"
 
+// Credentials is the decoded result of AssumeRole: a SigV4 credential set bound
+// to the assumed role, with its expiry.
+type Credentials struct {
+	AccessKeyID     string
+	SecretAccessKey string
+	SessionToken    string
+	Expiration      time.Time
+}
+
 // AssumeRole builds an aws-sdk STS client pointed at the gateway and calls
 // AssumeRole with the supplied static (instance-role) credentials, returning the
 // assumed-role credential set. httpClient must trust the gateway CA.
-func AssumeRole(region, gatewayURL string, httpClient *http.Client, akid, secret, sessionToken, roleARN, sessionName string) (awsv2.Credentials, error) {
+func AssumeRole(region, gatewayURL string, httpClient *http.Client, akid, secret, sessionToken, roleARN, sessionName string) (Credentials, error) {
 	if region == "" {
 		region = defaultRegion
 	}
 	if roleARN == "" || sessionName == "" {
-		return awsv2.Credentials{}, fmt.Errorf("stsauth: roleARN and sessionName are required")
+		return Credentials{}, fmt.Errorf("stsauth: roleARN and sessionName are required")
 	}
 	sess, err := session.NewSession(&aws.Config{
 		Region:      aws.String(region),
@@ -38,7 +47,7 @@ func AssumeRole(region, gatewayURL string, httpClient *http.Client, akid, secret
 		DisableSSL:  aws.Bool(false),
 	})
 	if err != nil {
-		return awsv2.Credentials{}, fmt.Errorf("new session: %w", err)
+		return Credentials{}, fmt.Errorf("new session: %w", err)
 	}
 
 	out, err := sts.New(sess).AssumeRole(&sts.AssumeRoleInput{
@@ -46,17 +55,16 @@ func AssumeRole(region, gatewayURL string, httpClient *http.Client, akid, secret
 		RoleSessionName: aws.String(sessionName),
 	})
 	if err != nil {
-		return awsv2.Credentials{}, fmt.Errorf("AssumeRole: %w", err)
+		return Credentials{}, fmt.Errorf("AssumeRole: %w", err)
 	}
 	if out.Credentials == nil {
-		return awsv2.Credentials{}, fmt.Errorf("AssumeRole returned no credentials")
+		return Credentials{}, fmt.Errorf("AssumeRole returned no credentials")
 	}
 	c := out.Credentials
-	return awsv2.Credentials{
+	return Credentials{
 		AccessKeyID:     aws.StringValue(c.AccessKeyId),
 		SecretAccessKey: aws.StringValue(c.SecretAccessKey),
 		SessionToken:    aws.StringValue(c.SessionToken),
-		CanExpire:       c.Expiration != nil,
-		Expires:         aws.TimeValue(c.Expiration),
+		Expiration:      aws.TimeValue(c.Expiration),
 	}, nil
 }

internal/stsauth/stsauth_test.go

@@ -41,8 +41,8 @@ func TestAssumeRole_DecodesCredentials(t *testing.T) {
 		t.Errorf("bad creds: %+v", creds)
 	}
 	want, _ := time.Parse(time.RFC3339, "2031-01-02T03:04:05Z")
-	if !creds.Expires.Equal(want) {
-		t.Errorf("Expires = %v, want %v", creds.Expires, want)
+	if !creds.Expiration.Equal(want) {
+		t.Errorf("Expiration = %v, want %v", creds.Expiration, want)
 	}
 	// The request must carry the AssumeRole action and the role ARN we asked for.
 	if !strings.Contains(gotBody, "Action=AssumeRole") {

internal/testkit/awserror.go

@@ -1,29 +0,0 @@
-package testutil
-
-import (
-	"testing"
-
-	awserrors "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// RequireAWSError asserts err carries the AWS code and exact client-facing
-// message; an empty message asserts the bare code with no message attached.
-func RequireAWSError(t *testing.T, err error, code, message string) {
-	t.Helper()
-	require.Error(t, err)
-	got, msg, ok := awserrors.ResolveErrorDetail(err)
-	require.True(t, ok, "error %v carries no AWS code", err)
-	assert.Equal(t, code, got)
-	assert.Equal(t, message, msg)
-}
-
-// RequireAWSCode asserts err carries the AWS code, whatever its message.
-func RequireAWSCode(t *testing.T, err error, code string) {
-	t.Helper()
-	require.Error(t, err)
-	got, ok := awserrors.ResolveErrorCode(err)
-	require.True(t, ok, "error %v carries no AWS code", err)
-	assert.Equal(t, code, got)
-}

internal/testkit/nats.go

@@ -27,7 +27,8 @@ func StartTestNATS(t testing.TB) (*server.Server, *nats.Conn) {
 	}
 	ns, err := server.NewServer(opts)
 	require.NoError(t, err)
-	startServer(t, ns)
+	go ns.Start()
+	waitReadyForConnections(t, ns)
 	t.Cleanup(func() { ns.Shutdown() })
 
 	nc, err := nats.Connect(ns.ClientURL())
@@ -36,14 +37,17 @@ func StartTestNATS(t testing.TB) (*server.Server, *nats.Conn) {
 	return ns, nc
 }
 
-// startServer runs Start in this goroutine: it returns once JetStream is
-// enabled and the client listener is bound, so the readiness check passes on
-// its first look instead of spinning or sleeping while the server comes up.
-func startServer(t testing.TB, ns *server.Server) {
+// waitReadyForConnections spins until the server accepts connections. Calling
+// ReadyForConnections with a longer timeout makes it sleep 25ms per attempt,
+// which every embedded server in the suite would otherwise pay.
+func waitReadyForConnections(t testing.TB, ns *server.Server) {
 	t.Helper()
-	ns.Start()
-	if !ns.ReadyForConnections(5 * time.Second) {
-		t.Fatal("embedded NATS server not ready for connections within 5s")
+	deadline := time.Now().Add(5 * time.Second)
+	for !ns.ReadyForConnections(time.Millisecond) {
+		if time.Now().After(deadline) {
+			t.Fatal("embedded NATS server not ready for connections within 5s")
+		}
+		time.Sleep(200 * time.Microsecond)
 	}
 }
 
@@ -62,7 +66,8 @@ func StartTestJetStream(t *testing.T) (*server.Server, *nats.Conn, jetstream.Jet
 	}
 	ns, err := server.NewServer(opts)
 	require.NoError(t, err)
-	startServer(t, ns)
+	go ns.Start()
+	waitReadyForConnections(t, ns)
 	t.Cleanup(func() { ns.Shutdown() })
 
 	nc, err := nats.Connect(ns.ClientURL())
@@ -162,11 +167,11 @@ func registerVpcdStub(t *testing.T, nc *nats.Conn, defaultPayload []byte) {
 	})
 }
 
-// SeedKV creates or updates a KV bucket and populates it with the given entries.
+// SeedKV creates a KV bucket and populates it with the given entries.
 // Returns the KV handle for further use.
 func SeedKV(t *testing.T, js jetstream.JetStream, bucket string, entries map[string][]byte) jetstream.KeyValue {
 	t.Helper()
-	kv, err := js.CreateOrUpdateKeyValue(t.Context(), jetstream.KeyValueConfig{Bucket: bucket, History: 1})
+	kv, err := js.CreateKeyValue(t.Context(), jetstream.KeyValueConfig{Bucket: bucket, History: 1})
 	require.NoError(t, err)
 	for k, v := range entries {
 		_, err := kv.Put(t.Context(), k, v)

internal/testkit/nats_test.go

@@ -1,19 +0,0 @@
-package testutil
-
-import (
-	"testing"
-
-	"github.com/nats-io/nats.go/jetstream"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSeedKV_ExistingBucket(t *testing.T) {
-	_, _, js := StartTestJetStream(t)
-	_, err := js.CreateKeyValue(t.Context(), jetstream.KeyValueConfig{Bucket: "seeded", History: 5})
-	require.NoError(t, err)
-
-	kv := SeedKV(t, js, "seeded", map[string][]byte{"k": []byte("v")})
-	entry, err := kv.Get(t.Context(), "k")
-	require.NoError(t, err)
-	require.Equal(t, []byte("v"), entry.Value())
-}

scripts/README.md

@@ -98,10 +98,7 @@ Both ship to `/usr/local/share/spinifex/` on every node, so they are available o
 | `build-system-image.sh` | Builds a minimal system AMI (Alpine or Ubuntu) from a manifest. All customisation happens inside the libguestfs appliance, so the build touches no host block device, no host mount, and needs no sudo. `--import` also registers it as an AMI. |
 | `publish-system-image.sh` | Converts a built raw image to compressed qcow2, writes the `.sha256` sidecar the catalog verifier expects, and uploads both to the R2 bucket behind `iso.mulgadc.com/system-ami/`. |
 | `build-microvm-image.sh` | Builds the minimal Alpine kernel + initramfs used by the QEMU microvm machine type and the lb-agent, carrying haproxy (ALB) and nginx-stream (NLB) data planes. |
-| `build-lambda-runtime-microvm-image.sh` | Builds the Lambda runtime microVM kernel and initramfs: a guest running the Lambda guest agent (`bin/lambda-agent` by default) with virtio-net for its host control connection. Takes an optional agent binary and output directory (default `build/microvm/lambda-runtime`). Not shipped. |
-| `build-sqs-store-microvm-image.sh` | Builds the SQS microVM kernel and initramfs: one guest running the dedicated SQS `nats-server` and the SQS worker as separate processes, with ext4 support and a clean power-down. The guest never formats a disk. Output goes to `build/microvm/sqs-worker`. |
-| `lib/microvm-image.sh` | Shared steps for the two builders above, sourced rather than run: tool checks, the Alpine rootfs, and module stripping that keeps `virtio*`, `*fw_cfg*` and the modules the caller names with their dependencies. |
-| `build-qboot.sh` | Builds qboot, the firmware the daemon passes to every microvm with `-bios`, from a pinned upstream commit in a digest-pinned Debian container. Fails unless the output matches the recorded sha256, which is also Debian 13's `qboot.rom`. A host whose `/usr/share/qemu/qboot.rom` (`qemu-system-data`) has that hash installs it and skips the container; any other host compiles. Writes `qboot.rom` and its GPL-2.0 licence beside the microvm kernel, and the matching source tarball, which releases publish, under `build/qboot/`. `make build-microvm-image` runs it. |
+| `build-qboot.sh` | Builds qboot, the firmware the daemon passes to every microvm with `-bios`, from a pinned upstream commit in a digest-pinned Debian container. Fails unless the output matches the recorded sha256, which is also Debian 13's `qboot.rom`. Writes `qboot.rom` and its GPL-2.0 licence beside the microvm kernel, and the matching source tarball, which releases publish, under `build/qboot/`. `make build-microvm-image` runs it. |
 | `mkosi-build.sh` | Runs an mkosi system-image build inside the pinned builder container, so a runner needs only Docker and the toolchain cannot drift. `--image` names an output and expands to the right profile list. |
 | `mkosi-publish.sh` | Publishes an mkosi-built image to R2 from inside the same pinned container — qcow2 conversion, `.sha256` sidecar, and upload. |
 | `mkosi-common.sh` | Shared plumbing sourced by both mkosi scripts. Builds the toolchain image once, with the builder account matched to the invoking user so bind-mounted output is not written back as root. |

scripts/build-lambda-runtime-microvm-image.sh

@@ -3,28 +3,24 @@
 # + initramfs: a guest running the Lambda guest agent, with virtio-net for its
 # host control connection. It is not shipped.
 #
-# Usage: build-lambda-runtime-microvm-image.sh [agent-binary [output-dir]]
-#
 # Inputs:
 #   $REPO_ROOT/build/microvm/lambda-runtime/{init.sh,inittab,run-agent}
-#   agent binary, default $REPO_ROOT/bin/lambda-agent (make bin/lambda-agent)
+#   $REPO_ROOT/bin/lambda-agent  (make bin/lambda-agent)
 #
-# Outputs, in output-dir (default $REPO_ROOT/build/microvm/lambda-runtime):
-#   vmlinuz
-#   initramfs.cpio.gz
+# Outputs:
+#   $REPO_ROOT/build/microvm/lambda-runtime/vmlinuz
+#   $REPO_ROOT/build/microvm/lambda-runtime/initramfs.cpio.gz
 #
 # Rootfs strategy and module stripping: scripts/lib/microvm-image.sh.
 # shellcheck disable=SC2034 # variables are consumed by the sourced library
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-INPUT_DIR="$REPO_ROOT/build/microvm/lambda-runtime"
-INIT_SH="$INPUT_DIR/init.sh"
-INITTAB="$INPUT_DIR/inittab"
-RUN_AGENT="$INPUT_DIR/run-agent"
-LAMBDA_AGENT_BIN="${1:-$REPO_ROOT/bin/lambda-agent}"
-# The library stages beside BUILD_DIR, so it names the output, not the inputs.
-BUILD_DIR="${2:-$INPUT_DIR}"
+BUILD_DIR="$REPO_ROOT/build/microvm/lambda-runtime"
+INIT_SH="$BUILD_DIR/init.sh"
+INITTAB="$BUILD_DIR/inittab"
+RUN_AGENT="$BUILD_DIR/run-agent"
+LAMBDA_AGENT_BIN="$REPO_ROOT/bin/lambda-agent"
 TAG="[build-lambda-runtime-microvm-image]"
 
 ALPINE_VERSION="${ALPINE_VERSION:-3.24}"
@@ -42,8 +38,7 @@ MICROVM_GATE_MODULES="qemu_fw_cfg virtio_net"
 source "$REPO_ROOT/scripts/lib/microvm-image.sh"
 
 echo "$TAG repo root: $REPO_ROOT"
-echo "$TAG input dir: $INPUT_DIR"
-echo "$TAG output dir: $BUILD_DIR"
+echo "$TAG build dir: $BUILD_DIR"
 
 microvm_check_tools
 
@@ -62,9 +57,6 @@ if ! file -b "$LAMBDA_AGENT_BIN" | grep -q "statically linked"; then
     exit 1
 fi
 
-# Absolute, because packing the initramfs runs from inside the chroot.
-mkdir -p "$BUILD_DIR"
-BUILD_DIR=$(cd "$BUILD_DIR" && pwd)
 microvm_init_dirs
 microvm_make_rootfs
 microvm_empty_dev

scripts/build-lambda-runtime-microvm-image_test.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-# build-lambda-runtime-microvm-image_test.sh — a build into a chosen output
-# directory stages and publishes there, and leaves the default input directory
-# untouched.
-#
-# The script runs in a fixture repo against the real library, with only the
-# rootfs, kernel and packing steps replaced so no image is downloaded.
-set -eu
-
-SCRIPTS_DIR=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
-TMP=$(mktemp -d)
-trap 'rm -rf "$TMP"' EXIT
-
-fails=0
-pass() { echo "  ok   - $1"; }
-fail() { echo "  FAIL - $1"; fails=$((fails + 1)); }
-
-echo "-- build-lambda-runtime-microvm-image.sh output directory"
-
-REPO="$TMP/repo"
-IN="$REPO/build/microvm/lambda-runtime"
-mkdir -p "$REPO/scripts/lib" "$IN" "$REPO/bin" "$TMP/bin"
-cp "$SCRIPTS_DIR/build-lambda-runtime-microvm-image.sh" "$REPO/scripts/"
-for f in init.sh inittab run-agent; do printf '%s\n' "$f" > "$IN/$f"; done
-printf 'default image\n' > "$IN/vmlinuz"
-printf '#!/bin/sh\n' > "$REPO/bin/agent-testlink"
-chmod +x "$REPO/bin/agent-testlink"
-printf '#!/bin/sh\necho "ELF 64-bit, statically linked"\n' > "$TMP/bin/file"
-chmod +x "$TMP/bin/file"
-BEFORE=$(cd "$IN" && ls -A | cksum)
-
-# The real library, with the steps that need a rootfs or kernel replaced.
-# Packing runs from inside the chroot as the real step does, and records where
-# the stage is while it still exists.
-cat > "$REPO/scripts/lib/microvm-image.sh" <<EOF
-. "$SCRIPTS_DIR/lib/microvm-image.sh"
-microvm_check_tools() { :; }
-microvm_make_rootfs() { mkdir -p "\$CHROOT_DIR/etc"; }
-microvm_empty_dev() { :; }
-microvm_locate_kernel() { :; }
-microvm_strip_modules() { :; }
-microvm_strip_rootfs() { :; }
-microvm_stage_kernel() { printf 'kernel\n' > "\$STAGE_DIR/vmlinuz"; }
-microvm_pack_initramfs() {
-    (cd "\$CHROOT_DIR" && printf 'initramfs\n' | gzip > "\$STAGE_DIR/initramfs.cpio.gz")
-    dirname "\$STAGE_DIR" > "$TMP/stage-parent"
-    ls -A "$IN" > "$TMP/input-during"
-}
-EOF
-
-# The output is given relative to the repo root, as make passes it.
-OUT="$REPO/build/microvm/lambda-testlink-runtime"
-if ! (cd "$REPO" && PATH="$TMP/bin:$PATH" bash scripts/build-lambda-runtime-microvm-image.sh bin/agent-testlink build/microvm/lambda-testlink-runtime) > "$TMP/log" 2>&1; then
-    fail "build into output dir: $(tr '\n' ' ' < "$TMP/log")"
-else
-    if [ "$(cat "$TMP/stage-parent")" = "$OUT" ]; then
-        pass "stage created in the output directory"
-    else
-        fail "stage created in $(cat "$TMP/stage-parent"), want $OUT"
-    fi
-    if grep -q '^\.stage\.' "$TMP/input-during"; then
-        fail "stage present in the default input directory during the build"
-    else
-        pass "no stage in the default input directory during the build"
-    fi
-    if [ "$(cd "$IN" && ls -A | cksum)" = "$BEFORE" ] && grep -qx 'default image' "$IN/vmlinuz"; then
-        pass "default input directory unchanged"
-    else
-        fail "default input directory changed: $(cd "$IN" && ls -A | tr '\n' ' ')"
-    fi
-    if grep -qx kernel "$OUT/vmlinuz" && gzip -t "$OUT/initramfs.cpio.gz" && [ "$(ls -A "$OUT" | wc -l)" -eq 2 ]; then
-        pass "output directory holds exactly the published pair"
-    else
-        fail "output directory: $(ls -A "$OUT" | tr '\n' ' ')"
-    fi
-fi
-
-if [ "$fails" -ne 0 ]; then
-    echo "$fails failure(s)"
-    exit 1
-fi

scripts/build-qboot.sh

@@ -9,8 +9,7 @@
 #
 # The build runs in a digest-pinned Debian container, so its output is
 # reproducible and is checked against a recorded hash. That hash is also the
-# sha256 of Debian 13's /usr/share/qemu/qboot.rom, which is built from the same
-# commit, so a host whose copy matches installs it and skips the container.
+# sha256 of Debian 13's /usr/share/qemu/qboot.rom, which is built from the same commit.
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
@@ -21,13 +20,18 @@ QBOOT_REPO="${QBOOT_REPO:-https://gitlab.com/qemu-project/qboot.git}"
 QBOOT_COMMIT="8ca302e86d685fa05b16e2b208888243da319941"
 QBOOT_SHA256="5c9c4b12c4438e3cf11d087263afe6519c8c05dd5896727b8b169b8f5dbf9877"
 BUILD_IMAGE="debian:trixie@sha256:4c25275446ca371766b8b093c696782eabce06263fccacb8d5d813b3dc44b308"
-# Debian 13's qemu-system-data ships this exact ROM, so a host that has it
-# skips the container. QBOOT_HOST_ROM moves the path for tests.
-QBOOT_HOST_ROM="${QBOOT_HOST_ROM:-/usr/share/qemu/qboot.rom}"
 
 log() { echo "[build-qboot] $*"; }
 fail() { echo "ERROR: $*" >&2; exit 1; }
 
+CONTAINER_TOOL=""
+for tool in docker podman; do
+    if command -v "$tool" >/dev/null 2>&1 && "$tool" info >/dev/null 2>&1; then
+        CONTAINER_TOOL=$tool
+        break
+    fi
+done
+[ -n "$CONTAINER_TOOL" ] || fail "qboot builds in a container; install docker or podman"
 command -v git >/dev/null 2>&1 || fail "required tool not found: git"
 
 WORK=$(mktemp -d)
@@ -44,42 +48,19 @@ mkdir -p "$SRC_DIR"
 src_tarball="$SRC_DIR/qboot-${QBOOT_COMMIT}.tar.gz"
 git -C "$WORK/src" archive --format=tar.gz --prefix="qboot-${QBOOT_COMMIT}/" -o "$src_tarball" "$QBOOT_COMMIT"
 
-build_in_container() {
-    local CONTAINER_TOOL=""
-    for tool in docker podman; do
-        if command -v "$tool" >/dev/null 2>&1 && "$tool" info >/dev/null 2>&1; then
-            CONTAINER_TOOL=$tool
-            break
-        fi
-    done
-    [ -n "$CONTAINER_TOOL" ] || fail "qboot builds in a container; install docker or podman"
-    log "building in $BUILD_IMAGE with $CONTAINER_TOOL"
-    # The firmware comes back on stdout, so nothing the container writes is left
-    # root-owned on the host.
-    "$CONTAINER_TOOL" run --rm --platform linux/amd64 -v "$WORK/src:/src:ro" \
-        -e DEBIAN_FRONTEND=noninteractive "$BUILD_IMAGE" sh -euc '
-            {
-                apt-get update -qq
-                apt-get install -y -qq --no-install-recommends gcc libc6-dev meson ninja-build binutils
-                meson setup /tmp/build /src
-                ninja -C /tmp/build
-            } >/dev/null
-            cat /tmp/build/bios.bin
-        ' > "$WORK/qboot.rom"
-}
-
-host_sha=""
-[ -r "$QBOOT_HOST_ROM" ] && host_sha=$(sha256sum "$QBOOT_HOST_ROM" | cut -d' ' -f1)
-if [ "$host_sha" = "$QBOOT_SHA256" ]; then
-    log "using host ROM $QBOOT_HOST_ROM (sha256 matches)"
-    cp "$QBOOT_HOST_ROM" "$WORK/qboot.rom"
-elif [ -n "$host_sha" ]; then
-    log "host ROM $QBOOT_HOST_ROM has sha256 $host_sha, not $QBOOT_SHA256; building"
-    build_in_container
-else
-    log "no host ROM at $QBOOT_HOST_ROM; building"
-    build_in_container
-fi
+log "building in $BUILD_IMAGE with $CONTAINER_TOOL"
+# The firmware comes back on stdout, so nothing the container writes is left
+# root-owned on the host.
+"$CONTAINER_TOOL" run --rm --platform linux/amd64 -v "$WORK/src:/src:ro" \
+    -e DEBIAN_FRONTEND=noninteractive "$BUILD_IMAGE" sh -euc '
+        {
+            apt-get update -qq
+            apt-get install -y -qq --no-install-recommends gcc libc6-dev meson ninja-build binutils
+            meson setup /tmp/build /src
+            ninja -C /tmp/build
+        } >/dev/null
+        cat /tmp/build/bios.bin
+    ' > "$WORK/qboot.rom"
 
 got_sha=$(sha256sum "$WORK/qboot.rom" | cut -d' ' -f1)
 if [ "$got_sha" != "$QBOOT_SHA256" ]; then

scripts/build-qboot_test.sh

@@ -1,88 +0,0 @@
-#!/bin/sh
-# build-qboot_test.sh — a host ROM matching the recorded hash is installed
-# without the container; any other host ROM, or none, builds in it, and a
-# container ROM with the wrong hash still fails.
-set -eu
-
-SCRIPTS_DIR=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
-TMP=$(mktemp -d)
-trap 'rm -rf "$TMP"' EXIT
-
-fails=0
-pass() { echo "  ok   - $1"; }
-fail() { echo "  FAIL - $1"; fails=$((fails + 1)); }
-
-echo "-- build-qboot.sh host ROM"
-
-COMMIT=$(sed -n 's/^QBOOT_COMMIT="\(.*\)"$/\1/p' "$SCRIPTS_DIR/build-qboot.sh")
-printf 'pinned rom\n' > "$TMP/good.rom"
-printf 'other rom\n' > "$TMP/other.rom"
-GOOD_SHA=$(sha256sum "$TMP/good.rom" | cut -d' ' -f1)
-
-# git and docker stubs. git fakes a checkout of the pinned commit; docker
-# prints $STUB_ROM as the firmware and records that it ran.
-mkdir -p "$TMP/bin"
-cat > "$TMP/bin/git" <<STUB
-#!/bin/sh
-case "\$1" in
-init) mkdir -p "\$3"; printf 'GPL-2.0\n' > "\$3/LICENSE"; exit 0 ;;
-esac
-shift 2
-case "\$1" in
-rev-parse) echo "$COMMIT" ;;
-archive) while [ "\$1" != "-o" ]; do shift; done; printf 'source\n' > "\$2" ;;
-esac
-STUB
-cat > "$TMP/bin/docker" <<'STUB'
-#!/bin/sh
-[ "$1" = info ] && exit 0
-echo ran >> "$DOCKER_LOG"
-cat "$STUB_ROM"
-STUB
-chmod +x "$TMP/bin/git" "$TMP/bin/docker"
-
-# run <name> <host-rom> <container-rom>: build in a fresh fixture repo.
-run() {
-    repo="$TMP/$1"
-    mkdir -p "$repo/scripts"
-    sed "s/^QBOOT_SHA256=.*/QBOOT_SHA256=\"$GOOD_SHA\"/" "$SCRIPTS_DIR/build-qboot.sh" > "$repo/scripts/build-qboot.sh"
-    : > "$TMP/$1.docker"
-    PATH="$TMP/bin:$PATH" QBOOT_HOST_ROM="$2" STUB_ROM="$3" DOCKER_LOG="$TMP/$1.docker" \
-        bash "$repo/scripts/build-qboot.sh" > "$TMP/$1.log" 2>&1
-}
-
-# outputs <name>: the ROM is the pinned one and the licence and source exist.
-outputs() {
-    cmp -s "$TMP/$1/build/microvm/qboot.rom" "$TMP/good.rom" &&
-        [ -s "$TMP/$1/build/microvm/qboot.LICENSE" ] &&
-        [ -s "$TMP/$1/build/qboot/qboot-$COMMIT.tar.gz" ]
-}
-
-if run match "$TMP/good.rom" "$TMP/other.rom" && outputs match && [ ! -s "$TMP/match.docker" ]; then
-    pass "matching host ROM installed, container not run"
-else
-    fail "matching host ROM: $(tr '\n' ' ' < "$TMP/match.log")"
-fi
-
-if run mismatch "$TMP/other.rom" "$TMP/good.rom" && outputs mismatch && [ -s "$TMP/mismatch.docker" ] &&
-    grep -q 'has sha256' "$TMP/mismatch.log"; then
-    pass "mismatched host ROM builds in the container"
-else
-    fail "mismatched host ROM: $(tr '\n' ' ' < "$TMP/mismatch.log")"
-fi
-
-if run missing "$TMP/absent.rom" "$TMP/good.rom" && outputs missing && [ -s "$TMP/missing.docker" ]; then
-    pass "missing host ROM builds in the container"
-else
-    fail "missing host ROM: $(tr '\n' ' ' < "$TMP/missing.log")"
-fi
-
-if run badbuild "$TMP/absent.rom" "$TMP/other.rom"; then
-    fail "container ROM with the wrong hash was accepted"
-elif [ -e "$TMP/badbuild/build/microvm/qboot.rom" ]; then
-    fail "container ROM with the wrong hash was installed"
-else
-    pass "container ROM with the wrong hash fails and installs nothing"
-fi
-
-[ "$fails" -eq 0 ] || { echo "$fails failure(s)"; exit 1; }

scripts/images/ecs-agent-gpu/ecs-agent.service

@@ -9,7 +9,8 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-# Static config (gateway URL, CA, region, cluster, containerd socket) comes from /etc/spinifex-ecs/agent.env, dropped by
+# Static config (gateway URL, CA, region, cluster, seeded IAM creds,
+# containerd socket) comes from /etc/spinifex-ecs/agent.env, dropped by
 # cloud-init at launch. Absent file is tolerated — the agent falls back to
 # its built-in defaults.
 EnvironmentFile=-/etc/spinifex-ecs/agent.env

scripts/images/ecs-agent/ecs-agent.initd

@@ -3,7 +3,8 @@
 # IMDSv2, registers + heartbeats + polls task assignments through the AWS gateway
 # over TLS+SigV4 (no NATS), and pulls task images through containerd.
 #
-# Static config (gateway URL, CA, region, cluster, containerd socket) comes from /etc/spinifex-ecs/agent.env, dropped by cloud-init at launch.
+# Static config (gateway URL, CA, region, cluster, seeded IAM creds, containerd
+# socket) comes from /etc/spinifex-ecs/agent.env, dropped by cloud-init at launch.
 
 description="Spinifex ECS container-instance agent"
 command="/usr/local/bin/ecs-agent"
@@ -27,7 +28,7 @@ start_pre() {
         # shellcheck disable=SC1091
         . /etc/spinifex-ecs/agent.env
         export ECS_GATEWAY_URL ECS_GATEWAY_CA ECS_REGION ECS_CLUSTER \
-            ECS_IMDS_BASE ECS_CONTAINERD_SOCKET \
+            ECS_ACCESS_KEY ECS_SECRET_KEY ECS_IMDS_BASE ECS_CONTAINERD_SOCKET \
             ECS_HEARTBEAT_INTERVAL ECS_POLL_INTERVAL
     fi
 }

scripts/install-node.sh

@@ -260,14 +260,6 @@ out() {
     ssh "${SSH_OPTS[@]}" "$SSH_USER@$host" "$@" 2>/dev/null || true
 }
 
-# remote_join_cmd prints the command that joins one node. The token is not in it: it arrives on
-# stdin and is read after sudo has logged its command, so sudo's log never holds it. The other
-# values are positional arguments of a literal script, never spliced into it.
-remote_join_cmd() {
-    local script='exec spx admin join --force --node "$1" --bind "$2" --cluster-bind "$2" --advertise "$3" --host "$4" --token "$(cat)" --region "$5" --az "$6"'
-    printf 'sudo bash -c %q _ %q %q %q %q %q %q' "$script" "$@"
-}
-
 SETUP_OVN="/usr/local/share/spinifex/setup-ovn.sh"
 
 # --- Preflight -------------------------------------------------------------
@@ -660,18 +652,14 @@ fi
 [ -n "$EXT_IFACE" ] && init_args+=(--external-iface="$EXT_IFACE")
 [ -n "$EMAIL" ] && init_args+=(--email="$EMAIL")
 
-# init prints the join token, so its log is root-only and outside the world-writable /tmp.
-INIT_LOG=/var/log/spx-init.log
-
-# redact_tokens hides join tokens in text about to be shown to the operator.
-redact_tokens() { sed -E 's/spx_join_[A-Za-z0-9_-]+/spx_join_[redacted]/g'; }
+INIT_LOG=/tmp/spx-init.log
 
 log "initializing ${HOSTS[0]} as ${NODE_NAMES[0]} (waiting for $((N - 1)) node(s) to join)"
 
 # init blocks in a formation server until every node has joined, so it runs
 # detached and the token is read back out of its output.
 on "${HOSTS[0]}" "sudo rm -f $INIT_LOG; \
-    sudo setsid sh -c 'umask 077; spx admin init ${init_args[*]} >$INIT_LOG 2>&1' </dev/null >/dev/null 2>&1 & \
+    sudo setsid sh -c 'spx admin init ${init_args[*]} >$INIT_LOG 2>&1' </dev/null >/dev/null 2>&1 & \
     exit 0" || fail "${HOSTS[0]}: could not start spx admin init"
 
 TOKEN=""
@@ -687,7 +675,7 @@ else
         elapsed=$((elapsed + 5))
     done
     if [ -z "$TOKEN" ]; then
-        out "${HOSTS[0]}" "sudo tail -40 $INIT_LOG" | redact_tokens | sed 's/^/  | /' >&2
+        out "${HOSTS[0]}" "sudo tail -40 $INIT_LOG" | sed 's/^/  | /' >&2
         fail "${HOSTS[0]}: spx admin init produced no join token within ${TOKEN_TIMEOUT}s"
     fi
     log "  join token issued"
@@ -703,9 +691,11 @@ fi
 # waiting on a shell that node 2 is still holding.
 JOIN_PIDS=()
 for i in $(seq 1 $((N - 1))); do
-    # The token goes to the node on stdin, so it is in no ssh argument and not in sudo's log.
-    # spx admin join takes it only as --token, so it is still in that process's arguments.
-    on "${HOSTS[$i]}" "$(remote_join_cmd "${NODE_NAMES[$i]}" "${LAN_IPS[$i]}" "${WAN_IPS[$i]}" "${LAN_IPS[0]}:$PORT" "$REGION" "$AZ")" <<<"$TOKEN" &
+    on "${HOSTS[$i]}" "sudo spx admin join --force \
+        --node ${NODE_NAMES[$i]} \
+        --bind ${LAN_IPS[$i]} --cluster-bind ${LAN_IPS[$i]} --advertise ${WAN_IPS[$i]} \
+        --host ${LAN_IPS[0]}:$PORT --token $TOKEN \
+        --region $REGION --az $AZ" &
     JOIN_PIDS+=("$!")
 done
 
@@ -734,7 +724,7 @@ if ! $DRY_RUN; then
         elapsed=$((elapsed + 5))
     done
     if [ "$elapsed" -ge "$FORMATION_TIMEOUT" ]; then
-        out "${HOSTS[0]}" "sudo tail -40 $INIT_LOG" | redact_tokens | sed 's/^/  | /' >&2
+        out "${HOSTS[0]}" "sudo tail -40 $INIT_LOG" | sed 's/^/  | /' >&2
         fail "${HOSTS[0]}: formation did not complete within ${FORMATION_TIMEOUT}s"
     fi
     log "  formation complete"

scripts/install-node_test.sh

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# Tests remote_join_cmd from install-node.sh: the join token must reach spx only on stdin, so
-# sudo's log (which holds the command it was given) never contains it, and the other values must
-# arrive as plain arguments even when they hold shell syntax.
-# preflight runs this with sh
-[ -n "${BASH_VERSION:-}" ] || exec bash "$0" "$@"
-set -euo pipefail
-here="$(cd "$(dirname "$0")" && pwd)"
-work="$(mktemp -d)"
-trap 'rm -rf "$work"' EXIT
-mkdir "$work/bin"
-cd "$work"
-
-cat > "$work/bin/sudo" <<'SH'
-#!/bin/sh
-echo "$*" >> "$FAKE_SUDO_LOG"
-exec "$@"
-SH
-cat > "$work/bin/spx" <<'SH'
-#!/bin/sh
-for a in "$@"; do printf '<%s>' "$a"; done > "$FAKE_SPX_ARGV"
-SH
-chmod +x "$work/bin/sudo" "$work/bin/spx"
-export FAKE_SUDO_LOG="$work/sudo.log" FAKE_SPX_ARGV="$work/spx.argv" PATH="$work/bin:$PATH"
-
-eval "$(sed -n '/^remote_join_cmd()/,/^}/p' "$here/install-node.sh")"
-
-fails=0
-check() { if [ "$2" = "$3" ]; then echo "ok   $1"; else echo "FAIL $1: want '$3' got '$2'"; fails=$((fails + 1)); fi; }
-
-TOKEN=spx_join_FAKETOKEN-abc_1
-cmd="$(remote_join_cmd node2 10.0.0.2 203.0.113.2 '10.0.0.1:4432;touch PWNED' us-east-1 'az $(touch PWNED2)')"
-bash -c "$cmd" <<<"$TOKEN"
-
-check "the token is not in the command" "$(printf '%s' "$cmd" | grep -c FAKETOKEN || true)" 0
-check "the token is not in sudo's log" "$(grep -c FAKETOKEN "$FAKE_SUDO_LOG" || true)" 0
-check "spx got the token" "$(grep -o '<--token><[^>]*>' "$FAKE_SPX_ARGV")" "<--token><$TOKEN>"
-check "spx got the other values as given" "$(cat "$FAKE_SPX_ARGV")" "<admin><join><--force><--node><node2><--bind><10.0.0.2><--cluster-bind><10.0.0.2><--advertise><203.0.113.2><--host><10.0.0.1:4432;touch PWNED><--token><$TOKEN><--region><us-east-1><--az><az \$(touch PWNED2)>"
-check "no value was run as a command" "$(find "$work" -maxdepth 1 -name 'PWNED*' | wc -l | tr -d ' ')" 0
-
-[ "$fails" -eq 0 ]

scripts/lib/lambda-testlink-build_test.sh

@@ -1,111 +0,0 @@
-#!/bin/sh
-# lambda-testlink-build_test.sh — the test-link make targets refuse a malformed
-# image digest and an unsupported host or GOARCH before touching any output.
-#
-# Every case is refused on the recipe's first lines, so nothing is compiled.
-set -eu
-
-LIB_DIR=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
-REPO_ROOT=$(dirname -- "$(dirname -- "$LIB_DIR")")
-TMP=$(mktemp -d)
-trap 'rm -rf "$TMP"' EXIT
-
-fails=0
-pass() { echo "  ok   - $1"; }
-fail() { echo "  FAIL - $1"; fails=$((fails + 1)); }
-
-echo "-- make build-lambda-testlink / build-lambda-testlink-image guards"
-
-PWN="$TMP/pwn"
-OUT="$TMP/out"
-HEX=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
-mkdir -p "$OUT"
-printf 'old daemon\n' > "$OUT/spx"
-printf 'old initializer\n' > "$OUT/hardkill.so"
-PAIR=$(cat "$OUT/spx" "$OUT/hardkill.so" | cksum)
-
-# unchanged <name> — the existing pair is intact, no scratch was made and no
-# injected command ran.
-unchanged() {
-    if [ -e "$PWN" ]; then
-        fail "$1: injected command ran"
-        rm -f "$PWN"
-    elif [ -e "$OUT.tmp" ]; then
-        fail "$1: scratch directory created"
-    elif [ "$(cat "$OUT/spx" "$OUT/hardkill.so" | cksum)" != "$PAIR" ]; then
-        fail "$1: existing pair replaced"
-    else
-        pass "$1"
-    fi
-}
-
-# refused <name> <want> <log> <status> — make failed with the expected message.
-refused() {
-    if [ "$4" -eq 0 ]; then
-        fail "$1: make succeeded"
-    elif ! grep -q "$2" "$3"; then
-        fail "$1: wrong refusal: $(tr '\n' ' ' < "$3")"
-    else
-        unchanged "$1"
-    fi
-}
-
-testlink() {
-    make -s -C "$REPO_ROOT" --no-print-directory build-lambda-testlink LAMBDA_TESTLINK_DIR="$OUT" "$@" > "$TMP/log" 2>&1
-}
-
-DIGEST_MSG="LAMBDA_IMAGE_DIGEST must be 64 lowercase hex digits"
-NL='
-'
-for v in '' "\$(shell touch $PWN)" "\$\$(touch $PWN)" "\`touch $PWN\`" "$HEX; touch $PWN" \
-    "$HEX\" -X main.x=\"y" "$HEX -X main.x=y" "$HEX${NL}touch $PWN" \
-    0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF "${HEX%?}" "${HEX}0"; do
-    # GNU make itself expands a command-line $(shell ...) while parsing, for
-    # any target, so that one literal is tested only from the environment.
-    case "$v" in
-    "\$(shell"*) ;;
-    *)
-        status=0
-        testlink LAMBDA_IMAGE_DIGEST="$v" || status=$?
-        refused "command-line digest [$v]" "$DIGEST_MSG" "$TMP/log" "$status"
-        ;;
-    esac
-    status=0
-    LAMBDA_IMAGE_DIGEST="$v" testlink || status=$?
-    refused "environment digest [$v]" "$DIGEST_MSG" "$TMP/log" "$status"
-done
-
-status=0
-env -u LAMBDA_IMAGE_DIGEST make -s -C "$REPO_ROOT" --no-print-directory build-lambda-testlink LAMBDA_TESTLINK_DIR="$OUT" > "$TMP/log" 2>&1 || status=$?
-refused "digest unset" "$DIGEST_MSG" "$TMP/log" "$status"
-
-ARCH_MSG="supports only an x86_64 host building linux/amd64"
-SHIM="$TMP/shim"
-mkdir -p "$SHIM"
-printf '#!/bin/sh\necho aarch64\n' > "$SHIM/uname"
-chmod +x "$SHIM/uname"
-
-status=0
-GOARCH=arm64 testlink LAMBDA_IMAGE_DIGEST="$HEX" || status=$?
-refused "GOARCH=arm64" "$ARCH_MSG" "$TMP/log" "$status"
-status=0
-PATH="$SHIM:$PATH" testlink LAMBDA_IMAGE_DIGEST="$HEX" || status=$?
-refused "aarch64 host" "$ARCH_MSG" "$TMP/log" "$status"
-
-# The image target refuses before building qboot or any agent binary.
-for c in "GOARCH=arm64" "PATH=$SHIM:$PATH"; do
-    status=0
-    env "$c" make -s -C "$REPO_ROOT" --no-print-directory build-lambda-testlink-image > "$TMP/log" 2>&1 || status=$?
-    if [ "$status" -eq 0 ]; then
-        fail "image target [${c%%=*}]: make succeeded"
-    elif ! grep -q "$ARCH_MSG" "$TMP/log" || grep -q "qboot\|go build" "$TMP/log"; then
-        fail "image target [${c%%=*}]: did not refuse first: $(tr '\n' ' ' < "$TMP/log")"
-    else
-        pass "image target [${c%%=*}] refused first"
-    fi
-done
-
-if [ "$fails" -ne 0 ]; then
-    echo "$fails failure(s)"
-    exit 1
-fi

scripts/terraform/latitude-spx/.gitignore

@@ -1,10 +0,0 @@
-.terraform/
-terraform.tfstate
-terraform.tfstate.*
-*.tfplan
-*.auto.tfvars
-crash.log
-terraform.tfvars
-*.pem
-*.log
-.terraform.lock.hcl

scripts/terraform/latitude-spx/README.md

@@ -1,137 +0,0 @@
-# latitude-spx
-
-Builds a Spinifex deployment on latitude.sh bare metal from your laptop with `deploy-latitude.sh`.
-The commands, flags, step markers and state layout follow `vultr-spx`.
-
-**Status: not yet run end to end.**
-The script was written from the plan doc findings (`docs/development/feature/latitude-bm.md`, L1 to L26) and from the provider schema.
-No latitude.sh API call or host run was made while building it, so treat the first `up` as the test.
-One node has been the only shape run live, and only in part (see Unverified). The three-node flow, including the floating pool, has not been run: Ben takes that over.
-
-## What it creates
-
-| Resource | Notes |
-|---|---|
-| Project | `spinifex-<name>`, unless `--project` names an existing one (then it is never deleted) |
-| SSH key | `spinifex-<name>`, account scoped |
-| User data | `spinifex-<name>`, host preparation only (no `{{ }}`, latitude.sh substitutes them) |
-| Servers | `m4-metal-medium`, site `DAL`, Ubuntu 26.04, hourly billing, hostnames `spx-<name>-nodeN` |
-| Elastic IP | one by default (`elastic_ip_count` in `variables.tf`, 1 to 5; set `TF_VAR_elastic_ip_count` to change it). With one node it is a static pool address and the count must stay 1, because a second pool is never tried when the first is full; with three nodes the addresses form the `latitude` floating pool, which Spinifex moves between servers. `nginx-webserver` needs one address and runs on one node; `nginx-alb` needs two public addresses and is a three-node workbook |
-| Virtual network | three nodes only: `spinifex-<name>`, one VLAN assignment per server |
-
-## Requirements
-
-OpenTofu (or Terraform) 1.5 or later, `aws` CLI, `python3`, `curl`, `ssh`, an SSH key pair.
-
-| Variable | When | Meaning |
-|---|---|---|
-| `LATITUDESH_AUTH_TOKEN` | always | the account API token; used by the provider and this script only, never sent to a node |
-| `LATITUDESH_NODE_TOKEN` | `--nodes 3` | a second, different, writable API key, copied to each node (`/etc/spinifex/latitude/api-token`, owned by `spinifex-daemon` with mode 0400, in a root-owned 0711 directory; the other services share the `spinifex` group, so no group may read it; ownership and mode are set on every `up`; a symlink or any other owner there is refused) so the daemon can move Elastic IPs |
-
-The script refuses a node key it can see is read-only (it lists `/auth/api_keys` and matches the key's last five characters). If the key is not among the account's keys, write authority is first proven by the first Elastic IP move.
-
-Exposure: a latitude.sh API key is team-wide. It is not scoped to Elastic IPs, so anyone who reads it from a node can do whatever the key's owner can in the team (the API exposes `read_only` and `allowed_ips` on a key, and no narrower scope). Create the node key with `allowed_ips` set to the nodes' public addresses, and revoke it after `destroy`.
-
-Nodes are reached as `ubuntu` with the deployment's SSH key, and remote commands run through passwordless `sudo`: latitude.sh puts the key on the image's login user and root login is not enabled.
-
-## Usage
-
-```
-export LATITUDESH_AUTH_TOKEN=...        # from the latitude.sh dashboard
-./deploy-latitude.sh up --name demo     # one node
-
-export LATITUDESH_NODE_TOKEN=...        # a second, writable key
-./deploy-latitude.sh up --name demo3 --nodes 3
-./deploy-latitude.sh status --name demo
-./deploy-latitude.sh ssh --name demo node1 'systemctl status spinifex.target'
-./deploy-latitude.sh credentials --name demo
-./deploy-latitude.sh stop node1 --name demo
-./deploy-latitude.sh start node1 --name demo
-./deploy-latitude.sh destroy --name demo
-```
-
-Options: `--name`, `--site` (alias `--region`), `--plan`, `--os`, `--project ID|SLUG`, `--distro TARBALL`, `--channel`, `--spx-region`, `--spx-az`, `--ssh-key`, `--image`, `--data-disk-id`, `--vpc-subnet` (the VLAN's /24, three nodes), `--nodes 1|3`, `--yes`.
-`./deploy-latitude.sh --help` lists them with defaults.
-
-Three nodes need `--distro` with a tarball built from this branch (`make distro-amd64`) until a release carries the latitude provider.
-A released spx rejects `source="latitude"` and its daemon restarts in a loop, so `up --nodes 3` without `--distro` stops in preflight.
-Before the pool is written, each node's `/usr/local/bin/spx` is checked for the `latitude_elastic_ip_ids` key name; spx has no validate subcommand, so this is a string search of the binary, not a run of its config check.
-
-## What `up` does
-
-`terraform` then, per node: `host` (wait for SSH as `ubuntu` and cloud-init, `/dev/kvm`), `disk`, `vlan` (three nodes), `install`, `form`, `start`; then `pool` (one node) or `cluster` (three nodes: `install-node.sh` forms the cluster); three nodes then install the node token on every `up` and add the `latitude` pool (`pool`); then `restart` (three nodes wait for the current daemon to log "floating pool ready" for the pool), `public`, `image` and the AWS profile.
-Each step writes `step.<name>[.nodeN]` in the state directory, and a rerun resumes at the first step without one.
-
-- **Data disk.** `host-data-disk.sh` picks the blank NVMe by content and by-id EUI, never by `nvmeXn1` (L1, L11).
-A candidate is at least 100 GB with no signature, partitions, holders or mounts, and not in the root filesystem's ancestry; with none it stops and lists the disks.
-With several (LON2 has two 1.7 TB and one spare 447 GB blank NVMe next to the root disk) it takes the largest, the lowest by-id path among equals, prints what it chose and the blank disks it left, and never touches the others (`--data-disk-id` chooses another).
-It mounts by UUID with `nofail` and the script records the UUID in `data_uuid.<node>`.
-- **Mount check.** Before anything writes under `/var/lib/spinifex`, and on every run, the mounted filesystem UUID must equal the recorded one.
-The units that write there also get a `RequiresMountsFor=/var/lib/spinifex` drop-in.
-The mount is by UUID in fstab, so renamed disks do not change it, and there is no check at service start.
-- **Firewall.** `setup.sh --firewall on` runs before Spinifex first starts.
-- **One node.** The Elastic IP is a static pool (`gateway_ip = "192.0.2.1"`, the node's next hop as `gateway`, no `prefix_len`) with the IMDS addresses moved off the ones latitude.sh routes.
-- **Three nodes.** The `vlan` step makes `eno2.<vid>` with `ip link` and persists it as systemd-networkd files for that link plus a drop-in on the `eno2` unit.
-It never runs `netplan apply`, refuses a subnet that overlaps the SSH peer or a route, and removes the VLAN again if the public interface's address, default route or the route to the SSH peer differ afterwards.
-`form_cluster` then puts the cluster and Geneve planes on that VLAN with `install-node.sh` (`--user ubuntu`); its output is not kept, as it can hold the join token.
-- **Floating pool (three nodes).** The `latitude` pool names the Elastic IP IDs and the project ID from the Terraform outputs, and each node's `provider_host_id` is its server ID. `spinifex.toml` is edited idempotently and read back. Failover moves an address with one `PATCH /elastic_ips/{id}` and waits for it to be active; latitude.sh has no unassign, so a node that loses an address is not told to release it.
-- **State** is in `~/.spinifex/latitude/<name>/`: Terraform state, `ids` (every `latitudesh_*` object in the state, merged on each apply and before each destroy), `step.*` markers, logs and the data disk UUIDs.
-- **AWS profile** `spinifex-latitude-<name>` is replaced on each `up`, with the CA at `~/.spinifex/latitude-<name>-ca.pem`.
-The secret key is written to `~/.aws/credentials` (0600, other profiles kept, the old file saved beside it) and never appears in a process argument.
-
-## Token handling
-
-`LATITUDESH_AUTH_TOKEN` is read from the environment by the provider and by the script's API calls.
-It is not a Terraform variable, is on no command line (curl reads it from stdin), is not sent to a node, and is written to no file.
-`LATITUDESH_NODE_TOKEN` is checked with curl reading it from stdin and reaches each node on stdin of the install script, so it is in no argument on either side.
-`TF_LOG` is unset by the script.
-The join token that `install-node.sh` creates is shared with Vultr and OCI: its init log is root-only, and `spx admin join` still takes it as `--token` on the joining node (tracked separately).
-
-## Recovery
-
-If SSH is lost once the firewall is armed, use the serial console.
-`up` enables the server's out-of-band connection with the deployment's SSH key and prints the `ssh` command it returns before it arms the firewall, falling back to the Out-of-Band tab in the dashboard.
-Logging in there needs an OS user password, which you set yourself while SSH still works.
-A fresh deployment that cannot be recovered is cheaper to `destroy` and `up` again.
-The VLAN step prints the console command first.
-It refuses a subnet that holds the SSH peer or overlaps an existing route, and removes the VLAN again if the route to the SSH peer or the public interface changes.
-
-## destroy
-
-`destroy` asks you to type the deployment name (`--yes` skips only that), then records every ID in the Terraform state and stops without destroying anything if it cannot.
-It runs `terraform destroy`, fetches every recorded ID by itself (2xx present, 404 gone, anything else fails and keeps the records), and deletes what remains of those.
-Servers, keys, user data, virtual networks and projects whose names match the deployment but that are not recorded are listed by ID and deleted only after you type `delete-untracked` for exactly those IDs, which `--yes` never supplies; an ID that shows up later needs its own confirmation, and without a terminal they are kept and `destroy` exits 1.
-Elastic IPs are touched only by recorded ID.
-Elastic IP release is asynchronous and only works once the address is active or in error, so the sweep retries.
-Because the Elastic IP list ignores pagination, `destroy` ends by asking you to check the dashboard for leftovers and type `checked`.
-An `up` that failed while creating can leave an object nothing recorded, such as an Elastic IP; that dashboard check is the only thing that finds it.
-
-## Unverified
-
-Nothing in the three-node flow has run against real servers. For one node, only the parts the person ran have been exercised, and the script has changed since.
-
-- The OS slug `ubuntu_26_04_x64_lts` (the `latitudesh_operating_system` data source fails the plan if it is wrong).
-- That the deploy key is on `ubuntu` and `sudo -n` works for it, and that `sudo` resets nothing the script needs (the SSH peer address is read before `sudo` for that reason).
-- The power action request (`POST /servers/{id}/actions` with `power_off` and `power_on`).
-- Resolving `--project` as a slug through `GET /projects/{slug}`, and the `in_stock` shape of `GET /plans` used by the stock check, which only warns when it cannot read it.
-- The `GET` and `DELETE` paths for `/user_data/{id}` and `/virtual_networks/{id}`.
-- That the Spinifex API certificate names the node's public address, which the profile check needs.
-- That the private NIC is `eno2`, its tagging and MTU (the script uses 1500), and that the networkd files persist the VLAN across a reboot.
-- `GET /auth/api_keys` and its `token_last_slice` and `read_only` fields, which the node key check relies on; and that a key with `allowed_ips` set to the nodes' addresses still works from them.
-- The Elastic IP move itself: `PATCH /elastic_ips/{id}` with `server_id`, its 202 then `active`, the error codes, and how long a move takes; the client waits up to its move timeout and makes one write per call.
-- That the daemon reads the node token and logs "floating pool ready", then fails over when a node stops (`stop node1`) and the address lands on another node.
-- `install-node.sh` as `--user ubuntu` on latitude.sh servers.
-
-## Not exercised
-
-Any real API call from the three-node flow, `destroy`, `host-data-disk.sh` on a host and the VLAN step on a server.
-Guest launch, public reachability of the Elastic IP, the Terraform workbooks and failover are not part of `up`; prove them by hand.
-`e2e-latitude.sh` and removing the old `install-node.sh` in this directory are not done.
-
-## Tests
-
-`sh node-scripts_test.sh` checks the node token install (install, unchanged, rotation, modes, an older install converging, symlinks and owners refused; run it as root too, with `sudo sh node-scripts_test.sh`, to check that only the daemon's user can read the file) and the readiness check (old success then current failure) with stand-in tools.
-`bash deploy-argv_test.sh` checks that neither API token, nor the five characters used to find the node key, is an argument of any external command in the node token paths, and that the SSH peer address comes from the same connection after sudo's environment reset.
-`scripts/install-node_test.sh` (part of `make preflight`) checks that the join token reaches `spx admin join` only on stdin, so sudo's log never holds it.
-The first two are not part of `make preflight`.
-The Go side: `cd spinifex && GOWORK=off go test ./providers/cloud/latitude/ ./domains/network/external/floating/ ./bootstrap/config/ ./runtime/daemon/`.

scripts/terraform/latitude-spx/cloud-init/user-data.yaml

@@ -1,23 +0,0 @@
-#cloud-config
-# Host preparation only. Spinifex is installed and formed over SSH by deploy-latitude.sh.
-# latitude.sh substitutes double-brace variables in user data, so this file holds none.
-write_files:
-  - path: /etc/cloud/cloud.cfg.d/99-spinifex-network.cfg
-    content: |
-      network: {config: disabled}
-  # The image's netplan lists eno2 with no address and without optional, so boot waits two minutes
-  # for it. --any returns once one link, eno1, is online; it changes the wait, not the network.
-  # UNVERIFIED: the binary path is the Ubuntu one and the drop-in first applies on the next boot.
-  - path: /etc/systemd/system/systemd-networkd-wait-online.service.d/10-spinifex-any.conf
-    content: |
-      [Service]
-      ExecStart=
-      ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any
-# runcmd carries on past a failing command, so each line stands alone.
-runcmd:
-  - [sh, -c, "command -v ufw >/dev/null && ufw --force disable || true"]
-  - [sh, -c, "systemctl disable --now unattended-upgrades.service apt-daily-upgrade.timer apt-daily.timer || true"]
-  # The image ships empty apt lists and no git, which the workbooks need.
-  - [sh, -c, "apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq git || true"]
-  - [sh, -c, "systemctl daemon-reload || true"]
-  - [sh, -c, "touch /var/lib/cloud/spinifex-host-ready"]

scripts/terraform/latitude-spx/compute.tf

@@ -1,70 +0,0 @@
-locals {
-  hostname_prefix = "spx-${var.deployment_name}-node"
-  project         = var.project != "" ? var.project : latitudesh_project.deploy[0].slug
-  project_id      = var.project != "" ? var.project_id : latitudesh_project.deploy[0].id
-}
-
-# Both lookups fail the plan when a slug does not exist, which is the only check of the OS slug.
-data "latitudesh_operating_system" "os" {
-  slug = var.operating_system
-}
-
-data "latitudesh_plan" "plan" {
-  slug = var.plan
-}
-
-resource "latitudesh_project" "deploy" {
-  count             = var.project == "" ? 1 : 0
-  name              = "spinifex-${var.deployment_name}"
-  description       = "Spinifex deployment ${var.deployment_name}"
-  environment       = "Development"
-  provisioning_type = "on_demand"
-}
-
-# The key is team scoped. The server login user is ubuntu, not root.
-resource "latitudesh_ssh_key" "deploy" {
-  name       = "spinifex-${var.deployment_name}"
-  public_key = trimspace(file(pathexpand(var.ssh_public_key_path)))
-}
-
-# Host preparation only. Latitude substitutes double-brace variables inside user data, so the file
-# must hold none. Spinifex is installed over SSH by deploy-latitude.sh.
-resource "latitudesh_user_data" "host" {
-  description = "spinifex-${var.deployment_name}"
-  content     = filebase64("${path.module}/cloud-init/user-data.yaml")
-}
-
-# billing must be hourly: the default is monthly, which bills upfront with no refund.
-resource "latitudesh_server" "node" {
-  count            = var.node_count
-  project          = local.project
-  hostname         = "${local.hostname_prefix}${count.index + 1}"
-  site             = var.site
-  plan             = data.latitudesh_plan.plan.slug
-  operating_system = data.latitudesh_operating_system.os.slug
-  billing          = "hourly"
-  ssh_keys         = [latitudesh_ssh_key.deploy.id]
-  user_data        = latitudesh_user_data.host.id
-
-  timeouts = {
-    create = "60m"
-  }
-}
-
-# Elastic IPs are bought here and never created or deleted by Spinifex. Each starts on a server, spread
-# over the nodes, and server_id is ignored afterwards so a move by Spinifex is not undone by a later apply.
-resource "latitudesh_elastic_ip" "pool" {
-  count = var.elastic_ip_count
-  # The provider documents ID or slug but posts the value as project_id unresolved: a slug gave 404.
-  project   = local.project_id
-  server_id = latitudesh_server.node[count.index % var.node_count].id
-
-  lifecycle {
-    ignore_changes = [server_id]
-  }
-}
-
-moved {
-  from = latitudesh_elastic_ip.node1
-  to   = latitudesh_elastic_ip.pool[0]
-}

scripts/terraform/latitude-spx/deploy-argv_test.sh

@@ -1,228 +0,0 @@
-#!/usr/bin/env bash
-# Checks that neither API token is ever an argument of an external command in the node token
-# paths of deploy-latitude.sh. External commands are stand-ins that record their arguments and
-# their standard input; the test fails if a token is in the first and proves it is in the second.
-# preflight runs this with sh
-[ -n "${BASH_VERSION:-}" ] || exec bash "$0" "$@"
-set -euo pipefail
-exec </dev/null
-here="$(cd "$(dirname "$0")" && pwd)"
-work="$(mktemp -d)"
-trap 'rm -rf "$work"' EXIT
-mkdir "$work/bin" "$work/home"
-real_python="$(command -v python3)"
-
-AUTH=FAKEAUTHTOKEN9
-NODE=FAKENODETOKEN7
-
-# Every command the script runs outside bash records "name args" and, for the first line of
-# standard input, "name stdin: ...".
-for c in curl ssh scp aws tofu ssh-keygen; do
-    cat > "$work/bin/$c" <<'SH'
-#!/bin/sh
-echo "$(basename "$0") $*" >> "$FAKE_ARGV"
-if [ ! -t 0 ]; then
-    in="$(cat)"
-    [ -z "$in" ] || echo "$(basename "$0") stdin: $in" >> "$FAKE_STDIN"
-fi
-case "$(basename "$0")" in
-    curl) printf '{"data":[{"attributes":{"token_last_slice":"%s","read_only":false}}]}\n200' "$(printf '%s' "$FAKE_NODE" | tail -c 5)" ;;
-    ssh)
-        if [ -n "${FAKE_SSH_EVAL:-}" ]; then
-            # Behave like a login on a node: skip the options and host, run the rest with the
-            # connection variable of this connection, and let sudo reset the environment.
-            while [ "$#" -gt 0 ]; do case "$1" in ubuntu@*) shift; break ;; *) shift ;; esac; done
-            SSH_CONNECTION="$FAKE_SSH_CONNECTION" bash -c "$*"
-        else
-            echo installed
-        fi ;;
-esac
-SH
-    chmod +x "$work/bin/$c"
-done
-cat > "$work/bin/sudo" <<'SH'
-#!/bin/sh
-while [ "$#" -gt 0 ]; do case "$1" in -*) shift ;; *) break ;; esac; done
-exec env -i PATH="$PATH" "$@"
-SH
-chmod +x "$work/bin/sudo"
-cat > "$work/bin/python3" <<SH
-#!/bin/sh
-echo "python3 \$*" >> "\$FAKE_ARGV"
-exec "$real_python" "\$@"
-SH
-chmod +x "$work/bin/python3"
-
-export FAKE_ARGV="$work/argv" FAKE_STDIN="$work/stdin" FAKE_NODE="$NODE" PATH="$work/bin:$PATH" HOME="$work/home"
-: > "$FAKE_ARGV"
-: > "$FAKE_STDIN"
-export LATITUDESH_AUTH_TOKEN="$AUTH" LATITUDESH_NODE_TOKEN="$NODE"
-
-# shellcheck source=deploy-latitude.sh
-source "$here/deploy-latitude.sh"
-
-# shellcheck disable=SC2034 # read by the sourced functions
-NODES=3 IP=192.0.2.10 NODE_NAME=node1
-check_node_token >/dev/null
-install_key >/dev/null 2>&1
-
-fails=0
-for tok in "$AUTH" "$NODE" "${NODE: -5}"; do
-    if grep -q "$tok" "$FAKE_ARGV"; then
-        echo "FAIL token $tok is in a command's arguments:"
-        grep "$tok" "$FAKE_ARGV"
-        fails=$((fails + 1))
-    else
-        echo "ok   $tok is in no argument"
-    fi
-done
-for what in "curl stdin:.*Bearer $NODE" "ssh stdin: $NODE"; do
-    if grep -q "$what" "$FAKE_STDIN"; then
-        echo "ok   the check can see the token where it is sent ($what)"
-    else
-        echo "FAIL the token never reached stdin ($what): the test would pass without checking anything"
-        fails=$((fails + 1))
-    fi
-done
-
-# The peer address comes from the same connection that runs the command, whichever source
-# address that connection has, and survives sudo's environment reset.
-export FAKE_SSH_EVAL=1
-for src in 198.51.100.7 203.0.113.99; do
-    export FAKE_SSH_CONNECTION="$src 51000 192.0.2.10 22"
-    got="$(on 'printf %s "$SSH_PEER"')"
-    if [ "$got" = "$src" ]; then echo "ok   peer $src reaches the command"; else echo "FAIL peer for $src was '$got'"; fails=$((fails + 1)); fi
-done
-
-# A three-node run needs a build that knows the latitude source: a release would be refused by its
-# own config check. The guard needs --distro, and the node is checked before it gets the pool.
-check_result() { if [ "$2" = "$3" ]; then echo "ok   $1"; else echo "FAIL $1: want '$3' got '$2'"; fails=$((fails + 1)); fi; }
-check_result "three nodes without --distro stop" "$( (NODES=3 DISTRO="" require_branch_build) >/dev/null 2>&1 && echo ran || echo stopped)" stopped
-check_result "three nodes with --distro go on" "$( (NODES=3 DISTRO=/tmp/x.tar.gz require_branch_build) >/dev/null 2>&1 && echo ran || echo stopped)" ran
-check_result "one node without --distro goes on" "$( (NODES=1 DISTRO="" require_branch_build) >/dev/null 2>&1 && echo ran || echo stopped)" ran
-check_result "one node with one address goes on" "$( (NODES=1 TF_VAR_elastic_ip_count=1 require_one_address) >/dev/null 2>&1 && echo ran || echo stopped)" ran
-check_result "one node with no setting goes on" "$( (NODES=1 TF_VAR_elastic_ip_count="" require_one_address) >/dev/null 2>&1 && echo ran || echo stopped)" ran
-check_result "one node with two addresses stops" "$( (NODES=1 TF_VAR_elastic_ip_count=2 require_one_address) >/dev/null 2>&1 && echo ran || echo stopped)" stopped
-check_result "three nodes with three addresses go on" "$( (NODES=3 TF_VAR_elastic_ip_count=3 require_one_address) >/dev/null 2>&1 && echo ran || echo stopped)" ran
-printf 'binary with latitude_elastic_ip_ids inside\n' > "$work/spx-new"
-printf 'binary of a release\n' > "$work/spx-old"
-SPX_BIN="$work/spx-new"
-check_result "a build that knows latitude is accepted" "$( (node_knows_latitude) >/dev/null 2>&1 && echo ran || echo stopped)" ran
-# shellcheck disable=SC2034 # read by the sourced functions
-SPX_BIN="$work/spx-old"
-check_result "a release is refused" "$( (node_knows_latitude) >/dev/null 2>&1 && echo ran || echo stopped)" stopped
-# The profile spx writes under sudo is in the ubuntu user's home, so node-side reads name that
-# directory instead of relying on root's HOME.
-mkdir "$work/awsdir"
-printf '[other]\naws_access_key_id = X\n[spinifex]\naws_access_key_id = AK1\naws_secret_access_key = SK1\n[z]\nq = 1\n' > "$work/awsdir/credentials"
-node_ip() { printf 192.0.2.10; }
-# shellcheck disable=SC2034 # read by the sourced functions
-NODE_AWS_DIR="$work/awsdir"
-check_result "credentials come from the node's AWS dir" "$(cmd_credentials | tr '\n' ' ')" "[spinifex] aws_access_key_id = AK1 aws_secret_access_key = SK1 "
-
-# A failed API call logs its status and a documented code, never the response text, which can
-# echo the request's headers.
-mkdir "$work/bin2"
-cat > "$work/bin2/curl" <<'SH'
-#!/bin/sh
-cat > /dev/null
-printf '{"errors":[{"code":"%s","detail":"Authorization: Bearer %s"}]}\n401' "$FAKE_CODE" "$FAKE_LEAK"
-SH
-chmod +x "$work/bin2/curl"
-logged="$(FAKE_CODE=UNAUTHORIZED FAKE_LEAK="$AUTH" PATH="$work/bin2:$PATH" latitude GET /servers 2>&1 || true)"
-check_result "a failed call names its status and code" "$(grep -c 'returned 401 (UNAUTHORIZED)' <<<"$logged" || true)" 1
-check_result "a failed call never logs the token" "$(grep -c "$AUTH" <<<"$logged" || true)" 0
-logged="$(FAKE_CODE="$AUTH" FAKE_LEAK="$AUTH" PATH="$work/bin2:$PATH" latitude GET /servers 2>&1 || true)"
-check_result "an undocumented code is not logged" "$(grep -c "$AUTH" <<<"$logged" || true)" 0
-
-# A recorded ID that now names another deployment's object is not ours to delete.
-# shellcheck disable=SC2034 # read by the sourced functions
-NAME=demo
-latitude() { printf '%s' "$FAKE_LAT"; }
-orig_expected_project_id="$(declare -f expected_project_id)"
-expected_project_id() { echo proj_1; }
-srv() {
-    local frag=',"project":{"id":"proj_1"}'
-    [ "$#" -lt 2 ] || frag="$2"
-    printf '{"data":{"id":"sv_1","attributes":{"hostname":"%s"%s}}}' "$1" "$frag"
-}
-FAKE_LAT="$(srv spx-demo-node2)"
-check_result "a recorded server with our hostname is ours" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" ours
-FAKE_LAT="$(srv spx-other-node1)"
-check_result "a recorded server with another hostname is not" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=1
-FAKE_LAT="$(srv spx-demo2-node1)"
-check_result "a hostname that only starts like ours is not" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=1
-FAKE_LAT="$(srv spx-demo-node1 ',"project":{"id":"proj_other"}')"
-check_result "our hostname in another project is not ours" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=1
-FAKE_LAT="$(srv spx-demo-node1 '')"
-check_result "a server with no project is unknown" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=2
-FAKE_LAT="$(srv spx-demo-node1 ',"project":{}')"
-check_result "a project with no id is unknown" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=2
-FAKE_LAT="$(srv spx-demo-node1 ',"project":null')"
-check_result "a null project is unknown" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=2
-expected_project_id() { return 1; }
-FAKE_LAT="$(srv spx-demo-node1)"
-check_result "no known project id is unknown" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=2
-expected_project_id() { echo proj_1; }
-FAKE_LAT='not json'
-check_result "an unreadable object is unknown" "$(recorded_identity server sv_1 && echo ours || echo "rc=$?")" rc=2
-KNOWN_IDS="$work/ids"
-printf 'server sv_1\n' > "$KNOWN_IDS"
-lat_exists() { return 0; }
-FAKE_LAT="$(srv spx-other-node1)"
-check_result "destroy stops before Terraform when a recorded ID was reused" "$( (check_recorded_identity) >/dev/null 2>&1 && echo went || echo stopped)" stopped
-FAKE_LAT="$(srv spx-demo-node1 ',"project":{"id":"proj_other"}')"
-check_result "destroy stops when the same hostname is in another project" "$( (check_recorded_identity) >/dev/null 2>&1 && echo went || echo stopped)" stopped
-FAKE_LAT="$(srv spx-demo-node1 '')"
-check_result "destroy stops when the project cannot be read" "$( (check_recorded_identity) >/dev/null 2>&1 && echo went || echo stopped)" stopped
-FAKE_LAT="$(srv spx-demo-node1)"
-check_result "destroy goes on when the recorded server is ours" "$( (check_recorded_identity) >/dev/null 2>&1 && echo went || echo stopped)" went
-leftovers_out="$( (lat_match() { return 0; }; FAKE_LAT="$(srv spx-other-node1)" leftovers) 2>/dev/null || true)"
-check_result "a reused ID is not listed as a leftover to delete" "$(grep -c sv_1 <<<"$leftovers_out" || true)" 0
-
-# After terraform destroy the state's project output is gone; the remembered ID still lets the
-# sweep delete a matching leftover and keep a foreign one.
-eval "$orig_expected_project_id"
-TF_BIN="$work/tofu"
-printf '#!/bin/sh\nif [ -f "%s/gone" ]; then exit 1; fi\nprintf proj_1\n' "$work" > "$TF_BIN"
-chmod +x "$TF_BIN"
-EXPECTED_PROJECT=""
-remember_project_id
-check_result "the project ID is remembered while the state holds it" "$EXPECTED_PROJECT" proj_1
-: > "$work/gone"
-check_result "the state no longer answers after destroy" "$("$TF_BIN" output >/dev/null 2>&1 && echo up || echo gone)" gone
-printf 'server sv_1\nserver sv_2\n' > "$KNOWN_IDS"
-lat_match() { return 1; }
-latitude() { if [ "$2" = /servers/sv_1 ]; then srv spx-demo-node1; else srv spx-other-node1 ',"project":{"id":"proj_other"}'; fi; }
-swept="$(leftovers 2>/dev/null || true)"
-check_result "after destroy a matching leftover is still listed" "$(grep -c 'server sv_1 ' <<<"$swept" || true)" 1
-check_result "after destroy a foreign one is kept out" "$(grep -c 'server sv_2 ' <<<"$swept" || true)" 0
-EXPECTED_PROJECT=""
-swept="$(leftovers 2>/dev/null || true)"
-check_result "without the remembered ID a leftover is unknown, not matched" "$(grep -c 'server sv_1 sv_1 (unknown)' <<<"$swept" || true)" 1
-expected_project_id() { echo proj_1; }
-
-# Cleanup never deletes an object whose ownership could not be read, recorded or not.
-deleted="$work/deleted"
-: > "$deleted"
-latitude() { printf '%s %s\n' "$1" "$2" >> "$deleted"; }
-printf 'server sv_1\nserver sv_2\n' > "$KNOWN_IDS"
-delete_left $'server sv_1 sv_1 (unknown)\nserver sv_2 spx-demo-node2\n' "" >/dev/null 2>&1
-check_result "an unreadable recorded object is not deleted" "$(grep -c sv_1 "$deleted" || true)" 0
-check_result "a verified recorded object is deleted" "$(grep -c 'DELETE .*sv_2' "$deleted" || true)" 1
-
-# Both deployment sizes write the metadata remap.
-cfg="$work/spinifex.toml"
-extract() { sed -n "/^$1()/,/^}/p" "$here/deploy-latitude.sh" | sed -n "/<<'PY'/,/^PY\$/p" | sed '1d;$d' | sed "s|/etc/spinifex/spinifex.toml|$cfg|"; }
-printf '[network]\nexternal_mode = "nat"\n\n[bootstrap]\ny = 1\n' > "$cfg"
-extract configure_pool | python3 -I - 203.0.113.1 203.0.113.254
-check_result "one node gets the metadata remap" "$(grep -c 'imds_host_meta_ip = "169.254.42.254"' "$cfg")" 1
-printf '[network]\nexternal_mode = "nat"\n\n[nodes.node1]\nx = 1\n\n[nodes.node2]\nx = 1\n\n[nodes.node3]\nx = 1\n\n[bootstrap]\ny = 1\n' > "$cfg"
-extract configure_latitude_pool | python3 -I - proj_1 eip_1,eip_2 node1=sv_1,node2=sv_2,node3=sv_3
-check_result "three nodes get the metadata remap" "$(grep -c 'imds_host_dns_ip  = "169.254.42.253"' "$cfg")" 1
-check_result "three nodes get the latitude pool" "$(grep -c 'source                  = "latitude"' "$cfg")" 1
-extract configure_latitude_pool | python3 -I - proj_1 eip_1,eip_2 node1=sv_1,node2=sv_2,node3=sv_3
-check_result "writing the config again changes nothing" "$(grep -c 'imds_host_meta_ip' "$cfg")" 1
-unset FAKE_SSH_EVAL
-
-[ "$fails" -eq 0 ]

scripts/terraform/latitude-spx/host-data-disk.sh

@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-# host-data-disk.sh — format and mount the blank data disk at /var/lib/spinifex. Run as root ON the host.
-#
-#   host-data-disk.sh [/dev/disk/by-id/nvme-eui.<id>]
-#
-# The disk is chosen by content, never by its nvmeXn1 name, which swaps between boots. A candidate is a
-# whole-disk by-id EUI link whose device is not in the root filesystem's ancestry, has no partitions,
-# holders, swap or mounts, no filesystem signature and no partition table. With none the script stops
-# and lists the disks. With several it takes the largest, and the lowest by-id path among equals, and
-# prints what it chose and the blank disks it left alone; pass the by-id path to choose another.
-# It never reformats: a rerun on a host already done prints the UUID and exits. The last line of stdout
-# is DATA_UUID=<uuid>, which the later install phases need.
-
-set -euo pipefail
-
-MP=/var/lib/spinifex
-LABEL=spinifex-data
-FSTAB_BAK=/etc/fstab.pre-spinifex
-MIN_BYTES="${MIN_DATA_BYTES:-100000000000}"
-WANT="${1:-}"
-
-die() { echo "STOP: $*" >&2; exit 1; }
-[ "$(id -u)" = 0 ] || die "run as root"
-
-# Resume: the mount is already there and is ours.
-if mp_uuid="$(findmnt --mountpoint "$MP" -no UUID 2>/dev/null)" && [ -n "$mp_uuid" ]; then
-    src="$(findmnt --mountpoint "$MP" -no SOURCE)"
-    [ "$(blkid -s LABEL -o value "$src")" = "$LABEL" ] || die "$MP is mounted from $src, which is not labelled $LABEL; not touching it"
-    grep -q "UUID=${mp_uuid}[[:space:]]" /etc/fstab || die "$MP is mounted but /etc/fstab has no UUID=$mp_uuid entry"
-    echo "already done: $MP is mounted from $src (UUID $mp_uuid)"
-    echo "DATA_UUID=$mp_uuid"
-    exit 0
-fi
-if grep -q "$MP" /etc/fstab; then die "/etc/fstab mentions $MP but nothing is mounted there; fix that by hand first"; fi
-[ ! -e "$MP" ] || [ -z "$(ls -A "$MP")" ] || die "$MP exists and is not empty"
-
-root_src="$(findmnt -no SOURCE /)" || die "cannot find the root source"
-root_anc="$(lsblk -s -nro NAME "$root_src")" || die "cannot read the root ancestry"
-[ -n "$root_anc" ] || die "empty root ancestry"
-
-# blank_reason ID prints why the disk is not a candidate and returns 1, or returns 0.
-blank_reason() {
-    local id="$1" dev name size kids hold sw mnt rc w
-    dev="$(readlink -e "$id")" || { echo "link does not resolve"; return 1; }
-    [ -b "$dev" ] || { echo "not a block device"; return 1; }
-    name="$(basename "$dev")"
-    if grep -qx "$name" <<<"$root_anc"; then echo "in the root ancestry"; return 1; fi
-    size="$(blockdev --getsize64 "$id")" || { echo "size unreadable"; return 1; }
-    [ "$size" -ge "$MIN_BYTES" ] || { echo "only $size bytes"; return 1; }
-    kids="$(lsblk -nro NAME "$id")" || { echo "children unreadable"; return 1; }
-    [ "$kids" = "$name" ] || { echo "has children"; return 1; }
-    hold="$(ls -A "/sys/block/$name/holders/")" || { echo "holders unreadable"; return 1; }
-    [ -z "$hold" ] || { echo "has holders"; return 1; }
-    sw="$(swapon --show=NAME --noheadings)" || { echo "swapon failed"; return 1; }
-    if grep -q "$name" <<<"$sw"; then echo "is swap"; return 1; fi
-    mnt="$(lsblk -nro MOUNTPOINTS "$id")" || { echo "mounts unreadable"; return 1; }
-    [ -z "${mnt//[[:space:]]/}" ] || { echo "is mounted"; return 1; }
-    set +e; blkid -p "$id" >/dev/null 2>&1; rc=$?; set -e
-    [ "$rc" -eq 2 ] || { echo "blkid -p says it has a signature (rc $rc)"; return 1; }
-    w="$(wipefs -n "$id")" || { echo "wipefs failed"; return 1; }
-    [ -z "$w" ] || { echo "wipefs finds signatures"; return 1; }
-    return 0
-}
-
-# choose_data_disk ID... prints the largest disk's ID, the lowest path among equal sizes, and says on
-# stderr which it left. The choice depends only on size and path, so every node of one plan agrees.
-choose_data_disk() {
-    local chosen rest
-    chosen="$(for id in "$@"; do printf '%s %s\n' "$(blockdev --getsize64 "$id")" "$id"; done |
-        sort -k1,1nr -k2,2 | head -n1)"
-    chosen="${chosen#* }"
-    if [ "$#" -gt 1 ]; then
-        rest="$(printf '%s\n' "$@" | grep -vxF "$chosen" | sort | tr '\n' ' ')"
-        echo "chose $chosen ($(blockdev --getsize64 "$chosen") bytes), the largest of $# blank disks; left untouched: ${rest% }" >&2
-    fi
-    printf '%s\n' "$chosen"
-}
-
-candidates=()
-shopt -s nullglob
-for id in /dev/disk/by-id/nvme-eui.*; do
-    case "$id" in *-part*) continue ;; esac
-    if [ -n "$WANT" ] && [ "$id" != "$WANT" ]; then continue; fi
-    if why="$(blank_reason "$id")"; then
-        candidates+=("$id")
-    else
-        echo "skip $id: $why"
-    fi
-done
-shopt -u nullglob
-
-if [ "${#candidates[@]}" -eq 0 ]; then
-    lsblk -o NAME,SIZE,TYPE,MODEL,SERIAL,FSTYPE,MOUNTPOINTS >&2 || true
-    die "no blank data disk among the by-id EUI disks"
-fi
-ID="$(choose_data_disk "${candidates[@]}")"
-DEV="$(readlink -e "$ID")"
-echo "CHECKS PASSED: $ID -> $DEV"
-
-mkdir -p "$MP"
-mkfs.ext4 -q -L "$LABEL" "$ID"
-U="$(blkid -p -o value -s UUID "$ID")" || die "blkid UUID failed"
-[ -n "$U" ] || die "no UUID after mkfs"
-[ "$(blkid -p -o value -s TYPE "$ID")" = ext4 ] || die "not ext4 after mkfs"
-
-NEW="$(mktemp /etc/fstab.spinifex.XXXXXX)"
-cp /etc/fstab "$NEW"
-echo "UUID=$U $MP ext4 defaults,nofail,x-systemd.device-timeout=30s 0 2" >> "$NEW"
-findmnt --verify --tab-file "$NEW" || { rm -f "$NEW"; die "staged fstab failed verify, /etc/fstab untouched"; }
-BAK="$FSTAB_BAK.$(date +%s)"
-cp -a /etc/fstab "$BAK"
-trap 'cp -a "$BAK" /etc/fstab; systemctl daemon-reload; echo "ROLLED BACK /etc/fstab from $BAK" >&2' EXIT
-chmod 644 "$NEW"
-mv "$NEW" /etc/fstab
-systemctl daemon-reload
-mount "$MP"
-[ "$(findmnt --mountpoint "$MP" -no UUID)" = "$U" ] || die "wrong UUID at $MP"
-[ "$(findmnt --mountpoint "$MP" -no FSTYPE)" = ext4 ] || die "wrong fstype at $MP"
-[ "$(findmnt --mountpoint "$MP" -no MAJ:MIN | tr -d ' ')" = "$(lsblk -dno MAJ:MIN "$ID" | tr -d ' ')" ] || die "wrong device at $MP"
-trap - EXIT
-findmnt --mountpoint "$MP" -o TARGET,SOURCE,MAJ:MIN,UUID,FSTYPE,OPTIONS
-echo "STORAGE OK"
-echo "DATA_UUID=$U"

scripts/terraform/latitude-spx/network.tf

@@ -1,14 +0,0 @@
-# A private network needs two or more servers, so a single node has none. The VLAN carries the cluster
-# and Geneve traffic; its address is set over SSH, since the VID is only known after apply.
-resource "latitudesh_virtual_network" "lan" {
-  count       = var.node_count > 1 ? 1 : 0
-  project     = local.project_id
-  site        = var.site
-  description = "spinifex-${var.deployment_name}"
-}
-
-resource "latitudesh_vlan_assignment" "node" {
-  count              = var.node_count > 1 ? var.node_count : 0
-  server_id          = latitudesh_server.node[count.index].id
-  virtual_network_id = latitudesh_virtual_network.lan[0].id
-}

scripts/terraform/latitude-spx/node-install-api-token.sh

@@ -1,48 +0,0 @@
-#!/bin/sh
-# Runs as root on a node. Reads the API token on stdin and installs it for the daemon.
-# The directory belongs to root and is not writable by anyone else, so no service can create or
-# swap an entry in it. The file belongs to the daemon's user alone (mode 0400): the other
-# services share the spinifex group, so group access would hand them the team-wide token. The
-# temporary file has an unpredictable name and is created exclusively. A symlink, or an owner
-# other than root or the daemon's user, where the directory or the file should be is refused.
-# Ownership and mode are set on every run, so an older install converges. The file's content is
-# replaced only when the token differs. Prints installed or unchanged.
-set -eu
-dir="${API_TOKEN_DIR:-/etc/spinifex/latitude}"
-root="${API_TOKEN_ROOT-root}"
-rootgroup="${API_TOKEN_ROOT_GROUP-root}"
-user="${API_TOKEN_USER-spinifex-daemon}"
-umask 077
-
-fail() { echo "$*" >&2; exit 1; }
-owner_of() { stat -c %U "$1"; }
-
-[ ! -L "$dir" ] || fail "$dir is a symlink"
-if [ ! -e "$dir" ]; then mkdir -p "$dir"; fi
-[ -d "$dir" ] || fail "$dir is not a directory"
-[ "$(owner_of "$dir")" = "$root" ] || fail "$dir is not owned by $root"
-chown "$root:$rootgroup" "$dir"
-chmod 0711 "$dir"
-
-target="$dir/api-token"
-[ ! -L "$target" ] || fail "$target is a symlink"
-if [ -e "$target" ]; then
-    [ -f "$target" ] || fail "$target is not a regular file"
-    holder="$(owner_of "$target")"
-    [ "$holder" = "$root" ] || [ "$holder" = "$user" ] || fail "$target is owned by $holder"
-fi
-
-tmp="$(mktemp "$dir/.api-token.XXXXXX")"
-trap 'rm -f "$tmp"' EXIT
-cat > "$tmp"
-[ -s "$tmp" ] || fail "empty token on stdin"
-if [ -f "$target" ] && cmp -s "$tmp" "$target"; then
-    chown "$user" "$target"
-    chmod 0400 "$target"
-    echo unchanged
-    exit 0
-fi
-chown "$user" "$tmp"
-chmod 0400 "$tmp"
-mv -f "$tmp" "$target"
-echo installed

scripts/terraform/latitude-spx/node-pool-state.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-# Runs as root on a node with the pool name as $1. Reads only the journal of the daemon's
-# current invocation, so a success logged before a restart cannot hide a failure after it.
-# Prints ready, refused or waiting.
-set -eu
-pool="${1:?pool name}"
-id="$(systemctl show -p InvocationID --value spinifex-daemon)"
-[ -n "$id" ] || { echo waiting; exit 0; }
-log="$(journalctl "_SYSTEMD_INVOCATION_ID=$id" -u spinifex-daemon --no-pager -o cat 2>/dev/null || true)"
-named() { grep -F -e "pool=$pool" -e "\"pool\":\"$pool\""; }
-if printf '%s\n' "$log" | grep -F "refused the pool's first call" | named >/dev/null; then
-    echo refused
-elif printf '%s\n' "$log" | grep -F "floating pool ready" | named >/dev/null; then
-    echo ready
-else
-    echo waiting
-fi

scripts/terraform/latitude-spx/node-scripts_test.sh

@@ -1,119 +0,0 @@
-#!/bin/sh
-# Tests node-install-api-token.sh and node-pool-state.sh with stand-in tools.
-set -eu
-here="$(cd "$(dirname "$0")" && pwd)"
-work="$(mktemp -d)"
-trap 'rm -rf "$work"' EXIT
-fails=0
-check() { if [ "$2" = "$3" ]; then echo "ok   $1"; else echo "FAIL $1: want '$3' got '$2'"; fails=$((fails + 1)); fi; }
-
-# token install: A, A again, then B across a rotation; the file ends as B, owned by the daemon
-# user alone (0400) in a 0711 directory that only root may change
-me="$(id -un)"
-export API_TOKEN_DIR="$work/tok" API_TOKEN_ROOT="$me" API_TOKEN_ROOT_GROUP="$(id -gn)" API_TOKEN_USER="$me"
-install_token() { sh "$here/node-install-api-token.sh"; }
-check "first install" "$(printf 'TOKENA' | install_token)" installed
-check "same token" "$(printf 'TOKENA' | install_token)" unchanged
-check "rotation" "$(printf 'TOKENB' | install_token)" installed
-check "file holds B" "$(cat "$work/tok/api-token")" TOKENB
-check "file mode and owner" "$(stat -c '%U %a' "$work/tok/api-token")" "$me 400"
-check "dir mode and owner" "$(stat -c '%U %a' "$work/tok")" "$me 711"
-check "no temp left after install" "$(ls -A "$work/tok")" api-token
-check "empty refused" "$(printf '' | install_token 2>/dev/null || echo failed)" failed
-check "file kept after refusal" "$(cat "$work/tok/api-token")" TOKENB
-
-# an older install converges on the unchanged path too
-chmod 0640 "$work/tok/api-token"
-chmod 0755 "$work/tok"
-check "unchanged path repairs" "$(printf 'TOKENB' | install_token)" unchanged
-check "mode repaired on unchanged" "$(stat -c %a "$work/tok/api-token")" 400
-check "dir mode repaired on unchanged" "$(stat -c %a "$work/tok")" 711
-
-# who can read it: only the daemon's identity. This needs two real identities, so it runs as root only.
-if [ "$(id -u)" = 0 ]; then
-    chmod 0711 "$work"
-    export API_TOKEN_ROOT=root API_TOKEN_ROOT_GROUP=root API_TOKEN_USER=daemon
-    for mode in installed unchanged; do
-        [ "$mode" = installed ] && rm -f "$work/tok/api-token"
-        check "$mode path" "$(printf 'TOKENB' | install_token)" "$mode"
-        check "daemon reads ($mode)" "$(setpriv --reuid=daemon --regid=daemon --clear-groups cat "$work/tok/api-token")" TOKENB
-        check "another identity in the shared group cannot read ($mode)" \
-            "$(setpriv --reuid=nobody --regid=daemon --clear-groups cat "$work/tok/api-token" 2>/dev/null || echo denied)" denied
-    done
-    export API_TOKEN_ROOT="$me" API_TOKEN_ROOT_GROUP="$(id -gn)" API_TOKEN_USER="$me"
-else
-    echo "skip reading as the daemon and as another service: needs root"
-fi
-
-# a link planted where the file or the directory belongs is refused, and nothing it points at is touched
-echo SENTINEL > "$work/sentinel"
-rm -f "$work/tok/api-token"
-ln -s "$work/sentinel" "$work/tok/api-token"
-check "symlinked file refused" "$(printf 'TOKENC' | sh "$here/node-install-api-token.sh" 2>/dev/null || echo refused)" refused
-check "symlink target untouched" "$(cat "$work/sentinel")" SENTINEL
-ln -s "$work/tok" "$work/tok-link"
-check "symlinked dir refused" "$(printf 'TOKENC' | API_TOKEN_DIR="$work/tok-link" sh "$here/node-install-api-token.sh" 2>/dev/null || echo refused)" refused
-check "dir owned by someone else refused" "$(printf 'TOKENC' | API_TOKEN_ROOT=nobody-such install_token 2>/dev/null || echo refused)" refused
-rm -f "$work/tok/api-token"
-printf 'TOKENB' | install_token >/dev/null
-check "file owned by a stranger refused" "$(printf 'TOKENC' | API_TOKEN_ROOT=$me API_TOKEN_USER=nobody-such install_token 2>/dev/null || echo refused)" refused
-check "no temp left" "$(ls -A "$work/tok")" api-token
-
-# data disk choice: the largest blank disk, the lowest path among equals, the rest left alone
-choose_dir="$work/choose"
-mkdir -p "$choose_dir/bin"
-cat > "$choose_dir/bin/blockdev" <<'SH'
-#!/bin/sh
-# blockdev --getsize64 <id>: the fixture's size for that disk
-cat "$CHOOSE_DIR/size.$(basename "$2")"
-SH
-chmod +x "$choose_dir/bin/blockdev"
-eval "$(sed -n '/^choose_data_disk()/,/^}/p' "$here/host-data-disk.sh")"
-size_of() { printf '%s' "$2" > "$choose_dir/size.$1"; }
-pick() { CHOOSE_DIR="$choose_dir" PATH="$choose_dir/bin:$PATH" choose_data_disk "$@" 2>"$choose_dir/err"; }
-size_of nvme-eui.0b 1700000000000
-size_of nvme-eui.0a 1700000000000
-size_of nvme-eui.09 447000000000
-size_of nvme-eui.0c 1900000000000
-check "largest of three wins" "$(pick /dev/disk/by-id/nvme-eui.09 /dev/disk/by-id/nvme-eui.0b /dev/disk/by-id/nvme-eui.0c)" /dev/disk/by-id/nvme-eui.0c
-check "equal sizes: the lowest path" "$(pick /dev/disk/by-id/nvme-eui.09 /dev/disk/by-id/nvme-eui.0b /dev/disk/by-id/nvme-eui.0a)" /dev/disk/by-id/nvme-eui.0a
-check "order of the list does not matter" "$(pick /dev/disk/by-id/nvme-eui.0b /dev/disk/by-id/nvme-eui.0a /dev/disk/by-id/nvme-eui.09)" /dev/disk/by-id/nvme-eui.0a
-check "what was left is said" "$(grep -c 'left untouched: /dev/disk/by-id/nvme-eui.09 /dev/disk/by-id/nvme-eui.0b' "$choose_dir/err")" 1
-check "one disk is just chosen" "$(pick /dev/disk/by-id/nvme-eui.09)" /dev/disk/by-id/nvme-eui.09
-check "one disk says nothing" "$(wc -c < "$choose_dir/err" | tr -d ' ')" 0
-
-# pool state: the stand-in journal serves only the lines of the invocation asked for
-mkdir "$work/bin"
-cat > "$work/bin/systemctl" <<'SH'
-#!/bin/sh
-cat "$FAKE_DIR/invocation"
-SH
-cat > "$work/bin/journalctl" <<'SH'
-#!/bin/sh
-for a in "$@"; do
-    case "$a" in _SYSTEMD_INVOCATION_ID=*) id="${a#_SYSTEMD_INVOCATION_ID=}" ;; esac
-done
-cat "$FAKE_DIR/journal.$id" 2>/dev/null
-SH
-chmod +x "$work/bin/systemctl" "$work/bin/journalctl"
-export FAKE_DIR="$work" PATH="$work/bin:$PATH"
-state() { sh "$here/node-pool-state.sh" latitude; }
-
-echo old > "$work/invocation"
-echo 'INFO floating pool ready pool=latitude source=latitude' > "$work/journal.old"
-check "current success" "$(state)" ready
-
-echo new > "$work/invocation"
-echo 'ERROR floating: the provider refused the pool'"'"'s first call; public addresses will fail until fixed pool=latitude' > "$work/journal.new"
-check "old success then current failure" "$(state)" refused
-
-echo 'INFO starting' > "$work/journal.new"
-check "current invocation not yet ready" "$(state)" waiting
-
-echo 'INFO floating pool ready pool=other source=latitude' > "$work/journal.new"
-check "another pool does not count" "$(state)" waiting
-
-echo 'INFO floating pool ready pool=latitude source=latitude' > "$work/journal.new"
-check "current success" "$(state)" ready
-
-[ "$fails" -eq 0 ]

scripts/terraform/latitude-spx/outputs.tf

@@ -1,56 +0,0 @@
-output "deployment_name" {
-  value = var.deployment_name
-}
-
-output "site" {
-  value = var.site
-}
-
-output "project" {
-  value = local.project
-}
-
-# provider_host_id is the server ID. public_ip is the server's own /31 address, which SSH and the
-# Spinifex API use; the Elastic IP is separate.
-output "nodes" {
-  value = [for n in latitudesh_server.node : {
-    name             = trimprefix(n.hostname, "spx-${var.deployment_name}-")
-    provider_host_id = n.id
-    public_ip        = n.primary_ipv4
-  }]
-}
-
-# The first address, for a single node's static pool.
-output "elastic_ip" {
-  value = latitudesh_elastic_ip.pool[0].address
-}
-
-# IDs as well as addresses: destroy deletes only these IDs, and the floating pool lists them.
-output "elastic_ips" {
-  value = [for e in latitudesh_elastic_ip.pool : { id = e.id, address = e.address }]
-}
-
-# The VLAN ID of the cluster network; null for one node, which has no private network.
-output "vid" {
-  value = length(latitudesh_virtual_network.lan) == 0 ? null : latitudesh_virtual_network.lan[0].vid
-}
-
-output "ssh_key_id" {
-  value = latitudesh_ssh_key.deploy.id
-}
-
-output "user_data_id" {
-  value = latitudesh_user_data.host.id
-}
-
-output "project_id" {
-  value = local.project_id
-}
-
-output "project_created" {
-  value = length(latitudesh_project.deploy) > 0
-}
-
-output "virtual_network_id" {
-  value = length(latitudesh_virtual_network.lan) == 0 ? null : latitudesh_virtual_network.lan[0].id
-}

scripts/terraform/latitude-spx/provider.tf

@@ -1,4 +0,0 @@
-# The token comes from LATITUDESH_AUTH_TOKEN in the environment, which the provider reads
-# itself (its auth_token argument documents that variable). It is never a variable here, so it
-# is not written to the state or to a tfvars file. The default project is set per resource.
-provider "latitudesh" {}

scripts/terraform/latitude-spx/terraform.tfvars.example

@@ -1,5 +0,0 @@
-deployment_name     = "l1"
-site                = "DAL"
-plan                = "m4-metal-medium"
-node_count          = 1
-ssh_public_key_path = "~/.ssh/id_ed25519.pub"

scripts/terraform/latitude-spx/variables.tf

@@ -1,63 +0,0 @@
-variable "deployment_name" {
-  type        = string
-  description = "Names every resource and the server hostnames, so two deployments in one account never collide."
-  validation {
-    # A hostname is at most 32 characters: "spx-" + name + "-node1".
-    condition     = can(regex("^[a-z0-9][a-z0-9-]{0,15}$", var.deployment_name))
-    error_message = "deployment_name must be 1-16 lowercase letters, digits or hyphens."
-  }
-}
-
-variable "project" {
-  type        = string
-  default     = ""
-  description = "ID or slug of an existing latitude.sh project to deploy into. Empty creates a project spinifex-<deployment_name> and removes it on destroy."
-}
-
-variable "project_id" {
-  type        = string
-  default     = ""
-  description = "ID of the project named by project. The Elastic IP create sends it as project_id without resolving a slug (provider 4.8.0), so it must be an ID. Unused when project is empty."
-}
-
-variable "site" {
-  type        = string
-  default     = "DAL"
-  description = "latitude.sh site slug. Pick one with stock for the plan and Elastic IP support; not SAO."
-}
-
-variable "plan" {
-  type        = string
-  default     = "m4-metal-medium"
-  description = "Server plan slug (the pricing page calls it m4.metal.medium)."
-}
-
-variable "operating_system" {
-  type        = string
-  default     = "ubuntu_26_04_x64_lts"
-  description = "OS slug. UNVERIFIED: the 26.04 slug follows the 24.04 pattern (ubuntu_24_04_x64_lts) and is checked by a data source at plan time."
-}
-
-variable "node_count" {
-  type    = number
-  default = 1
-  validation {
-    condition     = contains([1, 3], var.node_count)
-    error_message = "node_count must be 1 or 3."
-  }
-}
-
-variable "elastic_ip_count" {
-  type        = number
-  default     = 1
-  description = "Elastic IPs to buy, each 4 USD a month. Every one starts on a server and keeps it unless Spinifex moves it. latitude.sh allows 5 per team."
-  validation {
-    condition     = var.elastic_ip_count >= 1 && var.elastic_ip_count <= 5 && floor(var.elastic_ip_count) == var.elastic_ip_count
-    error_message = "elastic_ip_count must be a whole number from 1 to 5."
-  }
-}
-
-variable "ssh_public_key_path" {
-  type    = string
-  default = "~/.ssh/id_ed25519.pub"
-}

scripts/terraform/latitude-spx/versions.tf

@@ -1,7 +0,0 @@
-terraform {
-  required_version = ">= 1.5.0"
-  required_providers {
-    # Pinned exactly: 4.8.0 is the version whose schema these files were written against.
-    latitudesh = { source = "latitudesh/latitudesh", version = "= 4.8.0" }
-  }
-}

spec/EBSProvider/Capabilities.tla

@@ -1,27 +0,0 @@
-------------------------------------------------- MODULE Capabilities -------------------------------------------------
-(*********************************************************************************************************************)
-(* The optional behaviour that an implementation advertises.                                                         *)
-(*********************************************************************************************************************)
-EXTENDS EBSProvider
-
------------------------------------------------------------------------------------------------------------------------
-\* Interface methods
-
-GetCapabilitiesRequests == {<<>>}
-
-GetCapabilities(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* The implementation reports which optional behaviour it supports.                                                *)
-  (*******************************************************************************************************************)
-     \* The provider failed to answer.
-  \/ /\ val = None
-     /\ err \in ProviderErrors
-     /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \* Every answer is the same, so an earlier one may be cached.
-  \/ /\ val = Capabilities
-     /\ err = None
-     /\ UNCHANGED vars
-
-=======================================================================================================================

spec/EBSProvider/EBSProvider.tla

@@ -1,163 +0,0 @@
-------------------------------------------------- MODULE EBSProvider --------------------------------------------------
-(*********************************************************************************************************************)
-(* The state that an implementation exposes, and the types and constants that every other module shares.             *)
-(*********************************************************************************************************************)
-EXTENDS
-  Naturals,
-  Sequences,
-  FiniteSets,
-  Functions,
-  TLC
-
------------------------------------------------------------------------------------------------------------------------
-\* Constants
-
-CONSTANTS
-  MaxBytes,
-  VolumeIDs, VolumeHandles,
-  NodeIDs, NBDURIs, DevicePaths,
-  SnapshotIDs, SnapshotHandles,
-  AvailabilityZones, Timestamps,
-  Parameters, ProviderData,
-  ListTokens, MaxListResults,
-  \* The optional behaviour that the implementation advertises, which never changes.
-  Capabilities,
-  \* Whether the provider may fail to answer at any point in a behaviour.
-  ProviderMayFail,
-  \* Stands in for an optional field that a request or response omitted.
-  None
-
-ASSUME MaxBytes \in Nat \ {0}
-ASSUME VolumeIDs /= {} /\ VolumeHandles /= {}
-ASSUME NodeIDs /= {} => NBDURIs /= {} \/ DevicePaths /= {}
-ASSUME SnapshotIDs /= {} => SnapshotHandles /= {} /\ Timestamps /= {}
-ASSUME ListTokens /= {}
-ASSUME MaxListResults \in Nat \ {0}
-ASSUME None \notin UNION {VolumeIDs, VolumeHandles, NodeIDs, SnapshotIDs, SnapshotHandles,
-                          AvailabilityZones, Timestamps, Parameters, ProviderData, ListTokens}
-ASSUME Capabilities \in [online_expansion          : BOOLEAN,
-                         sparse_extent_reporting   : BOOLEAN,
-                         crash_consistent_snapshot : BOOLEAN,
-                         volume_seeding            : BOOLEAN,
-                         read_only_publish         : BOOLEAN,
-                         volume_enumeration        : BOOLEAN,
-                         snapshot_enumeration      : BOOLEAN,
-                         owner_routing             : BOOLEAN,
-                         exclusion                 : [scope             : {"none", "node", "cluster"},
-                                                      claim_ttl_seconds : Nat,
-                                                      fences_lost_claim : BOOLEAN]]
-ASSUME ProviderMayFail \in BOOLEAN
-
------------------------------------------------------------------------------------------------------------------------
-\* Variables
-
-VARIABLES
-  \* Every volume that the implementation exposes, keyed by volume ID.
-  volumes,
-  \* Every publication that the implementation exposes, keyed by the volume and the node it is published to.
-  publications,
-  \* Every snapshot that the implementation exposes, keyed by snapshot ID.
-  snapshots
-
-vars == <<volumes, publications, snapshots>>
-
------------------------------------------------------------------------------------------------------------------------
-\* Miscellaneous
-
-IsPartialFn(f, D, R) == DOMAIN f \subseteq D /\ \A x \in DOMAIN f : f[x] \in R
-
-Optional(S) == S \union {None}
-
-InsertKey(f, x, y) == f @@ (x :> y)
-
-RemoveKey(f, x) == RestrictDomain(f, LAMBDA x_2 : x_2 /= x)
-
-KeyExists(f, x) == x \in DOMAIN f
-
------------------------------------------------------------------------------------------------------------------------
-\* Types
-
-Bytes == 0..MaxBytes
-
-\* The errors that an implementation may return when its provider fails to answer.
-ProviderErrors == IF ProviderMayFail
-                  THEN {"internal", "unavailable"}
-                  \* Otherwise an implementation could conform by refusing to answer.
-                  ELSE {}
-
-CapacityRanges == [required_bytes : Bytes, limit_bytes : Bytes]
-
-VolumeStates == {"available", "in-use"}
-
-Volumes == [capacity_bytes     : 1..MaxBytes,
-            state              : VolumeStates,
-            handle             : VolumeHandles,
-            availability_zone  : Optional(AvailabilityZones),
-
-            \* Never returned, but kept to tell a retry from a conflicting request.
-            source_snapshot_id : Optional(SnapshotIDs),
-            parameters         : Optional(Parameters),
-            provider_data      : Optional(ProviderData)]
-
-\* How a published volume is reached on its node, either over NBD or as a host block device.
-Exports == [kind    : {"nbd"},
-            nbd_uri : NBDURIs]
-           \union
-           [kind        : {"block"},
-            device_path : DevicePaths,
-            size_bytes  : 1..MaxBytes]
-
-\* A volume published to a node, and whether it was published read-only.
-Publications == [export    : Exports,
-                 read_only : BOOLEAN]
-
-SnapshotStates == {"pending", "completed", "error"}
-
-Snapshots == [size_bytes       : 1..MaxBytes,
-              created_at       : Timestamps,
-              state            : SnapshotStates,
-              handle           : SnapshotHandles,
-              source_volume_id : VolumeIDs]
-
------------------------------------------------------------------------------------------------------------------------
-\* State helpers
-
-\* The part of a volume that the implementation returns.
-VolumeView(volID) ==
-  ("id" :> volID) @@ Restrict(volumes[volID], {"capacity_bytes",
-                                               "state",
-                                               "handle",
-                                               "availability_zone",
-                                               "provider_data"})
-
-\* The nodes that a volume is published to.
-PublishedNodes(volID) == {n \in NodeIDs : KeyExists(publications, <<volID, n>>)}
-
-\* The part of a publication that the implementation returns.
-PublicationView(volID, nodeID) == [volume_id |-> volID,
-                                   node_id   |-> nodeID,
-                                   export    |-> publications[volID, nodeID].export]
-
-\* The part of a snapshot that the implementation returns.
-SnapshotView(snapID) == ("id" :> snapID) @@ snapshots[snapID]
-
-\* The number of refs that a page may hold, with an omitted or oversized request clamped to the maximum.
-PageSize(m) == IF m <= 0 \/ m > MaxListResults THEN MaxListResults ELSE m
-
------------------------------------------------------------------------------------------------------------------------
-\* Invariants
-
-TypeOK ==
-  /\ IsPartialFn(volumes, VolumeIDs, Volumes)
-  /\ IsPartialFn(publications, VolumeIDs \X NodeIDs, Publications)
-  /\ IsPartialFn(snapshots, SnapshotIDs, Snapshots)
-
------------------------------------------------------------------------------------------------------------------------
-\* Initial state
-
-Init ==
-  /\ volumes      = <<>>
-  /\ publications = <<>>
-  /\ snapshots    = <<>>
-
-=======================================================================================================================

spec/EBSProvider/README.md

@@ -1,140 +0,0 @@
-# EBSProvider specification
-
-The contract that every implementation of the `EBSProvider` interface must meet.
-
-## Terminology
-
-- **Provider:** the service that backs an implementation's operations, such as Viperblock.
-  The memory implementation has none.
-- **Implementation:** a Go implementation of the `EBSProvider` interface, which adapts between the shapes of the contract and the shapes that its provider expects.
-- **Contract:** the behaviour that this specification requires of every implementation, as observed through the interface.
-
-## Open questions
-
-### EBSProvider
-
-- What may a failed call change?
-  A failed call leaves the state unchanged, but a timeout can arrive after the provider acted, and a crash can leave work half done.
-- Is the schema version part of the contract?
-  Every method refuses an unsupported version with `unsupported_version`, and the conformance suite tests it, but the specification does not model versions.
-- Are `internal` and `unavailable` the only errors that a failed provider may cause?
-- Must a present but malformed ID be refused with `invalid_argument`?
-  IDs are opaque here, so only an omitted one is refused.
-
-### Capabilities
-
-#### GetCapabilities
-
-- Is it a lasting promise that capabilities never change, even when an implementation or its provider is upgraded or reconfigured after an earlier answer was cached?
-
-### Volumes
-
-- Who decides whether a volume is `in-use`?
-  An implementation may track attachments itself, or derive the state from whether a publication claim is held.
-
-#### CreateVolume
-
-- May the capacity be anywhere in the requested range, as CSI allows?
-  An implementation that rounds up would then fail the comparison that tells a retry from a conflicting request.
-- May seed data be combined with a source snapshot?
-  The Viperblock implementation refuses, the memory implementation accepts.
-- Must the source snapshot be completed?
-  AWS refuses one that is not.
-- Must an implementation store the availability zone, parameters and source snapshot, so that it can detect a conflicting retry?
-  The Viperblock implementation does not.
-- Should a retry be compared against the original request rather than the current volume?
-  A retry after ExpandVolume conflicts on capacity.
-- Should a retry with a different source snapshot volume ID conflict?
-  It is not compared.
-- Is byte equality the meaning of equal parameters, or may an implementation compare them semantically?
-- Should `MaxSeedBytes` be modelled?
-  Seed data larger than it is refused with `invalid_argument`.
-
-#### GetVolume
-
-- Must an implementation compare the handle?
-  The Viperblock implementation ignores it.
-- Is `not_found` the right error for a volume that was deleted and recreated under the same ID?
-
-#### ListVolumes
-
-- Must following next tokens list every volume that exists throughout the walk exactly once?
-  The conformance suite tests it, but the specification describes each call alone, so it does not say how one page relates to the next.
-- What should a starting token that the implementation never issued do?
-  Every implementation treats any token as a position to resume after, while CSI refuses an invalid one with `ABORTED`.
-- May a page hold fewer refs than requested yet carry a next token?
-  AWS and CSI allow it, but here a next token comes only with a full page, so that a walk cannot stall on empty pages.
-
-#### ExpandVolume
-
-- Should a request below the current capacity succeed without change, as CSI recommends, rather than be refused with `invalid_argument`?
-  It is refused here, as AWS refuses `ModifyVolume` to a smaller size and the conformance suite tests, while CSI says the plugin should reply OK when the volume is already at least the requested size.
-- Must a block export's size follow an online expansion?
-  A published volume keeps its export's `size_bytes`, so after it grows the export reports the old size.
-
-#### PublishVolume
-
-- Should `volume_in_use` depend on the exclusion scope?
-  An implementation whose scope is `none` lets two writers in, and one whose scope is `node` cannot see another node, yet both are refused here.
-- Must a republish to the same node with a different `read_only` be refused?
-  The Viperblock implementation refuses it with `volume_in_use`, while the memory implementation ignores the flag.
-- May two volumes on one node share an NBD URI or a device path?
-- Must a block export's size equal the volume's capacity?
-
-#### UnpublishVolume
-
-- Must an implementation compare the handle?
-  Both the Viperblock and memory implementations ignore it.
-- Is a provider that fails to seal the volume a failed provider?
-  The Viperblock implementation answers `internal` and leaves the volume published, which the specification allows only when the provider may fail.
-- Should a claim that lapses through its TTL be modelled, as a step that happens without a call?
-- Should a volume that does not exist be refused with `not_found`?
-  It succeeds here, as CSI requires and the conformance suite tests, while AWS refuses `DetachVolume` on a missing volume with `InvalidVolume.NotFound`.
-
-#### DeleteVolume
-
-- Must an implementation compare the handle before refusing a published volume?
-  The memory implementation does, and succeeds without deleting it, while the Viperblock implementation ignores the handle and refuses with `volume_in_use`.
-- Should a volume that does not exist be refused with `not_found`?
-  It succeeds here, as CSI requires and the conformance suite tests, while AWS refuses `DeleteVolume` on a missing volume with `InvalidVolume.NotFound`.
-
-### Snapshots
-
-- Should a pending snapshot's move to `completed` or `error` be modelled, as a step that happens without a call?
-  Without it a pending snapshot never completes, and no snapshot is ever in `error`.
-
-#### CreateSnapshot
-
-- May success return a `pending` snapshot?
-  AWS starts a snapshot as `pending`, while the memory implementation returns `completed` and the NATS implementation waits for completion and refuses anything else.
-- Must a retry compare the volume handle?
-  It is ignored, as in the memory implementation, so a volume deleted and recreated under the same ID returns the old snapshot.
-- Should a copy's ID count as a retry?
-  A copy keeps its source's volume ID, so creating a snapshot of that volume under the copy's ID returns the copy.
-- Should `crash_consistent_snapshot` be modelled?
-  The specification does not model volume data, so it cannot say what a snapshot of a published volume holds.
-
-#### CopySnapshot
-
-- Should a retried copy return the existing copy, as a retried CreateVolume does, rather than `already_exists`?
-- May a source that is not completed be copied?
-  AWS refuses until it is.
-- What state does a copy start in?
-  The memory implementation always returns `completed`, while AWS starts a copy as `pending`.
-
-#### ListSnapshots
-
-- The questions for ListVolumes apply here too.
-- Must a ref carry the source volume ID?
-  The Viperblock implementation leaves it empty, since reading it costs a fetch per snapshot, yet reconciliation needs it to act on a snapshot whose metadata is lost.
-
-#### DeleteSnapshot
-
-- Is the handle check part of the contract?
-  The Viperblock implementation ignores the handle and deletes anyway.
-- May a pending snapshot be deleted?
-  AWS allows it.
-- What does success promise?
-  The Go docs say the snapshot is gone, but a snapshot whose handle did not match is left in place.
-- Should a snapshot that does not exist be refused with `not_found`?
-  It succeeds here, as CSI requires and the conformance suite tests, while AWS refuses `DeleteSnapshot` on a missing snapshot with `InvalidSnapshot.NotFound`.

spec/EBSProvider/Snapshots.tla

@@ -1,159 +0,0 @@
--------------------------------------------------- MODULE Snapshots ---------------------------------------------------
-(*********************************************************************************************************************)
-(* The lifecycle of a snapshot, from its creation to its deletion.                                                   *)
-(*********************************************************************************************************************)
-EXTENDS EBSProvider
-
------------------------------------------------------------------------------------------------------------------------
-\* Interface methods
-
-CreateSnapshotRequests == [snapshot_id   : Optional(SnapshotIDs),
-                           volume_id     : Optional(VolumeIDs),
-                           volume_handle : Optional(VolumeHandles)]
-
-CreateSnapshot(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* A volume's data is frozen as a snapshot, from which new volumes can be restored. A retry of a call that         *)
-  (* already succeeded returns the same snapshot.                                                                    *)
-  (*******************************************************************************************************************)
-  LET snapID == req.snapshot_id
-      volID  == req.volume_id
-
-      Errors ==
-        LET checks == [invalid_argument |-> None \in {snapID, volID},
-                       already_exists   |-> /\ KeyExists(snapshots, snapID)
-                                            /\ snapshots[snapID].source_volume_id /= volID,
-                       \* Only checked for a new snapshot, so a retry outlives the volume.
-                       not_found        |-> /\ ~KeyExists(snapshots, snapID)
-                                            /\ \/ ~KeyExists(volumes, volID)
-                                               \/ req.volume_handle \notin {None, volumes[volID].handle}]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-           \* A retry returns the existing snapshot.
-        /\ \/ /\ KeyExists(snapshots, snapID)
-              /\ UNCHANGED snapshots
-
-           \/ /\ ~KeyExists(snapshots, snapID)
-              \* The handle, creation time and state are the implementation's choice.
-              /\ \E h \in SnapshotHandles \ {snapshots[x].handle : x \in DOMAIN snapshots},
-                    t \in Timestamps,
-                    s \in {"pending", "completed"} :
-                   snapshots' = InsertKey(snapshots, snapID, [size_bytes       |-> volumes[volID].capacity_bytes,
-                                                              created_at       |-> t,
-                                                              state            |-> s,
-                                                              handle           |-> h,
-                                                              source_volume_id |-> volID])
-        /\ val = SnapshotView(snapID)'
-        /\ err = None
-        /\ UNCHANGED <<volumes, publications>>
-
-
-CopySnapshotRequests == [source_snapshot_id      : Optional(SnapshotIDs),
-                         destination_snapshot_id : Optional(SnapshotIDs),
-                         volume_id               : Optional(VolumeIDs)]
-
-CopySnapshot(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* A snapshot is copied under a new ID, sharing its frozen data, and the copy can be deleted independently         *)
-  (* of it.                                                                                                          *)
-  (*******************************************************************************************************************)
-  LET srcSnapID == req.source_snapshot_id
-      dstSnapID == req.destination_snapshot_id
-      volID     == req.volume_id
-
-      Errors ==
-        LET checks == [invalid_argument |-> \/ None \in {srcSnapID, dstSnapID, volID}
-                                            \/ srcSnapID = dstSnapID
-                                            \* Only compared, not looked up, since a snapshot outlives its volume.
-                                            \/ /\ KeyExists(snapshots, srcSnapID)
-                                               /\ snapshots[srcSnapID].source_volume_id /= volID,
-                       already_exists   |-> KeyExists(snapshots, dstSnapID),
-                       not_found        |-> srcSnapID \notin Optional(DOMAIN snapshots)]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        \* The handle and creation time are the implementation's choice.
-        /\ \E h \in SnapshotHandles \ {snapshots[x].handle : x \in DOMAIN snapshots},
-              t \in Timestamps :
-             snapshots' = InsertKey(snapshots, dstSnapID, [created_at |-> t,
-                                                           handle     |-> h]
-                                                           @@ snapshots[srcSnapID])
-        /\ val = SnapshotView(dstSnapID)'
-        /\ err = None
-        /\ UNCHANGED <<volumes, publications>>
-
-
-ListSnapshotsRequests == [max_results    : -1..(MaxListResults + 1),
-                          starting_token : Optional(ListTokens)]
-
-ListSnapshots(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* Some of the snapshots are listed, a page at a time, and nothing changes. A call with no starting token that     *)
-  (* returns no next token lists every snapshot.                                                                     *)
-  (*******************************************************************************************************************)
-  LET Errors ==
-    LET checks == [unsupported_capability |-> ~Capabilities.snapshot_enumeration]
-    IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        /\ LET refs == {[id               |-> id,
-                         source_volume_id |-> snapshots[id].source_volume_id,
-                         handle           |-> snapshots[id].handle] : id \in DOMAIN snapshots}
-           \* The page and the next token are the implementation's choice.
-           IN \E page \in SUBSET refs, next \in Optional(ListTokens) :
-                /\ Cardinality(page) <= PageSize(req.max_results)
-                /\ next /= None => Cardinality(page) = PageSize(req.max_results)
-                /\ req.starting_token = None /\ next = None => page = refs
-                /\ val = [snapshots |-> page, next_token |-> next]
-        /\ err = None
-        /\ UNCHANGED vars
-
-
-DeleteSnapshotRequests == [snapshot_id : Optional(SnapshotIDs),
-                           handle      : Optional(SnapshotHandles)]
-
-DeleteSnapshot(req, err) ==
-  (*******************************************************************************************************************)
-  (* A snapshot is deleted, so that no new volume can be restored from it. Volumes already restored from it,         *)
-  (* and copies of it, are unaffected.                                                                               *)
-  (*******************************************************************************************************************)
-  LET snapID == req.snapshot_id
-
-      Errors ==
-        LET checks == [invalid_argument |-> snapID = None]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        /\ snapshots' = IF /\ KeyExists(snapshots, snapID)
-                           /\ req.handle \notin {None, snapshots[snapID].handle}
-                        THEN snapshots
-                        \* Record removal is idempotent so that retries succeed.
-                        ELSE RemoveKey(snapshots, snapID)
-        /\ err = None
-        /\ UNCHANGED <<volumes, publications>>
-
-=======================================================================================================================

spec/EBSProvider/Volumes.tla

@@ -1,286 +0,0 @@
---------------------------------------------------- MODULE Volumes ----------------------------------------------------
-(*********************************************************************************************************************)
-(* The lifecycle of a volume, from its creation to its deletion.                                                     *)
-(*********************************************************************************************************************)
-EXTENDS EBSProvider
-
------------------------------------------------------------------------------------------------------------------------
-\* Interface methods
-
-CreateVolumeRequests == [volume_id                 : Optional(VolumeIDs),
-                         capacity_range            : CapacityRanges,
-                         availability_zone         : Optional(AvailabilityZones),
-                         source_snapshot_id        : Optional(SnapshotIDs),
-                         source_snapshot_volume_id : Optional(VolumeIDs),
-                         parameters                : Optional(Parameters),
-                         seed_data                 : Bytes]
-
-CreateVolume(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* A volume of the requested capacity is created, either blank or holding a snapshot's data, optionally            *)
-  (* with seed data written at its start. A retry of a call that already succeeded returns the same volume.          *)
-  (*******************************************************************************************************************)
-  LET volID     == req.volume_id
-      snapID    == req.source_snapshot_id
-      snapVolID == req.source_snapshot_volume_id
-      capacity  == req.capacity_range
-
-      \* Any warranted error may be returned, since the order of checks is not part of the contract.
-      Errors ==
-        LET checks == [invalid_argument       |-> \/ volID = None
-                                                  \/ capacity.required_bytes <= 0
-                                                  \/ /\ capacity.limit_bytes > 0
-                                                     /\ capacity.required_bytes > capacity.limit_bytes
-                                                  \/ req.seed_data > capacity.required_bytes
-                                                  \/ snapID /= None /\ snapVolID = None
-                                                  \* Only checked for a new volume, so a retry outlives the snapshot.
-                                                  \/ /\ ~KeyExists(volumes, volID)
-                                                     /\ KeyExists(snapshots, snapID)
-                                                     /\ \/ capacity.required_bytes < snapshots[snapID].size_bytes
-                                                        \/ snapshots[snapID].source_volume_id /= snapVolID,
-                       \* Seed data is not compared, since it only applies on creation.
-                       already_exists         |-> /\ KeyExists(volumes, volID)
-                                                  /\ \/ volumes[volID].capacity_bytes     /= capacity.required_bytes
-                                                     \/ volumes[volID].availability_zone  /= req.availability_zone
-                                                     \/ volumes[volID].source_snapshot_id /= snapID
-                                                     \/ volumes[volID].parameters         /= req.parameters,
-                       not_found              |-> /\ ~KeyExists(volumes, volID)
-                                                  /\ snapID \notin Optional(DOMAIN snapshots),
-                       unsupported_capability |-> /\ req.seed_data > 0
-                                                  /\ ~Capabilities.volume_seeding]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-           \* A retry returns the existing volume.
-        /\ \/ /\ KeyExists(volumes, volID)
-              /\ UNCHANGED volumes
-
-           \/ /\ ~KeyExists(volumes, volID)
-              \* The handle and provider data are the implementation's choice.
-              /\ \E h \in VolumeHandles \ {volumes[x].handle : x \in DOMAIN volumes},
-                    pd \in Optional(ProviderData) :
-                   volumes' = InsertKey(volumes, volID, [capacity_bytes     |-> capacity.required_bytes,
-                                                         state              |-> "available",
-                                                         handle             |-> h,
-                                                         availability_zone  |-> req.availability_zone,
-                                                         source_snapshot_id |-> snapID,
-                                                         parameters         |-> req.parameters,
-                                                         provider_data      |-> pd])
-        /\ val = VolumeView(volID)'
-        /\ err = None
-        /\ UNCHANGED <<publications, snapshots>>
-
-
-GetVolumeRequests == [volume_id : Optional(VolumeIDs),
-                      handle    : Optional(VolumeHandles)]
-
-GetVolume(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* A volume's current capacity, state and handle are read, and nothing changes.                                    *)
-  (*******************************************************************************************************************)
-  LET volID == req.volume_id
-
-      Errors ==
-        LET checks == [invalid_argument |-> volID = None,
-                       not_found        |-> \/ ~KeyExists(volumes, volID)
-                                            \/ req.handle \notin {None, volumes[volID].handle}]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        /\ val = VolumeView(volID)
-        /\ err = None
-        /\ UNCHANGED vars
-
-
-ListVolumesRequests == [max_results    : -1..(MaxListResults + 1),
-                        starting_token : Optional(ListTokens)]
-
-ListVolumes(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* Some of the volumes are listed, a page at a time, and nothing changes. A call with no starting token that       *)
-  (* returns no next token lists every volume.                                                                       *)
-  (*******************************************************************************************************************)
-  LET Errors ==
-    LET checks == [unsupported_capability |-> ~Capabilities.volume_enumeration]
-    IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        /\ LET refs == {[id |-> id, handle |-> volumes[id].handle] : id \in DOMAIN volumes}
-           \* The page and the next token are the implementation's choice.
-           IN \E page \in SUBSET refs, next \in Optional(ListTokens) :
-                /\ Cardinality(page) <= PageSize(req.max_results)
-                /\ next /= None => Cardinality(page) = PageSize(req.max_results)
-                /\ req.starting_token = None /\ next = None => page = refs
-                /\ val = [volumes |-> page, next_token |-> next]
-        /\ err = None
-        /\ UNCHANGED vars
-
-
-ExpandVolumeRequests == [volume_id      : Optional(VolumeIDs),
-                         handle         : Optional(VolumeHandles),
-                         capacity_range : CapacityRanges]
-
-ExpandVolume(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* A volume grows to the requested capacity, keeping its data. A published volume grows only if the                *)
-  (* implementation supports online expansion, and a request for the current capacity succeeds without change.       *)
-  (*******************************************************************************************************************)
-  LET volID    == req.volume_id
-      capacity == req.capacity_range
-
-      Errors ==
-        LET checks == [invalid_argument |-> \/ volID = None
-                                            \/ capacity.required_bytes = 0
-                                            \/ /\ capacity.limit_bytes > 0
-                                               /\ capacity.required_bytes > capacity.limit_bytes
-                                            \/ /\ KeyExists(volumes, volID)
-                                               /\ capacity.required_bytes < volumes[volID].capacity_bytes,
-                       not_found        |-> \/ ~KeyExists(volumes, volID)
-                                            \/ req.handle \notin {None, volumes[volID].handle},
-                       volume_in_use    |-> /\ PublishedNodes(volID) /= {}
-                                            /\ ~Capabilities.online_expansion
-                                            /\ capacity.required_bytes > volumes[volID].capacity_bytes]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        /\ volumes' = [volumes EXCEPT ![volID].capacity_bytes = capacity.required_bytes]
-        /\ val = VolumeView(volID)'
-        /\ err = None
-        /\ UNCHANGED <<publications, snapshots>>
-
-
-PublishVolumeRequests == [volume_id : Optional(VolumeIDs),
-                          handle    : Optional(VolumeHandles),
-                          node_id   : Optional(NodeIDs),
-                          read_only : BOOLEAN]
-
-PublishVolume(req, val, err) ==
-  (*******************************************************************************************************************)
-  (* A volume's data becomes reachable on a node, through an export that a VM there can attach, either an NBD        *)
-  (* URI or a host block device. Reads and writes through the export reach the volume, and a read-only export        *)
-  (* refuses writes. Only one node at a time may reach a volume.                                                     *)
-  (*******************************************************************************************************************)
-  LET volID  == req.volume_id
-      nodeID == req.node_id
-
-      Errors ==
-        LET checks == [invalid_argument       |-> None \in {volID, nodeID},
-                       not_found              |-> \/ ~KeyExists(volumes, volID)
-                                                  \/ req.handle \notin {None, volumes[volID].handle},
-                       unsupported_capability |-> /\ req.read_only
-                                                  /\ ~Capabilities.read_only_publish,
-                       volume_in_use          |-> PublishedNodes(volID) \ {nodeID} /= {}]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ val = None
-        /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-           \* A retry returns the existing publication.
-        /\ \/ /\ KeyExists(publications, <<volID, nodeID>>)
-              /\ UNCHANGED publications
-
-           \/ /\ ~KeyExists(publications, <<volID, nodeID>>)
-              \* The type of export is the implementation's choice.
-              /\ \E x \in Exports :
-                   publications' = InsertKey(publications, <<volID, nodeID>>, [export    |-> x,
-                                                                               read_only |-> req.read_only])
-        /\ volumes' = [volumes EXCEPT ![volID].state = "in-use"]
-        /\ val = PublicationView(volID, nodeID)'
-        /\ err = None
-        /\ UNCHANGED snapshots
-
-
-UnpublishVolumeRequests == [volume_id : Optional(VolumeIDs),
-                            handle    : Optional(VolumeHandles),
-                            node_id   : Optional(NodeIDs)]
-
-UnpublishVolume(req, err) ==
-  (*******************************************************************************************************************)
-  (* A volume's export on a node is torn down, so that its data is no longer reachable there. Once no node           *)
-  (* can reach the volume, it is available again.                                                                    *)
-  (*******************************************************************************************************************)
-  LET volID  == req.volume_id
-      nodeID == req.node_id
-
-      Errors ==
-        LET checks == [invalid_argument |-> None \in {volID, nodeID}]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        \* Record removal is idempotent so that retries succeed.
-        /\ publications' = RemoveKey(publications, <<volID, nodeID>>)
-        \* The volume is available again once no node holds it.
-        /\ volumes' = IF \/ ~KeyExists(volumes, volID)
-                         \/ PublishedNodes(volID)' /= {}
-                      THEN volumes
-                      ELSE [volumes EXCEPT ![volID].state = "available"]
-        /\ err = None
-        /\ UNCHANGED snapshots
-
-
-DeleteVolumeRequests == [volume_id : Optional(VolumeIDs),
-                         handle    : Optional(VolumeHandles)]
-
-DeleteVolume(req, err) ==
-  (*******************************************************************************************************************)
-  (* A volume is deleted, so that its data is gone. Snapshots taken from it are unaffected.                          *)
-  (*******************************************************************************************************************)
-  LET volID == req.volume_id
-
-      Errors ==
-        LET checks == [invalid_argument |-> volID = None,
-                       volume_in_use    |-> /\ PublishedNodes(volID) /= {}
-                                            /\ req.handle \in {None, volumes[volID].handle}]
-        IN {e \in DOMAIN checks : checks[e]}
-
-     \* The request was rejected, or the provider failed to answer.
-  IN \/ /\ err \in Errors \union ProviderErrors
-        /\ UNCHANGED vars
-
-     \* The request was accepted.
-     \/ /\ Errors = {}
-        \* Record removal is idempotent so that retries succeed.
-        /\ volumes' = IF /\ KeyExists(volumes, volID)
-                         /\ req.handle \notin {None, volumes[volID].handle}
-                      THEN volumes
-                      ELSE RemoveKey(volumes, volID)
-        /\ err = None
-        /\ UNCHANGED <<publications, snapshots>>
-
------------------------------------------------------------------------------------------------------------------------
-\* Specification
-
-=======================================================================================================================

spinifex/agents/ecs/agent/agent.go

@@ -12,9 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
 	ecsv1 "github.com/mulgadc/spinifex/contracts/ecs/v1"
-	"github.com/mulgadc/spinifex/internal/imdscreds"
+	"github.com/mulgadc/spinifex/spinifex/agents/ecs/credentials"
 	ctrruntime "github.com/mulgadc/spinifex/spinifex/agents/ecs/runtime"
 )
 
@@ -103,9 +102,7 @@ func New(cfg Config) (*Agent, error) {
 		AgentVersion: cfg.AgentVersion,
 	}
 
-	// The cache refetches only once the real expiry passes, and a failed
-	// refresh is an error rather than an extended expiry.
-	creds := aws.NewCredentialsCache(imdscreds.NewProvider(imdsClient, cfg.IMDSBase))
+	creds := credentials.NewIMDSProvider(imdsClient, cfg.IMDSBase)
 	resolver := newLazyECRResolver(creds, cfg.Region, cfg.GatewayURL, cfg.GatewayCA)
 
 	// A dial that fails here is not fatal and not final: the node starts the

spinifex/agents/ecs/agent/config.go

@@ -21,14 +21,17 @@ const (
 
 // Config holds the static settings the agent reads at boot. Cluster identity
 // (account ID, instance ID) is discovered at runtime from IMDS, not configured;
-// only the cluster *name* the instance was launched into is static. The agent
-// SigV4-signs gateway calls with instance-role credentials from IMDS and never
-// holds a NATS token.
+// only the cluster *name* the instance was launched into is static. AccessKey /
+// SecretKey are legacy seeded creds, optional now that the agent SigV4-signs
+// gateway calls with instance-role credentials from IMDS; the agent never holds
+// a NATS token.
 type Config struct {
 	GatewayURL       string
 	GatewayCA        string
 	Region           string
 	ClusterName      string
+	AccessKey        string
+	SecretKey        string
 	IMDSBase         string
 	ContainerdSocket string
 	Heartbeat        time.Duration
@@ -50,6 +53,8 @@ func LoadConfig(envFile string) Config {
 		GatewayCA:        get("ECS_GATEWAY_CA"),
 		Region:           get("ECS_REGION"),
 		ClusterName:      get("ECS_CLUSTER"),
+		AccessKey:        get("ECS_ACCESS_KEY"),
+		SecretKey:        get("ECS_SECRET_KEY"),
 		IMDSBase:         get("ECS_IMDS_BASE"),
 		ContainerdSocket: get("ECS_CONTAINERD_SOCKET"),
 	}

spinifex/agents/ecs/agent/config_test.go

@@ -10,7 +10,7 @@ import (
 func TestLoadConfig_Defaults(t *testing.T) {
 	// Ensure env vars don't leak in from the host.
 	for _, k := range []string{"ECS_GATEWAY_URL", "ECS_GATEWAY_CA", "ECS_REGION",
-		"ECS_CLUSTER", "ECS_IMDS_BASE",
+		"ECS_CLUSTER", "ECS_ACCESS_KEY", "ECS_SECRET_KEY", "ECS_IMDS_BASE",
 		"ECS_CONTAINERD_SOCKET", "ECS_HEARTBEAT_INTERVAL", "ECS_POLL_INTERVAL"} {
 		t.Setenv(k, "")
 	}
@@ -43,6 +43,7 @@ func TestLoadConfig_FileThenEnvOverride(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Setenv("ECS_GATEWAY_URL", "https://gw.env")
+	t.Setenv("ECS_ACCESS_KEY", "AKIAENV")
 
 	cfg := LoadConfig(envFile)
 	if cfg.GatewayURL != "https://gw.env" {
@@ -54,6 +55,9 @@ func TestLoadConfig_FileThenEnvOverride(t *testing.T) {
 	if cfg.ClusterName != "prod" {
 		t.Errorf("ClusterName = %q, want from file", cfg.ClusterName)
 	}
+	if cfg.AccessKey != "AKIAENV" {
+		t.Errorf("AccessKey = %q, want env", cfg.AccessKey)
+	}
 }
 
 func TestLoadConfig_HeartbeatOverride(t *testing.T) {

spinifex/agents/ecs/agent/controlplane.go

@@ -1,17 +1,17 @@
 package agent
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"time"
 
-	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ecs"
 
 	ecsv1 "github.com/mulgadc/spinifex/contracts/ecs/v1"
 	"github.com/mulgadc/spinifex/internal/ecsgw"
-	"github.com/mulgadc/spinifex/internal/gwsign"
+	"github.com/mulgadc/spinifex/spinifex/agents/ecs/credentials"
 	ecsdomain "github.com/mulgadc/spinifex/spinifex/domains/ecs"
 )
 
@@ -47,14 +47,26 @@ const pollTimeout = 30 * time.Second
 
 // newGatewayControlPlane builds the SigV4 client signing with the instance-role
 // credentials from IMDS (fetched per call so rotation is transparent) + pinned CA.
-func newGatewayControlPlane(cfg Config, creds awsv2.CredentialsProvider) (*gatewayControlPlane, error) {
-	client, err := ecsgw.New(cfg.GatewayURL, cfg.GatewayCA, gwsign.New(creds), cfg.Region, pollTimeout)
+func newGatewayControlPlane(cfg Config, creds credentials.CredentialsProvider) (*gatewayControlPlane, error) {
+	client, err := ecsgw.New(cfg.GatewayURL, cfg.GatewayCA, credentialsFunc(creds), cfg.Region, pollTimeout)
 	if err != nil {
 		return nil, err
 	}
 	return &gatewayControlPlane{client: client}, nil
 }
 
+// credentialsFunc adapts the agent's IMDS CredentialsProvider to the ecsgw
+// per-call credentials hook.
+func credentialsFunc(p credentials.CredentialsProvider) ecsgw.CredentialsFunc {
+	return func(ctx context.Context) (string, string, string, error) {
+		c, err := p.Retrieve(ctx)
+		if err != nil {
+			return "", "", "", err
+		}
+		return c.AccessKeyID, c.SecretAccessKey, c.SessionToken, nil
+	}
+}
+
 func (g *gatewayControlPlane) Register(id identity) error {
 	in := &ecs.RegisterContainerInstanceInput{
 		Cluster:                  aws.String(id.ClusterName),

spinifex/agents/ecs/agent/controlplane_test.go

@@ -8,17 +8,17 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go/service/ecs"
+	"github.com/mulgadc/spinifex/spinifex/agents/ecs/credentials"
 	ecsdomain "github.com/mulgadc/spinifex/spinifex/domains/ecs"
 )
 
-// fixedCredsProvider is a static aws.CredentialsProvider for tests
+// fixedCredsProvider is a static credentials.CredentialsProvider for tests
 // that only need a valid SigV4 signature, not real IMDS rotation.
 type fixedCredsProvider struct{}
 
-func (fixedCredsProvider) Retrieve(context.Context) (aws.Credentials, error) {
-	return aws.Credentials{AccessKeyID: "AKIATEST", SecretAccessKey: "secret"}, nil
+func (fixedCredsProvider) Retrieve(context.Context) (credentials.Credentials, error) {
+	return credentials.Credentials{AccessKeyID: "AKIATEST", SecretAccessKey: "secret"}, nil
 }
 
 func newTestGatewayControlPlane(t *testing.T, srv *httptest.Server) *gatewayControlPlane {

spinifex/agents/ecs/agent/credendpoint.go

@@ -13,9 +13,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/mulgadc/spinifex/internal/ecrauth"
 	"github.com/mulgadc/spinifex/internal/stsauth"
+	"github.com/mulgadc/spinifex/spinifex/agents/ecs/credentials"
 )
 
 const (
@@ -56,7 +56,7 @@ type credRole struct {
 
 type credEntry struct {
 	roleARN string
-	creds   aws.Credentials
+	creds   stsauth.Credentials
 }
 
 // credEndpoint is the host-netns HTTP server that hands a task its IAM role
@@ -64,7 +64,7 @@ type credEntry struct {
 // mints/caches credentials on demand by assuming the role over the gateway with
 // the agent's instance credentials.
 type credEndpoint struct {
-	provider   aws.CredentialsProvider
+	provider   credentials.CredentialsProvider
 	region     string
 	gatewayURL string
 	caPath     string
@@ -75,7 +75,7 @@ type credEndpoint struct {
 
 	// assume mints fresh credentials for a role; defaults to AssumeRole over the
 	// gateway and is overridable in tests.
-	assume func(ctx context.Context, roleARN, sessionName string) (aws.Credentials, error)
+	assume func(ctx context.Context, roleARN, sessionName string) (stsauth.Credentials, error)
 
 	mu         sync.Mutex
 	roles      map[string]credRole  // credID -> task role
@@ -89,7 +89,7 @@ type credEndpoint struct {
 // newCredEndpoint builds the endpoint. An empty ip/port falls back to the
 // AWS-reserved 169.254.170.2:80; tests pass loopback + an ephemeral port. run
 // adds the link-local address to the dummy interface (real or fake).
-func newCredEndpoint(provider aws.CredentialsProvider, region, gatewayURL, caPath, ip string, port int, run netCmdRunner) *credEndpoint {
+func newCredEndpoint(provider credentials.CredentialsProvider, region, gatewayURL, caPath, ip string, port int, run netCmdRunner) *credEndpoint {
 	if ip == "" {
 		ip = defaultCredEndpointIP
 	}
@@ -165,7 +165,7 @@ func (c *credEndpoint) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		AccessKeyID:     creds.AccessKeyID,
 		SecretAccessKey: creds.SecretAccessKey,
 		Token:           creds.SessionToken,
-		Expiration:      creds.Expires.UTC().Format(time.RFC3339),
+		Expiration:      creds.Expiration.UTC().Format(time.RFC3339),
 	}); err != nil {
 		slog.Warn("ecs-agent: encode credential response", "task", role.taskID, "err", err)
 	}
@@ -176,12 +176,12 @@ var errUnknownCredID = fmt.Errorf("unknown credId")
 
 // fetch returns valid credentials for credID, reusing the cache until within the
 // refresh margin and otherwise assuming the task role over the gateway.
-func (c *credEndpoint) fetch(ctx context.Context, credID string) (aws.Credentials, credRole, error) {
+func (c *credEndpoint) fetch(ctx context.Context, credID string) (stsauth.Credentials, credRole, error) {
 	c.mu.Lock()
 	role, known := c.roles[credID]
 	if !known {
 		c.mu.Unlock()
-		return aws.Credentials{}, credRole{}, errUnknownCredID
+		return stsauth.Credentials{}, credRole{}, errUnknownCredID
 	}
 	if e, ok := c.cache[credID]; ok && e.roleARN == role.roleARN && credValid(e.creds, credRefreshMargin) {
 		c.mu.Unlock()
@@ -191,7 +191,7 @@ func (c *credEndpoint) fetch(ctx context.Context, credID string) (aws.Credential
 
 	creds, err := c.assume(ctx, role.roleARN, sessionName(role.taskID))
 	if err != nil {
-		return aws.Credentials{}, role, err
+		return stsauth.Credentials{}, role, err
 	}
 
 	c.mu.Lock()
@@ -204,7 +204,7 @@ func (c *credEndpoint) fetch(ctx context.Context, credID string) (aws.Credential
 // roleARN over the gateway — the execution-role path for ECR image pulls. It
 // caches the assumed set and re-assumes within the refresh margin. session scopes
 // the STS session name.
-func (c *credEndpoint) AssumeProvider(roleARN, session string) aws.CredentialsProvider {
+func (c *credEndpoint) AssumeProvider(roleARN, session string) credentials.CredentialsProvider {
 	return &assumeProvider{ep: c, roleARN: roleARN, session: session}
 }
 
@@ -216,34 +216,39 @@ type assumeProvider struct {
 	session string
 
 	mu     sync.Mutex
-	cached aws.Credentials
+	cached stsauth.Credentials
 }
 
-var _ aws.CredentialsProvider = (*assumeProvider)(nil)
+var _ credentials.CredentialsProvider = (*assumeProvider)(nil)
 
-func (p *assumeProvider) Retrieve(ctx context.Context) (aws.Credentials, error) {
+func (p *assumeProvider) Retrieve(ctx context.Context) (credentials.Credentials, error) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	if !credValid(p.cached, credRefreshMargin) {
 		creds, err := p.ep.assume(ctx, p.roleARN, p.session)
 		if err != nil {
-			return aws.Credentials{}, err
+			return credentials.Credentials{}, err
 		}
 		p.cached = creds
 	}
-	return p.cached, nil
+	return credentials.Credentials{
+		AccessKeyID:     p.cached.AccessKeyID,
+		SecretAccessKey: p.cached.SecretAccessKey,
+		SessionToken:    p.cached.SessionToken,
+		Expiration:      p.cached.Expiration,
+	}, nil
 }
 
 // assumeOverGateway mints credentials for roleARN by SigV4-signing AssumeRole
 // against the gateway with the agent's instance credentials.
-func (c *credEndpoint) assumeOverGateway(ctx context.Context, roleARN, sessionName string) (aws.Credentials, error) {
+func (c *credEndpoint) assumeOverGateway(ctx context.Context, roleARN, sessionName string) (stsauth.Credentials, error) {
 	instCreds, err := c.provider.Retrieve(ctx)
 	if err != nil {
-		return aws.Credentials{}, fmt.Errorf("instance credentials: %w", err)
+		return stsauth.Credentials{}, fmt.Errorf("instance credentials: %w", err)
 	}
 	client, err := c.client()
 	if err != nil {
-		return aws.Credentials{}, err
+		return stsauth.Credentials{}, err
 	}
 	return stsauth.AssumeRole(c.region, c.gatewayURL, client,
 		instCreds.AccessKeyID, instCreds.SecretAccessKey, instCreds.SessionToken,
@@ -382,14 +387,14 @@ func (c *credEndpoint) delEndpointAddr() {
 }
 
 // credValid reports whether creds are usable now with margin to spare.
-func credValid(c aws.Credentials, margin time.Duration) bool {
+func credValid(c stsauth.Credentials, margin time.Duration) bool {
 	if c.AccessKeyID == "" || c.SecretAccessKey == "" {
 		return false
 	}
-	if c.Expires.IsZero() {
+	if c.Expiration.IsZero() {
 		return true
 	}
-	return time.Now().Add(margin).Before(c.Expires)
+	return time.Now().Add(margin).Before(c.Expiration)
 }
 
 // sessionName derives an AssumeRole RoleSessionName from the task ID, satisfying the

spinifex/agents/ecs/agent/credendpoint_test.go

@@ -9,15 +9,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/mulgadc/spinifex/internal/stsauth"
 )
 
 // newTestCredEndpoint builds an endpoint whose assume seam returns canned creds,
 // counting calls so cache behaviour is observable. run is nil (no iface plumbing).
-func newTestCredEndpoint(creds aws.Credentials) (*credEndpoint, *int32) {
+func newTestCredEndpoint(creds stsauth.Credentials) (*credEndpoint, *int32) {
 	c := newCredEndpoint(nil, "us-east-1", "https://gw", "", "127.0.0.1", 0, nil)
 	var calls int32
-	c.assume = func(ctx context.Context, roleARN, sessionName string) (aws.Credentials, error) {
+	c.assume = func(ctx context.Context, roleARN, sessionName string) (stsauth.Credentials, error) {
 		atomic.AddInt32(&calls, 1)
 		return creds, nil
 	}
@@ -26,8 +26,8 @@ func newTestCredEndpoint(creds aws.Credentials) (*credEndpoint, *int32) {
 
 func TestCredEndpoint_ServesRegisteredCredID(t *testing.T) {
 	exp := time.Now().Add(time.Hour).UTC().Truncate(time.Second)
-	c, _ := newTestCredEndpoint(aws.Credentials{
-		AccessKeyID: "AKIA", SecretAccessKey: "secret", SessionToken: "tok", Expires: exp,
+	c, _ := newTestCredEndpoint(stsauth.Credentials{
+		AccessKeyID: "AKIA", SecretAccessKey: "secret", SessionToken: "tok", Expiration: exp,
 	})
 	c.Register("cred-1", "task-1", "arn:aws:iam::111122223333:role/task")
 
@@ -54,11 +54,11 @@ func TestCredEndpoint_ServesRegisteredCredID(t *testing.T) {
 // The STS session name lands in the assumed-role ARN and in STS logs, so it is
 // built from the public task ID and never from the secret credID.
 func TestCredEndpoint_SessionNameIsTaskIDNotCredID(t *testing.T) {
-	c, _ := newTestCredEndpoint(aws.Credentials{})
+	c, _ := newTestCredEndpoint(stsauth.Credentials{})
 	var gotSession string
-	c.assume = func(ctx context.Context, roleARN, session string) (aws.Credentials, error) {
+	c.assume = func(ctx context.Context, roleARN, session string) (stsauth.Credentials, error) {
 		gotSession = session
-		return aws.Credentials{AccessKeyID: "AKIA", SecretAccessKey: "secret"}, nil
+		return stsauth.Credentials{AccessKeyID: "AKIA", SecretAccessKey: "secret"}, nil
 	}
 	c.Register("secret-cred", "task-1", "arn:role")
 	rr := httptest.NewRecorder()
@@ -72,7 +72,7 @@ func TestCredEndpoint_SessionNameIsTaskIDNotCredID(t *testing.T) {
 }
 
 func TestCredEndpoint_UnknownCredIDIs404(t *testing.T) {
-	c, calls := newTestCredEndpoint(aws.Credentials{AccessKeyID: "x", SecretAccessKey: "y"})
+	c, calls := newTestCredEndpoint(stsauth.Credentials{AccessKeyID: "x", SecretAccessKey: "y"})
 	rr := httptest.NewRecorder()
 	c.ServeHTTP(rr, httptest.NewRequest(http.MethodGet, "/v2/credentials/nope", nil))
 	if rr.Code != http.StatusNotFound {
@@ -84,7 +84,7 @@ func TestCredEndpoint_UnknownCredIDIs404(t *testing.T) {
 }
 
 func TestCredEndpoint_WrongMethodIs405(t *testing.T) {
-	c, _ := newTestCredEndpoint(aws.Credentials{AccessKeyID: "x", SecretAccessKey: "y"})
+	c, _ := newTestCredEndpoint(stsauth.Credentials{AccessKeyID: "x", SecretAccessKey: "y"})
 	c.Register("cred-1", "task-1", "arn:role")
 	rr := httptest.NewRecorder()
 	c.ServeHTTP(rr, httptest.NewRequest(http.MethodPost, "/v2/credentials/cred-1", nil))
@@ -94,8 +94,8 @@ func TestCredEndpoint_WrongMethodIs405(t *testing.T) {
 }
 
 func TestCredEndpoint_CachesUntilExpiry(t *testing.T) {
-	c, calls := newTestCredEndpoint(aws.Credentials{
-		AccessKeyID: "AKIA", SecretAccessKey: "secret", Expires: time.Now().Add(time.Hour),
+	c, calls := newTestCredEndpoint(stsauth.Credentials{
+		AccessKeyID: "AKIA", SecretAccessKey: "secret", Expiration: time.Now().Add(time.Hour),
 	})
 	c.Register("cred-1", "task-1", "arn:role")
 	for hit := range 3 {
@@ -112,8 +112,8 @@ func TestCredEndpoint_CachesUntilExpiry(t *testing.T) {
 
 func TestCredEndpoint_RefreshesNearExpiry(t *testing.T) {
 	// Expiry inside the refresh margin -> every hit re-assumes.
-	c, calls := newTestCredEndpoint(aws.Credentials{
-		AccessKeyID: "AKIA", SecretAccessKey: "secret", Expires: time.Now().Add(time.Minute),
+	c, calls := newTestCredEndpoint(stsauth.Credentials{
+		AccessKeyID: "AKIA", SecretAccessKey: "secret", Expiration: time.Now().Add(time.Minute),
 	})
 	c.Register("cred-1", "task-1", "arn:role")
 	for range 2 {
@@ -126,7 +126,7 @@ func TestCredEndpoint_RefreshesNearExpiry(t *testing.T) {
 }
 
 func TestCredEndpoint_DeregisterDropsCredID(t *testing.T) {
-	c, _ := newTestCredEndpoint(aws.Credentials{AccessKeyID: "x", SecretAccessKey: "y"})
+	c, _ := newTestCredEndpoint(stsauth.Credentials{AccessKeyID: "x", SecretAccessKey: "y"})
 	c.Register("cred-1", "task-1", "arn:role")
 	c.Deregister("cred-1")
 	rr := httptest.NewRecorder()
@@ -137,9 +137,9 @@ func TestCredEndpoint_DeregisterDropsCredID(t *testing.T) {
 }
 
 func TestCredEndpoint_AssumeFailureIs502(t *testing.T) {
-	c, _ := newTestCredEndpoint(aws.Credentials{})
-	c.assume = func(ctx context.Context, roleARN, sessionName string) (aws.Credentials, error) {
-		return aws.Credentials{}, context.DeadlineExceeded
+	c, _ := newTestCredEndpoint(stsauth.Credentials{})
+	c.assume = func(ctx context.Context, roleARN, sessionName string) (stsauth.Credentials, error) {
+		return stsauth.Credentials{}, context.DeadlineExceeded
 	}
 	c.Register("cred-1", "task-1", "arn:role")
 	rr := httptest.NewRecorder()
@@ -150,8 +150,8 @@ func TestCredEndpoint_AssumeFailureIs502(t *testing.T) {
 }
 
 func TestCredEndpoint_StartServesOverLoopback(t *testing.T) {
-	c, _ := newTestCredEndpoint(aws.Credentials{
-		AccessKeyID: "AKIA", SecretAccessKey: "secret", Expires: time.Now().Add(time.Hour),
+	c, _ := newTestCredEndpoint(stsauth.Credentials{
+		AccessKeyID: "AKIA", SecretAccessKey: "secret", Expiration: time.Now().Add(time.Hour),
 	})
 	c.Register("cred-1", "task-1", "arn:role")
 	c.port = 0 // bind an ephemeral port instead of privileged 80

spinifex/agents/ecs/agent/credinject_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/mulgadc/spinifex/internal/stsauth"
 
 	ecsv1 "github.com/mulgadc/spinifex/contracts/ecs/v1"
 )
@@ -30,7 +30,7 @@ func TestTaskCredID(t *testing.T) {
 // The task ID is public (it is the task ARN suffix), so naming another task's ID
 // at the credential endpoint must not yield that task's role.
 func TestRegisterTaskCreds_TaskIDDoesNotServeCredentials(t *testing.T) {
-	c, _ := newTestCredEndpoint(aws.Credentials{AccessKeyID: "AKIA", SecretAccessKey: "secret"})
+	c, _ := newTestCredEndpoint(stsauth.Credentials{AccessKeyID: "AKIA", SecretAccessKey: "secret"})
 	a := Agent{cred: c}
 	get := func(id string) int {
 		rr := httptest.NewRecorder()

spinifex/agents/ecs/agent/doc.go

@@ -5,7 +5,8 @@
 // task assignments, runs them through containerd, and reports state back over
 // the gateway.
 //
-// Static config (gateway URL, CA, region, cluster, containerd socket) is read from the cloud-init env file /etc/spinifex-ecs/agent.env
+// Static config (gateway URL, CA, region, cluster, seeded IAM creds, containerd
+// socket) is read from the cloud-init env file /etc/spinifex-ecs/agent.env
 // (KEY=value); real env vars override it. Host identity (account, instance, AZ)
 // comes from IMDS at boot.
 package agent

spinifex/agents/ecs/agent/ecrresolver.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/mulgadc/spinifex/internal/ecrauth"
+	"github.com/mulgadc/spinifex/spinifex/agents/ecs/credentials"
 	"github.com/mulgadc/spinifex/spinifex/agents/ecs/runtime"
 )
 
@@ -22,7 +22,7 @@ import (
 // pulled, so the agent can still register + heartbeat on a host with absent or
 // wrong ECR config.
 type ecrResolver struct {
-	creds      aws.CredentialsProvider
+	creds      credentials.CredentialsProvider
 	region     string
 	gatewayURL string
 	caPath     string
@@ -35,13 +35,13 @@ var _ runtime.Resolver = (*ecrResolver)(nil)
 
 // newECRResolver builds a resolver with an injected HTTP client (tests). The
 // client is used as-is and never rebuilt from caPath.
-func newECRResolver(creds aws.CredentialsProvider, region, gatewayURL string, httpClient *http.Client) *ecrResolver {
+func newECRResolver(creds credentials.CredentialsProvider, region, gatewayURL string, httpClient *http.Client) *ecrResolver {
 	return &ecrResolver{creds: creds, region: region, gatewayURL: gatewayURL, httpClient: httpClient}
 }
 
 // newLazyECRResolver builds a resolver that constructs its gateway HTTP client
 // from caPath on first use (production path).
-func newLazyECRResolver(creds aws.CredentialsProvider, region, gatewayURL, caPath string) *ecrResolver {
+func newLazyECRResolver(creds credentials.CredentialsProvider, region, gatewayURL, caPath string) *ecrResolver {
 	return &ecrResolver{creds: creds, region: region, gatewayURL: gatewayURL, caPath: caPath}
 }
 

spinifex/agents/ecs/agent/ecrresolver_test.go

@@ -14,16 +14,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/mulgadc/spinifex/spinifex/agents/ecs/credentials"
 )
 
-// stubCreds is a aws.CredentialsProvider returning fixed creds or error.
+// stubCreds is a credentials.CredentialsProvider returning fixed creds or error.
 type stubCreds struct {
-	c   aws.Credentials
+	c   credentials.Credentials
 	err error
 }
 
-func (s stubCreds) Retrieve(context.Context) (aws.Credentials, error) {
+func (s stubCreds) Retrieve(context.Context) (credentials.Credentials, error) {
 	return s.c, s.err
 }
 
@@ -58,9 +58,9 @@ func trusting(srv *httptest.Server) *http.Client {
 
 func TestECRResolver_Authorize(t *testing.T) {
 	srv := gatewayStub(t, "AWS:jwt", "https://123456789012.dkr.ecr.us-east-1.spinifex.internal", http.StatusOK)
-	creds := stubCreds{c: aws.Credentials{
+	creds := stubCreds{c: credentials.Credentials{
 		AccessKeyID: "AKIA", SecretAccessKey: "secret", SessionToken: "sess",
-		Expires: time.Now().Add(time.Hour),
+		Expiration: time.Now().Add(time.Hour),
 	}}
 	r := newECRResolver(creds, "us-east-1", srv.URL, trusting(srv))
 
@@ -85,7 +85,7 @@ func TestECRResolver_CredsError(t *testing.T) {
 
 func TestECRResolver_GatewayError(t *testing.T) {
 	srv := gatewayStub(t, "", "", http.StatusInternalServerError)
-	creds := stubCreds{c: aws.Credentials{AccessKeyID: "A", SecretAccessKey: "B"}}
+	creds := stubCreds{c: credentials.Credentials{AccessKeyID: "A", SecretAccessKey: "B"}}
 	r := newECRResolver(creds, "us-east-1", srv.URL, trusting(srv))
 	if _, _, _, err := r.Authorize(context.Background(), "123456789012.dkr.ecr.us-east-1.spinifex.internal/app:1"); err == nil {
 		t.Fatal("expected gateway error")
@@ -93,7 +93,7 @@ func TestECRResolver_GatewayError(t *testing.T) {
 }
 
 func TestECRResolver_LazyClient_BadCADeferredToAuthorize(t *testing.T) {
-	creds := stubCreds{c: aws.Credentials{AccessKeyID: "A", SecretAccessKey: "B"}}
+	creds := stubCreds{c: credentials.Credentials{AccessKeyID: "A", SecretAccessKey: "B"}}
 	// Construction with a bogus CA path must not fail — only Authorize does.
 	r := newLazyECRResolver(creds, "us-east-1", "https://gw", filepath.Join(t.TempDir(), "absent.pem"))
 	if _, _, _, err := r.Authorize(context.Background(), "123456789012.dkr.ecr.us-east-1.spinifex.internal/app:1"); err == nil {
@@ -141,9 +141,9 @@ func TestIsECRRef(t *testing.T) {
 // registry, even though it lacks a ".dkr.ecr." name.
 func TestECRResolver_Authorize_BareHostGateway(t *testing.T) {
 	srv := gatewayStub(t, "AWS:jwt", "https://192.168.1.13:9999", http.StatusOK)
-	creds := stubCreds{c: aws.Credentials{
+	creds := stubCreds{c: credentials.Credentials{
 		AccessKeyID: "AKIA", SecretAccessKey: "secret", SessionToken: "sess",
-		Expires: time.Now().Add(time.Hour),
+		Expiration: time.Now().Add(time.Hour),
 	}}
 	r := newECRResolver(creds, "us-east-1", srv.URL, trusting(srv))