fix(rds): repeat the guarded detach when a stopped terminate left the data volume attached

.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/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.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-# Warn when a PR body has no filled "Mulga design" line. Reads PR_BODY and
-# never fails the job: the check is a prompt, not a gate.
-set -euo pipefail
-shopt -s nocasematch
-
-section_re='^#{1,6}[[:space:]]*Mulga design[[:space:]]*$'
-line_re='^[[:space:]]*(Updated|Not needed)[[:space:]]*:[[:space:]]*(.*)$'
-placeholder_re='<[^<>]*>'
-
-filled() {
-  local body=$1 line value kept inside=0 pre rest
-  body=${body//$'\r'/}
-  while [[ $body == *'<!--'*'-->'* ]]; do
-    pre=${body%%'<!--'*}
-    rest=${body#*'<!--'}
-    body=$pre${rest#*'-->'}
-  done
-  while IFS= read -r line; do
-    if [[ $line =~ $section_re ]]; then
-      inside=1
-    elif ((inside)) && [[ ${line#"${line%%[![:space:]]*}"} == '#'* ]]; then
-      return 1
-    elif ((inside)) && [[ $line =~ $line_re ]]; then
-      value=${BASH_REMATCH[2]} kept=''
-      while [[ $value =~ $placeholder_re ]]; do
-        kept+=${value%%"${BASH_REMATCH[0]}"*}
-        value=${value#*"${BASH_REMATCH[0]}"}
-      done
-      [[ $kept$value == *[![:space:]]* ]] && return 0
-    fi
-  done <<<"$body"
-  return 1
-}
-
-if filled "${PR_BODY:-}"; then
-  echo "The Mulga design line is filled in."
-else
-  echo '::warning title=Mulga design::Add a "## Mulga design" section with one line: "Updated: <mulga PR>" or "Not needed: <reason>".'
-fi

.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/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/e2e-nightly.yml

@@ -1017,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
@@ -1275,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
@@ -1423,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
@@ -1547,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/mulga-design.yml

@@ -2,8 +2,7 @@ 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. Fork PRs are skipped because their
-# authors cannot see the design records.
+# failing: the check is a prompt, not a gate.
 
 on:
   pull_request:
@@ -17,7 +16,7 @@ permissions:
 jobs:
   mulga_design:
     name: Mulga design line
-    if: ${{ !endsWith(github.actor, '[bot]') && github.event.pull_request.head.repo.full_name == github.repository }}
+    if: ${{ !endsWith(github.actor, '[bot]') }}
     runs-on: ubuntu-26.04
     steps:
       - name: Checkout Code
@@ -29,4 +28,6 @@ jobs:
         env:
           PR_BODY: ${{ github.event.pull_request.body }}
         working-directory: .github/scripts
-        run: bash mulga-design-check.sh
+        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

@@ -36,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
@@ -166,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
@@ -268,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

.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,25 +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 .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); \
+	@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
-	$(_Q)shellcheck -S warning .github/scripts/hypervisor-disk-preflight.sh \
-		.github/scripts/wait-for-memory.sh \
-		.github/scripts/mulga-design-check.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
@@ -376,10 +327,7 @@ test-cover:
 test-race:
 	@echo -e "\n....Running tests with race detector for $(GO_PROJECT_NAME)...."
 	$(_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/ ./spinifex/runtime/compute/lambda/testlink/ ./spinifex/domains/network/host/ $(_RACEQ)
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -race -tags=lambdatestlink -timeout 120s -run '^TestLambdaTestLink(Executor|Reply)_' ./spinifex/runtime/roles/awsgw/ $(_RACEQ)
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -race -tags=lambdatestlink,lambdatestlinkseam -timeout 120s -run '^TestLambdaTestLinkSeam_' ./spinifex/runtime/roles/awsgw/ $(_RACEQ)
-	$(_Q)LOG_IGNORE=1 go test $(GOTESTFLAGS) -race -tags=lambdatestlink -timeout 120s -run '^TestLambdaTestLink' ./spinifex/runtime/daemon/ $(_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.
@@ -590,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 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,6 +5,7 @@ package main
 import (
 	"context"
 	"errors"
+	"flag"
 	"fmt"
 	"log/slog"
 	"net"
@@ -23,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 {
@@ -51,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)
 
@@ -74,10 +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
-	}
 	if err := t.pkg.install(spec); err != nil {
 		return exitRefused, fmt.Errorf("install package: %w", err)
 	}
@@ -95,7 +93,7 @@ func (t testlink) run(parent context.Context) (int, error) {
 	defer cancel(nil)
 	cmd, err := t.startBootstrap(ctx, []string{
 		"AWS_LAMBDA_RUNTIME_API=" + ln.Addr().String(),
-		"_HANDLER=" + spec.handler,
+		"_HANDLER=" + *handler,
 		"LAMBDA_TASK_ROOT=" + taskRoot,
 		"PATH=/bin:/sbin:/usr/bin",
 	})

cmd/lambda-agent/start_testlink_test.go

@@ -25,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)
@@ -50,19 +44,11 @@ func TestHelperBootstrap(t *testing.T) {
 	_, _ = http.Get(base + "next")
 }
 
-// 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
 }
 
 // testlink builds a guest whose fw_cfg also carries a controlled package,
@@ -75,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{
@@ -98,7 +77,7 @@ func (b *bootstrapStarts) testlink(t *testing.T, entries map[string][]byte) test
 			b.n++
 			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()
 		},
 	}
@@ -153,9 +132,6 @@ 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"))
 }
@@ -242,8 +218,7 @@ func TestTestlinkBadPackageNeverStartsBootstrap(t *testing.T) {
 
 	conn := h.guest(t)
 	defer conn.Close()
-	require.NoError(t, hostlink.NewTestStream(conn).HostSend(hostlink.Request{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")
@@ -269,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{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,221 +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)
-	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/ec2/v1/README.md

@@ -37,13 +37,6 @@ contract or an approved compatibility plan; it is not a package refactor.
 Only the subject is owned here today.
 The request (`account_id`) and reply (`vpc_id`, `error`) bodies are still declared as anonymous structs on each side; moving them into this package is a contract change that needs its own characterization first.
 
-## Volume held elsewhere
-
-A start refused because another node holds one of the instance's volumes is an `IncorrectState` error payload on the `ec2.start`, `ec2.start.<node>` and `ec2.cmd.<instance-id>` replies, and the AWS body cannot say why.
-The owning node adds the `X-Volume-Held-Elsewhere: true` header to that reply, the `ec2.start` forwarder relays it, and `StartInstances` wraps `ErrVolumeHeldElsewhere` around the error it rebuilds, so a caller matches it with `errors.Is` rather than reading the message.
-The owning node sets the header only from the EBS provider's `volume_held_elsewhere` code, which every provider returns for this refusal; no reader matches the message text.
-`VolumeHeldElsewhereText` is the wording viperblockd puts in that refusal's message, not a signal.
-
 ## Platform inventory
 
 `PlatformInventorySubject` (`ec2.v1.PlatformInventory`) is a request/reply route on which a daemon in the `spinifex-workers` queue group reports one account's key pairs, placement groups, launch templates and their `ec2-tags` entries from the EC2 owner stores.

contracts/ec2/v1/volume_held.go

@@ -1,13 +1,7 @@
 package ec2v1
 
-import "errors"
-
-// VolumeHeldElsewhereText is the message viperblockd gives a lease refusal. It
-// is wording for the operator; callers classify the refusal by its code.
+// VolumeHeldElsewhereText is the text of a start refused because another node
+// holds one of the instance's volumes. It crosses NATS as message text, so
+// readers match on it; the provider that refuses and every reader share this
+// string so they cannot drift.
 const VolumeHeldElsewhereText = "volume is leased by another owner"
-
-// ErrVolumeHeldElsewhere marks a start refused because another node still
-// holds one of the instance's volumes. The owning node sets it from the EBS
-// provider's held-elsewhere code, and a start reply carries it across NATS as
-// the X-Volume-Held-Elsewhere header rather than as message text.
-var ErrVolumeHeldElsewhere = errors.New("a volume is leased by another node")

docs/COMMANDS.md

@@ -95,7 +95,7 @@ Operational commands for inspecting cluster state. These fan out NATS requests t
 
 | Command | Flags | Description |
 |---------|-------|-------------|
-| `spx admin init` | `--nodes`, `--node`, `--bind`, `--advertise` (external IP off-host clients dial; auto-detected from the default route), `--port`, `--region`, `--az`, `--cluster-name`, `--cluster-bind`, `--cluster-routes`, `--predastore-nodes`, `--predastore-compaction-interval` (seconds; test clusters set a short one), `--services`, `--formation-timeout`, `--token-ttl`, `--force`, `--discard-jetstream` (with `--nodes` >= 2, remove this node's existing JetStream streams once every node has joined; without it a multi-node init over a store that holds streams is refused, and it never proceeds while NATS is running), `--skip-host-dns`, `--email` (operator address for update and security notices), `--no-telemetry`, `--gpu-passthrough`, `--ipsec` (default true; encrypt intra-AZ Geneve via OVN native IPsec cluster-wide — disable only for a trusted single-rack lab; on a host whose IPsec stack is libreswan it defaults to false and `--ipsec=true` is refused), `--external-mode` (`pool` \| `nat` routed NAT for non-bridgeable uplinks, single-node; pair with `setup-ovn.sh --nat-uplink`; note: system instances (ECS/EKS/load-balancer agents) are unsupported in nat v1 — they require `pool` mode), `--external-iface` (WAN NIC for br-external, auto-detected), `--external-source` (`dhcp` \| `static`), `--external-pool` (`start-end`), `--external-prefix-len` (default 24), `--external-gateway` (auto-detected), `--external-dns` (comma-separated IPv4 addresses, at most 3; the DNS servers written to the external pool's `dns_servers` and handed to guests, verbatim; when omitted they are detected from the host resolver at init time, so set it to give every node of a cluster the same value), `--external-bind-bridge` (default `br-wan` when `--external-source=dhcp`), `--gateway-ip` (OVN gateway router's external IP for SNAT; defaults to the pool's range start, required for `nat` mode without DHCP) | Generates root IAM credentials (AKIA-prefixed access key + secret) → creates master.key (AES-256, 32 bytes, 0600) → writes bootstrap.json (consumed on first start) → generates CA + server TLS certificates → generates join token (written to `join-token` file, displayed in join command) → creates NATS config with auth token → writes spinifex.toml, awsgw.toml, predastore.toml → configures AWS CLI `spx` profile → creates directory structure under `~/spinifex/` → points the host resolver at this node's local northstar so the Spinifex zones (ELB/EKS names) resolve from the node itself (opt out with `--skip-host-dns`). `--force` on an already-initialized node is idempotent for crypto: it preserves the existing keys (master.key, predastore/viperblock encryption keys), system + admin credentials, and CA, and refreshes only the config files and the CA-signed server certificate (so a changed bind IP / SANs is picked up without breaking already-joined nodes or CA-baked AMIs). A genuine clean slate requires removing the data dirs first. |
+| `spx admin init` | `--nodes`, `--node`, `--bind`, `--advertise` (external IP off-host clients dial; auto-detected from the default route), `--port`, `--region`, `--az`, `--cluster-name`, `--cluster-bind`, `--cluster-routes`, `--predastore-nodes`, `--predastore-compaction-interval` (seconds; test clusters set a short one), `--services`, `--formation-timeout`, `--token-ttl`, `--force`, `--discard-jetstream` (with `--nodes` >= 2, remove this node's existing JetStream streams once every node has joined; without it a multi-node init over a store that holds streams is refused, and it never proceeds while NATS is running), `--skip-host-dns`, `--email` (operator address for update and security notices), `--no-telemetry`, `--gpu-passthrough`, `--ipsec` (default true; encrypt intra-AZ Geneve via OVN native IPsec cluster-wide — disable only for a trusted single-rack lab; on a host whose IPsec stack is libreswan it defaults to false and `--ipsec=true` is refused), `--host` (leader to join; falls back to multicast discovery), `--external-mode` (`pool` \| `nat` routed NAT for non-bridgeable uplinks, single-node; pair with `setup-ovn.sh --nat-uplink`; note: system instances (ECS/EKS/load-balancer agents) are unsupported in nat v1 — they require `pool` mode), `--external-iface` (WAN NIC for br-external, auto-detected), `--external-source` (`dhcp` \| `static`), `--external-pool` (`start-end`), `--external-prefix-len` (default 24), `--external-gateway` (auto-detected), `--external-dns` (comma-separated IPv4 addresses, at most 3; the DNS servers written to the external pool's `dns_servers` and handed to guests, verbatim; when omitted they are detected from the host resolver at init time, so set it to give every node of a cluster the same value), `--external-bind-bridge` (default `br-wan` when `--external-source=dhcp`), `--gateway-ip` (OVN gateway router's external IP for SNAT; defaults to the pool's range start, required for `nat` mode without DHCP) | Generates root IAM credentials (AKIA-prefixed access key + secret) → creates master.key (AES-256, 32 bytes, 0600) → writes bootstrap.json (consumed on first start) → generates CA + server TLS certificates → generates join token (written to `join-token` file, displayed in join command) → creates NATS config with auth token → writes spinifex.toml, awsgw.toml, predastore.toml → configures AWS CLI `spx` profile → creates directory structure under `~/spinifex/` → points the host resolver at this node's local northstar so the Spinifex zones (ELB/EKS names) resolve from the node itself (opt out with `--skip-host-dns`). `--force` on an already-initialized node is idempotent for crypto: it preserves the existing keys (master.key, predastore/viperblock encryption keys), system + admin credentials, and CA, and refreshes only the config files and the CA-signed server certificate (so a changed bind IP / SANs is picked up without breaking already-joined nodes or CA-baked AMIs). A genuine clean slate requires removing the data dirs first. |
 | `spx admin join` | `--host` (required), `--node` (required), `--token` (required), `--bind`, `--advertise` (defaults to `--bind`, or the auto-detected WAN IP when `--bind` is 0.0.0.0), `--port`, `--region`, `--az`, `--cluster-bind`, `--cluster-routes`, `--data-dir`, `--services`, `--skip-host-dns`, `--email`, `--no-telemetry`, `--predastore-compaction-interval`, `--join-timeout` (how long to keep retrying while the formation server is unreachable, default 20m), `--force` (join even though this node is already initialized or holds JetStream streams, **discarding its own CA, master key and JetStream store**; the store is removed only after formation succeeds, and the join is refused while NATS is running even with `--force`) | Connects to leader node with join token (Authorization: Bearer header) → retrieves cluster configuration → configures local node to join cluster and participate in distributed operations → points the host resolver at this node's local northstar so the Spinifex zones resolve from the node itself (opt out with `--skip-host-dns`) |
 
 ### Version
@@ -135,7 +135,7 @@ 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 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. |
 | `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. |
 

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/model.go

@@ -92,7 +92,6 @@ type Shape struct {
 	Min             *float64
 	Max             *float64
 	Pattern         string
-	Documentation   string
 	LocationName    string
 	TimestampFormat string
 	XMLNamespace    XMLNamespace

internal/awsmodel/smithy.go

@@ -443,9 +443,6 @@ func (t *smithyTranslator) applyShapeTraits(shape *Shape, traits smithyTraits) e
 	if shape.Pattern, err = traits.string("smithy.api#pattern"); err != nil {
 		return err
 	}
-	if shape.Documentation, err = traits.string("smithy.api#documentation"); err != nil {
-		return err
-	}
 	if shape.LocationName, err = traits.string("smithy.api#xmlName"); err != nil {
 		return err
 	}

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,8 @@ 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/mulgadc/spinifex/internal/imdscreds"
+	"github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 )
 
 // Signer holds a credential provider and signs requests in place.
@@ -23,12 +24,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, "")}
@@ -51,14 +46,12 @@ func NewIMDS(ctx context.Context, region string) (*Signer, error) {
 
 // NewInstanceRole returns a Signer whose credentials come only from the
 // instance metadata service: no environment, profile or static-key fallback.
-// A failed refresh of expired credentials is an error, not the stale key.
 func NewInstanceRole() *Signer {
-	return newInstanceRole("")
+	return newInstanceRole(imds.New(imds.Options{}))
 }
 
-// newInstanceRole reads from the IMDS root base; "" means the default endpoint.
-func newInstanceRole(base string) *Signer {
-	return &Signer{provider: aws.NewCredentialsCache(imdscreds.NewProvider(nil, base))}
+func newInstanceRole(client *imds.Client) *Signer {
+	return &Signer{provider: aws.NewCredentialsCache(ec2rolecreds.New(func(o *ec2rolecreds.Options) { o.Client = client }))}
 }
 
 // EnsureCredentials retrieves once from the provider, surfacing the error so a

internal/gwsign/signer_test.go

@@ -12,6 +12,7 @@ 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"
 )
 
@@ -144,7 +145,7 @@ func TestNewInstanceRole_UsesOnlyIMDS(t *testing.T) {
 	}))
 	t.Cleanup(srv.Close)
 
-	s := newInstanceRole(srv.URL)
+	s := newInstanceRole(imds.New(imds.Options{Endpoint: srv.URL}))
 	req := httptest.NewRequest(http.MethodPost, "https://gw.example/", nil)
 	if err := s.Sign(req, emptySHA, testService, testRegion); err != nil {
 		t.Fatal(err)
@@ -154,42 +155,10 @@ func TestNewInstanceRole_UsesOnlyIMDS(t *testing.T) {
 	}
 
 	srv.Close()
-	cold := newInstanceRole(srv.URL)
+	cold := newInstanceRole(imds.New(imds.Options{Endpoint: srv.URL}))
 	if err := cold.EnsureCredentials(context.Background()); err == nil {
 		t.Fatal("environment keys were used when IMDS was unreachable")
 	}
 }
 
-// Once the cached instance-role key has expired, a refresh that cannot reach
-// 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 := 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)
-	}
-
-	srv.Close()
-	req := httptest.NewRequest(http.MethodPost, "https://gw.example/", nil)
-	err := s.Sign(req, emptySHA, testService, testRegion)
-	if err == nil {
-		t.Fatalf("Sign after failed refresh = nil, signed with %q", req.Header.Get("Authorization"))
-	}
-	if auth := req.Header.Get("Authorization"); auth != "" {
-		t.Fatalf("request carries Authorization %q after a failed refresh", auth)
-	}
-}
-
 const emptySHA = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"

internal/imdscreds/imdscreds.go

@@ -21,18 +21,31 @@ 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

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

@@ -167,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/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/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/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

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))
 

spinifex/agents/ecs/credentials/imds.go

@@ -0,0 +1,41 @@
+package credentials
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/mulgadc/spinifex/internal/imdscreds"
+)
+
+// IMDSProvider fetches instance-role credentials from IMDS via the AWS SDK's
+// EC2 IMDS client and ec2rolecreds provider, cached with aws.CredentialsCache,
+// which refetches once the real expiry passes. A failed refresh is an error
+// here, not an extended expiry. Safe for concurrent use.
+type IMDSProvider struct {
+	cache *aws.CredentialsCache
+}
+
+var _ CredentialsProvider = (*IMDSProvider)(nil)
+
+// NewIMDSProvider builds a provider against the given IMDS base URL (e.g.
+// "http://169.254.169.254/latest"). A nil client uses the SDK IMDS client's
+// default HTTP client.
+func NewIMDSProvider(client *http.Client, base string) *IMDSProvider {
+	provider := imdscreds.NewProvider(client, base)
+	return &IMDSProvider{cache: aws.NewCredentialsCache(provider)}
+}
+
+// Retrieve returns cached credentials when still valid, else fetches fresh ones.
+func (p *IMDSProvider) Retrieve(ctx context.Context) (Credentials, error) {
+	creds, err := p.cache.Retrieve(ctx)
+	if err != nil {
+		return Credentials{}, err
+	}
+	return Credentials{
+		AccessKeyID:     creds.AccessKeyID,
+		SecretAccessKey: creds.SecretAccessKey,
+		SessionToken:    creds.SessionToken,
+		Expiration:      creds.Expires,
+	}, nil
+}

spinifex/agents/ecs/credentials/imds_test.go

@@ -0,0 +1,164 @@
+package credentials
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"sync/atomic"
+	"testing"
+	"time"
+)
+
+// imdsStub serves the IMDSv2 token + role + credentials endpoints under the
+// real /latest prefix the SDK IMDS client always requests.
+func imdsStub(t *testing.T, hits *int32, creds map[string]string) *httptest.Server {
+	t.Helper()
+	mux := http.NewServeMux()
+	mux.HandleFunc("/latest/api/token", func(w http.ResponseWriter, r *http.Request) {
+		// Real IMDS echoes the requested TTL back as a response header; the SDK
+		// client parses it from there, not the body.
+		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 != nil {
+			atomic.AddInt32(hits, 1)
+		}
+		_ = json.NewEncoder(w).Encode(creds)
+	})
+	srv := httptest.NewServer(mux)
+	t.Cleanup(srv.Close)
+	return srv
+}
+
+func TestRetrieve_FetchesAndCaches(t *testing.T) {
+	var hits int32
+	// Kept under an hour: ec2rolecreds caps Expires to now+1h.
+	exp := time.Now().Add(30 * time.Minute).UTC().Round(time.Second)
+	srv := imdsStub(t, &hits, map[string]string{
+		"Code":            "Success",
+		"AccessKeyId":     "AKIA",
+		"SecretAccessKey": "secret",
+		"Token":           "session",
+		"Expiration":      exp.Format(time.RFC3339),
+	})
+
+	p := NewIMDSProvider(srv.Client(), srv.URL+"/latest")
+	got, err := p.Retrieve(context.Background())
+	if err != nil {
+		t.Fatalf("Retrieve: %v", err)
+	}
+	if got.AccessKeyID != "AKIA" || !got.Expiration.Equal(exp) {
+		t.Errorf("creds mismatch: %+v", got)
+	}
+
+	// Second call well within validity must not re-hit IMDS.
+	if _, err := p.Retrieve(context.Background()); err != nil {
+		t.Fatalf("Retrieve 2: %v", err)
+	}
+	if hits != 1 {
+		t.Errorf("IMDS credential hits = %d, want 1 (cached)", hits)
+	}
+}
+
+func TestRetrieve_RefetchesWhenExpired(t *testing.T) {
+	var hits int32
+	// Already expired: aws.CredentialsCache refetches once the stored
+	// credentials' real expiry has passed, regardless of ExpiryWindow.
+	srv := imdsStub(t, &hits, map[string]string{
+		"Code":            "Success",
+		"AccessKeyId":     "AKIA",
+		"SecretAccessKey": "secret",
+		"Expiration":      time.Now().Add(-time.Minute).UTC().Format(time.RFC3339),
+	})
+	p := NewIMDSProvider(srv.Client(), srv.URL+"/latest")
+	if _, err := p.Retrieve(context.Background()); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := p.Retrieve(context.Background()); err != nil {
+		t.Fatal(err)
+	}
+	if hits != 2 {
+		t.Errorf("hits = %d, want 2 (expired refetch)", hits)
+	}
+}
+
+// imdsStubFailAfterFirst serves creds on the first credential request and 500s
+// on every one after it, so a test can drive a refresh that fails against a
+// credential the cache has already stored.
+func imdsStubFailAfterFirst(t *testing.T, creds map[string]string) *httptest.Server {
+	t.Helper()
+	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(creds)
+	})
+	srv := httptest.NewServer(mux)
+	t.Cleanup(srv.Close)
+	return srv
+}
+
+// A refresh that fails must surface as an error. Left to itself the SDK's
+// ec2rolecreds implements HandleFailToRefresh, which hands back the same dead
+// key with Expires pushed 5-15 minutes out, so the agent would sign requests
+// with a credential the control plane has already rejected — indefinitely,
+// since every subsequent refresh fails the same way.
+func TestRetrieve_FailedRefreshDoesNotExtendExpiry(t *testing.T) {
+	srv := imdsStubFailAfterFirst(t, map[string]string{
+		"Code":            "Success",
+		"AccessKeyId":     "AKIA",
+		"SecretAccessKey": "secret",
+		"Token":           "session",
+		// Already expired, so the next Retrieve must go back to IMDS.
+		"Expiration": time.Now().Add(-time.Minute).UTC().Format(time.RFC3339),
+	})
+
+	p := NewIMDSProvider(srv.Client(), srv.URL+"/latest")
+	first, err := p.Retrieve(context.Background())
+	if err != nil {
+		t.Fatalf("first Retrieve: %v", err)
+	}
+
+	got, err := p.Retrieve(context.Background())
+	if err == nil {
+		t.Fatalf("refresh failure was reported as success: %+v", got)
+	}
+	if got.Expiration.After(first.Expiration) {
+		t.Errorf("expiry extended on refresh failure: %v -> %v", first.Expiration, got.Expiration)
+	}
+}
+
+func TestRetrieve_CancelledContext(t *testing.T) {
+	srv := imdsStub(t, nil, map[string]string{"Code": "Success", "AccessKeyId": "A", "SecretAccessKey": "B"})
+	p := NewIMDSProvider(srv.Client(), srv.URL+"/latest")
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	if _, err := p.Retrieve(ctx); err == nil {
+		t.Fatal("expected error from cancelled context")
+	}
+}
+
+func TestRetrieve_CodeNotSuccessErrors(t *testing.T) {
+	srv := imdsStub(t, nil, map[string]string{"Code": "Failure", "AccessKeyId": "A", "SecretAccessKey": "B"})
+	p := NewIMDSProvider(srv.Client(), srv.URL+"/latest")
+	if _, err := p.Retrieve(context.Background()); err == nil {
+		t.Fatal("expected error when Code != Success")
+	}
+}

spinifex/agents/ecs/credentials/provider.go

@@ -0,0 +1,24 @@
+// Package credentials supplies AWS SigV4 credentials to the ecs-agent. The agent
+// signs gateway calls (ECR GetAuthorizationToken, instance register/heartbeat)
+// with the host's instance-role credentials, fetched from IMDS and cached until
+// near expiry.
+package credentials
+
+import (
+	"context"
+	"time"
+)
+
+// Credentials is a SigV4 credential set with an expiry.
+type Credentials struct {
+	AccessKeyID     string
+	SecretAccessKey string
+	SessionToken    string
+	Expiration      time.Time
+}
+
+// CredentialsProvider yields current credentials, refreshing as needed. Retrieve
+// must be safe for concurrent use.
+type CredentialsProvider interface {
+	Retrieve(ctx context.Context) (Credentials, error)
+}

spinifex/agents/eks/konnectivitycert/cert.go

@@ -80,17 +80,7 @@ func ensureCert(dir, caCertPath, caKeyPath, cn string, dns []string, ips []net.I
 	if err != nil {
 		return "", "", err
 	}
-	now := time.Now().UTC()
-	certPEM, keyPEM, err := Mint(&x509.Certificate{
-		Subject:               pkix.Name{CommonName: cn},
-		NotBefore:             now.Add(-time.Hour),
-		NotAfter:              now.AddDate(10, 0, 0),
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		BasicConstraintsValid: true,
-		DNSNames:              dns,
-		IPAddresses:           ips,
-	}, caCert, caKey)
+	certPEM, keyPEM, err := issueLeaf(caCert, caKey, cn, dns, ips)
 	if err != nil {
 		return "", "", err
 	}
@@ -191,9 +181,8 @@ func parseECKey(der []byte) (*ecdsa.PrivateKey, error) {
 	return ec, nil
 }
 
-// Mint generates an ECDSA-P256 key, issues tmpl for it with a random serial and
-// signs it with parentKey, or self-signs when parent is nil. tmpl is not modified.
-func Mint(tmpl, parent *x509.Certificate, parentKey *ecdsa.PrivateKey) (certPEM, keyPEM []byte, err error) {
+// issueLeaf mints an ECDSA-P256 ServerAuth leaf for cn + SANs, signed by caCert/caKey.
+func issueLeaf(caCert *x509.Certificate, caKey *ecdsa.PrivateKey, cn string, dns []string, ips []net.IP) (certPEM, keyPEM []byte, err error) {
 	priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
 	if err != nil {
 		return nil, nil, fmt.Errorf("generate key: %w", err)
@@ -202,12 +191,19 @@ func Mint(tmpl, parent *x509.Certificate, parentKey *ecdsa.PrivateKey) (certPEM,
 	if err != nil {
 		return nil, nil, fmt.Errorf("serial: %w", err)
 	}
-	t := *tmpl
-	t.SerialNumber = serial
-	if parent == nil {
-		parent, parentKey = &t, priv
+	now := time.Now().UTC()
+	tmpl := x509.Certificate{
+		SerialNumber:          serial,
+		Subject:               pkix.Name{CommonName: cn},
+		NotBefore:             now.Add(-time.Hour),
+		NotAfter:              now.AddDate(10, 0, 0),
+		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+		DNSNames:              dns,
+		IPAddresses:           ips,
 	}
-	der, err := x509.CreateCertificate(rand.Reader, &t, parent, &priv.PublicKey, parentKey)
+	der, err := x509.CreateCertificate(rand.Reader, &tmpl, caCert, &priv.PublicKey, caKey)
 	if err != nil {
 		return nil, nil, fmt.Errorf("create cert: %w", err)
 	}

spinifex/agents/eks/podidentity/certs.go

@@ -1,11 +1,15 @@
 package podidentity
 
 import (
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
+	"math/big"
 	"net"
 	"os"
 	"path/filepath"
@@ -79,8 +83,17 @@ func ensureLeaf(certPath, keyPath, caCertPath, caKeyPath string, spec leafSpec)
 	if leafCurrent(certPath, keyPath, ca, spec) {
 		return nil
 	}
+	priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	if err != nil {
+		return fmt.Errorf("generate key: %w", err)
+	}
+	serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
+	if err != nil {
+		return fmt.Errorf("serial: %w", err)
+	}
 	now := time.Now().UTC()
-	certPEM, keyPEM, err := konnectivitycert.Mint(&x509.Certificate{
+	tmpl := x509.Certificate{
+		SerialNumber:          serial,
 		Subject:               pkix.Name{CommonName: spec.cn},
 		NotBefore:             now.Add(-time.Hour),
 		NotAfter:              now.Add(certValidity),
@@ -88,15 +101,20 @@ func ensureLeaf(certPath, keyPath, caCertPath, caKeyPath string, spec leafSpec)
 		ExtKeyUsage:           []x509.ExtKeyUsage{spec.usage},
 		BasicConstraintsValid: true,
 		IPAddresses:           spec.ips,
-	}, ca, caKey)
+	}
+	der, err := x509.CreateCertificate(rand.Reader, &tmpl, ca, &priv.PublicKey, caKey)
 	if err != nil {
-		return err
+		return fmt.Errorf("create certificate: %w", err)
+	}
+	keyDER, err := x509.MarshalECPrivateKey(priv)
+	if err != nil {
+		return fmt.Errorf("marshal key: %w", err)
 	}
 	// Key first: a cert without its key is never published.
-	if err := writeAtomic(keyPath, keyPEM, 0o600); err != nil {
+	if err := writeAtomic(keyPath, pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: keyDER}), 0o600); err != nil {
 		return err
 	}
-	return writeAtomic(certPath, certPEM, 0o644)
+	return writeAtomic(certPath, pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der}), 0o644)
 }
 
 // leafCurrent reports whether the cached pair loads, matches, was signed by ca,

spinifex/agents/eks/tokenwebhook/cert.go

@@ -1,17 +1,21 @@
 package tokenwebhook
 
 import (
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/base64"
+	"encoding/pem"
 	"fmt"
+	"math/big"
 	"net"
 	"os"
 	"time"
 
 	"github.com/mulgadc/bluebottle/pkg/tlsconfig"
-	"github.com/mulgadc/spinifex/spinifex/agents/eks/konnectivitycert"
 )
 
 // serverTLSConfig is the webhook's loopback serving TLS config.
@@ -37,18 +41,7 @@ func ensureServingCert(certPath, keyPath string) (tls.Certificate, []byte, error
 		}
 	}
 
-	now := time.Now().UTC()
-	certPEM, keyPEM, err := konnectivitycert.Mint(&x509.Certificate{
-		Subject:               pkix.Name{CommonName: "eks-token-webhook"},
-		NotBefore:             now.Add(-time.Hour),
-		NotAfter:              now.AddDate(10, 0, 0),
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		BasicConstraintsValid: true,
-		IsCA:                  true,
-		IPAddresses:           []net.IP{net.IPv4(127, 0, 0, 1), net.IPv6loopback},
-		DNSNames:              []string{"localhost"},
-	}, nil, nil)
+	certPEM, keyPEM, err := generateSelfSigned()
 	if err != nil {
 		return tls.Certificate{}, nil, err
 	}
@@ -65,6 +58,41 @@ func ensureServingCert(certPath, keyPath string) (tls.Certificate, []byte, error
 	return cert, certPEM, nil
 }
 
+func generateSelfSigned() (certPEM, keyPEM []byte, err error) {
+	priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	if err != nil {
+		return nil, nil, fmt.Errorf("generate key: %w", err)
+	}
+	serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
+	if err != nil {
+		return nil, nil, fmt.Errorf("serial: %w", err)
+	}
+	now := time.Now().UTC()
+	tmpl := x509.Certificate{
+		SerialNumber:          serial,
+		Subject:               pkix.Name{CommonName: "eks-token-webhook"},
+		NotBefore:             now.Add(-time.Hour),
+		NotAfter:              now.AddDate(10, 0, 0),
+		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+		IsCA:                  true,
+		IPAddresses:           []net.IP{net.IPv4(127, 0, 0, 1), net.IPv6loopback},
+		DNSNames:              []string{"localhost"},
+	}
+	der, err := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, &priv.PublicKey, priv)
+	if err != nil {
+		return nil, nil, fmt.Errorf("create cert: %w", err)
+	}
+	keyDER, err := x509.MarshalECPrivateKey(priv)
+	if err != nil {
+		return nil, nil, fmt.Errorf("marshal key: %w", err)
+	}
+	certPEM = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
+	keyPEM = pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: keyDER})
+	return certPEM, keyPEM, nil
+}
+
 // writeAPIServerKubeconfig writes the kubeconfig kube-apiserver loads via
 // --authentication-token-webhook-config-file. It points the apiserver at the
 // loopback webhook and trusts its self-signed serving cert as the CA bundle.

spinifex/agents/eks/webhookcert/cert.go

@@ -14,6 +14,9 @@ package webhookcert
 
 import (
 	"context"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/base64"
@@ -21,12 +24,11 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math/big"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
-
-	"github.com/mulgadc/spinifex/spinifex/agents/eks/konnectivitycert"
 )
 
 // Config names the webhook certificate and where it is cached.
@@ -67,25 +69,13 @@ func ensureCert(dir, cn string, dnsNames []string) (certPEM, keyPEM []byte, err
 
 	if c, cerr := os.ReadFile(certPath); cerr == nil {
 		if k, kerr := os.ReadFile(keyPath); kerr == nil {
-			if blk, _ := pem.Decode(c); blk != nil && len(k) > 0 {
-				if _, perr := x509.ParseCertificate(blk.Bytes); perr == nil {
-					return c, k, nil
-				}
+			if _, perr := x509.ParseCertificate(decodeFirst(c)); perr == nil && len(k) > 0 {
+				return c, k, nil
 			}
 		}
 	}
 
-	now := time.Now().UTC()
-	certPEM, keyPEM, err = konnectivitycert.Mint(&x509.Certificate{
-		Subject:               pkix.Name{CommonName: cn},
-		NotBefore:             now.Add(-time.Hour),
-		NotAfter:              now.AddDate(10, 0, 0),
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		BasicConstraintsValid: true,
-		IsCA:                  true,
-		DNSNames:              dnsNames,
-	}, nil, nil)
+	certPEM, keyPEM, err = generateSelfSigned(cn, dnsNames)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -101,6 +91,51 @@ func ensureCert(dir, cn string, dnsNames []string) (certPEM, keyPEM []byte, err
 	return certPEM, keyPEM, nil
 }
 
+// generateSelfSigned mints an ECDSA-P256 self-signed cert valid as both a CA and
+// a server cert, with the given common name and DNS SANs.
+func generateSelfSigned(cn string, dnsNames []string) (certPEM, keyPEM []byte, err error) {
+	priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	if err != nil {
+		return nil, nil, fmt.Errorf("generate key: %w", err)
+	}
+	serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
+	if err != nil {
+		return nil, nil, fmt.Errorf("serial: %w", err)
+	}
+	now := time.Now().UTC()
+	tmpl := x509.Certificate{
+		SerialNumber:          serial,
+		Subject:               pkix.Name{CommonName: cn},
+		NotBefore:             now.Add(-time.Hour),
+		NotAfter:              now.AddDate(10, 0, 0),
+		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+		IsCA:                  true,
+		DNSNames:              dnsNames,
+	}
+	der, err := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, &priv.PublicKey, priv)
+	if err != nil {
+		return nil, nil, fmt.Errorf("create cert: %w", err)
+	}
+	keyDER, err := x509.MarshalECPrivateKey(priv)
+	if err != nil {
+		return nil, nil, fmt.Errorf("marshal key: %w", err)
+	}
+	certPEM = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
+	keyPEM = pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: keyDER})
+	return certPEM, keyPEM, nil
+}
+
+// decodeFirst returns the DER bytes of the first PEM block, or nil.
+func decodeFirst(pemBytes []byte) []byte {
+	blk, _ := pem.Decode(pemBytes)
+	if blk == nil {
+		return nil
+	}
+	return blk.Bytes
+}
+
 func splitCSV(s string) []string {
 	var out []string
 	for p := range strings.SplitSeq(s, ",") {

spinifex/agents/eks/webhookcert/cert_test.go

@@ -2,7 +2,6 @@ package webhookcert
 
 import (
 	"crypto/x509"
-	"encoding/pem"
 	"os"
 	"path/filepath"
 	"testing"
@@ -15,11 +14,7 @@ const (
 
 func parseLeaf(t *testing.T, certPEM []byte) *x509.Certificate {
 	t.Helper()
-	blk, _ := pem.Decode(certPEM)
-	if blk == nil {
-		t.Fatal("no PEM block in cert")
-	}
-	leaf, err := x509.ParseCertificate(blk.Bytes)
+	leaf, err := x509.ParseCertificate(decodeFirst(certPEM))
 	if err != nil {
 		t.Fatalf("parse cert: %v", err)
 	}

spinifex/agents/lambda/runtimeapi/server.go

@@ -212,7 +212,7 @@ func (s *Server) response(w http.ResponseWriter, r *http.Request) {
 	}
 	if len(body) > MaxResponseBytes {
 		msg := "Response payload size exceeded maximum allowed payload size (" + strconv.Itoa(MaxResponseBytes) + " bytes)."
-		s.complete(id, Result{Payload: ErrorBody(msg, ErrTypeResponseTooLarge), FunctionError: ErrTypeUnhandled})
+		s.complete(id, Result{Payload: ErrorBody(msg, ErrTypeResponseTooLarge), FunctionError: ErrTypeResponseTooLarge})
 		writeError(w, http.StatusRequestEntityTooLarge, errTypeTooLarge, msg)
 		return
 	}

spinifex/agents/lambda/runtimeapi/server_test.go

@@ -170,7 +170,7 @@ func TestOversizeResponse(t *testing.T) {
 
 	got := <-out
 	require.NoError(t, got.err)
-	assert.Equal(t, "Unhandled", got.res.FunctionError)
+	assert.Equal(t, "Function.ResponseSizeTooLarge", got.res.FunctionError)
 	assert.Equal(t, "Function.ResponseSizeTooLarge", errType(t, got.res.Payload))
 }
 

spinifex/domains/acm/awsapi/certificates.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/acm"
 	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
-	"github.com/mulgadc/spinifex/spinifex/ingress/aws/envelope"
 	"github.com/nats-io/nats.go"
 )
 
@@ -18,7 +17,7 @@ const natsTimeout = 30 * time.Second
 // RequestCertificate — CertificateManager.RequestCertificate.
 func RequestCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.RequestCertificateOutput, error) {
 	input := new(acm.RequestCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameterValue)
 	}
 	return natsmsg.NATSRequest[acm.RequestCertificateOutput](ctx, natsConn, "acm.RequestCertificate", input, natsTimeout, accountID)
@@ -27,7 +26,7 @@ func RequestCertificate(ctx context.Context, natsConn *nats.Conn, accountID stri
 // ImportCertificate — CertificateManager.ImportCertificate.
 func ImportCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.ImportCertificateOutput, error) {
 	input := new(acm.ImportCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.ImportCertificateOutput](ctx, natsConn, "acm.ImportCertificate", input, natsTimeout, accountID)
@@ -36,7 +35,7 @@ func ImportCertificate(ctx context.Context, natsConn *nats.Conn, accountID strin
 // DescribeCertificate — CertificateManager.DescribeCertificate.
 func DescribeCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.DescribeCertificateOutput, error) {
 	input := new(acm.DescribeCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.DescribeCertificateOutput](ctx, natsConn, "acm.DescribeCertificate", input, natsTimeout, accountID)
@@ -45,7 +44,7 @@ func DescribeCertificate(ctx context.Context, natsConn *nats.Conn, accountID str
 // GetCertificate — CertificateManager.GetCertificate.
 func GetCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.GetCertificateOutput, error) {
 	input := new(acm.GetCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.GetCertificateOutput](ctx, natsConn, "acm.GetCertificate", input, natsTimeout, accountID)
@@ -54,7 +53,7 @@ func GetCertificate(ctx context.Context, natsConn *nats.Conn, accountID string,
 // ListCertificates — CertificateManager.ListCertificates.
 func ListCertificates(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.ListCertificatesOutput, error) {
 	input := new(acm.ListCertificatesInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.ListCertificatesOutput](ctx, natsConn, "acm.ListCertificates", input, natsTimeout, accountID)
@@ -63,7 +62,7 @@ func ListCertificates(ctx context.Context, natsConn *nats.Conn, accountID string
 // DeleteCertificate — CertificateManager.DeleteCertificate.
 func DeleteCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.DeleteCertificateOutput, error) {
 	input := new(acm.DeleteCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.DeleteCertificateOutput](ctx, natsConn, "acm.DeleteCertificate", input, natsTimeout, accountID)
@@ -72,7 +71,7 @@ func DeleteCertificate(ctx context.Context, natsConn *nats.Conn, accountID strin
 // ListTagsForCertificate — CertificateManager.ListTagsForCertificate.
 func ListTagsForCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.ListTagsForCertificateOutput, error) {
 	input := new(acm.ListTagsForCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.ListTagsForCertificateOutput](ctx, natsConn, "acm.ListTagsForCertificate", input, natsTimeout, accountID)
@@ -81,7 +80,7 @@ func ListTagsForCertificate(ctx context.Context, natsConn *nats.Conn, accountID
 // AddTagsToCertificate — CertificateManager.AddTagsToCertificate.
 func AddTagsToCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.AddTagsToCertificateOutput, error) {
 	input := new(acm.AddTagsToCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.AddTagsToCertificateOutput](ctx, natsConn, "acm.AddTagsToCertificate", input, natsTimeout, accountID)
@@ -90,7 +89,7 @@ func AddTagsToCertificate(ctx context.Context, natsConn *nats.Conn, accountID st
 // RemoveTagsFromCertificate — CertificateManager.RemoveTagsFromCertificate.
 func RemoveTagsFromCertificate(ctx context.Context, natsConn *nats.Conn, accountID string, body []byte) (*acm.RemoveTagsFromCertificateOutput, error) {
 	input := new(acm.RemoveTagsFromCertificateInput)
-	if err := envelope.UnmarshalJSONBody(body, input); err != nil {
+	if err := unmarshalIfBody(body, input); err != nil {
 		return nil, errors.New(awserrors.ErrorInvalidParameter)
 	}
 	return natsmsg.NATSRequest[acm.RemoveTagsFromCertificateOutput](ctx, natsConn, "acm.RemoveTagsFromCertificate", input, natsTimeout, accountID)

spinifex/domains/acm/awsapi/certificates_test.go

@@ -2,6 +2,7 @@ package awsapi
 
 import (
 	"context"
+	"net/http/httptest"
 	"testing"
 
 	"github.com/mulgadc/spinifex/internal/testkit"
@@ -10,6 +11,23 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestUnmarshalIfBody(t *testing.T) {
+	var out struct {
+		A string `json:"a"`
+	}
+	require.NoError(t, unmarshalIfBody(nil, &out))
+	require.NoError(t, unmarshalIfBody([]byte(`{"a":"x"}`), &out))
+	assert.Equal(t, "x", out.A)
+	require.Error(t, unmarshalIfBody([]byte("{bad"), &out))
+}
+
+func TestWriteJSONResponse(t *testing.T) {
+	w := httptest.NewRecorder()
+	WriteJSONResponse(w, map[string]string{"CertificateArn": "arn:aws:acm:x"})
+	assert.Equal(t, JSONContentType, w.Header().Get("Content-Type"))
+	assert.Contains(t, w.Body.String(), "CertificateArn")
+}
+
 // Invalid JSON bodies are rejected before any NATS round-trip.
 func TestOps_InvalidBodyRejected(t *testing.T) {
 	bad := []byte("{not json")

spinifex/domains/acm/awsapi/handler.go

@@ -2,3 +2,40 @@
 // NATS-backed service contract. Generic gateway routing and authorization stay
 // at the ingress boundary.
 package awsapi
+
+import (
+	"encoding/json"
+	"log/slog"
+	"net/http"
+
+	"github.com/aws/aws-sdk-go/private/protocol/json/jsonutil"
+	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
+)
+
+// JSONContentType is the AWS JSON 1.1 content type ACM clients expect.
+const JSONContentType = "application/x-amz-json-1.1"
+
+// WriteJSONResponse serialises obj as a 200 AWS JSON 1.1 response using the
+// SDK's own jsonutil marshaler, which encodes time.Time as epoch seconds
+// (encoding/json emits RFC3339 strings the SDK rejects).
+func WriteJSONResponse(w http.ResponseWriter, obj any) {
+	body, err := jsonutil.BuildJSON(obj)
+	if err != nil {
+		slog.Error("ACM: failed to marshal response JSON", "err", err)
+		http.Error(w, awserrors.ErrorInternalError, http.StatusInternalServerError)
+		return
+	}
+	w.Header().Set("Content-Type", JSONContentType)
+	w.WriteHeader(http.StatusOK)
+	if _, err := w.Write(body); err != nil {
+		slog.Error("ACM: failed to write response", "err", err)
+	}
+}
+
+// unmarshalIfBody decodes body into out only when non-empty.
+func unmarshalIfBody(body []byte, out any) error {
+	if len(body) == 0 {
+		return nil
+	}
+	return json.Unmarshal(body, out)
+}

spinifex/domains/acm/awsapi/registration.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
 	"github.com/mulgadc/spinifex/spinifex/ingress/aws/dispatch"
-	"github.com/mulgadc/spinifex/spinifex/ingress/aws/envelope"
 	"github.com/nats-io/nats.go"
 )
 
@@ -125,6 +124,6 @@ func (d Deps) dispatch(w http.ResponseWriter, inv dispatch.Invocation) error {
 		return err
 	}
 
-	envelope.WriteJSONResult(w, output)
+	WriteJSONResponse(w, output)
 	return nil
 }

spinifex/domains/admission/quota/override.go

@@ -230,7 +230,7 @@ func (s *Service) clearAccountQuota(ctx context.Context, accountID string) error
 			return nil
 		case errors.Is(err, jetstream.ErrKeyNotFound):
 			return nil
-		case kvutil.IsRevisionConflict(err):
+		case isRevisionConflict(err):
 			// A concurrent write landed between the read and the guarded
 			// delete; retry against whatever revision now holds.
 			continue

spinifex/domains/admission/quota/seal.go

@@ -62,6 +62,20 @@ func (s *Service) checkTerminating(ctx context.Context, accountID string) error
 	return nil
 }
 
+// isRevisionConflict reports a lost CAS race to retry, including the bare
+// wrong-last-sequence APIError from Create's retry against a delete marker.
+// A private copy of domains/ec2/account's helper, which this package may not import.
+func isRevisionConflict(err error) bool {
+	if errors.Is(err, jetstream.ErrKeyExists) || errors.Is(err, jetstream.ErrKeyRevisionMismatch) {
+		return true
+	}
+	if apiErr, ok := errors.AsType[*jetstream.APIError](err); ok {
+		return apiErr.ErrorCode == jetstream.JSErrCodeStreamWrongLastSequence ||
+			apiErr.ErrorCode == jetstream.JSErrCodeStreamWrongLastSequenceConstant
+	}
+	return false
+}
+
 // sealBucket returns this gateway's override bucket, or get-or-creates it
 // when quotas are disabled here. Called only after checkTerminating accepts,
 // so a refused seal never creates the bucket.
@@ -136,7 +150,7 @@ func (s *Service) SealAccountOverrides(ctx context.Context, accountID string) (*
 		switch {
 		case writeErr == nil:
 			return &OverrideSeal{Revision: newRev}, nil
-		case kvutil.IsRevisionConflict(writeErr):
+		case isRevisionConflict(writeErr):
 			continue
 		default:
 			slog.ErrorContext(ctx, "Failed to write sealed quota override record", "accountID", accountID, "err", writeErr)

spinifex/domains/admission/quota/seal_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"sync"
 	"testing"
 
@@ -432,6 +433,16 @@ func TestSealStoreErrorWritesNothing(t *testing.T) {
 	assert.Equal(t, before, lastOverrideSeq(t, js))
 }
 
+func TestIsRevisionConflictRecognisesTombstoneRetry(t *testing.T) {
+	assert.True(t, isRevisionConflict(jetstream.ErrKeyExists))
+	assert.True(t, isRevisionConflict(jetstream.ErrKeyRevisionMismatch))
+	assert.True(t, isRevisionConflict(&jetstream.APIError{ErrorCode: jetstream.JSErrCodeStreamWrongLastSequence}))
+	assert.True(t, isRevisionConflict(&jetstream.APIError{ErrorCode: jetstream.JSErrCodeStreamWrongLastSequenceConstant}))
+	assert.True(t, isRevisionConflict(fmt.Errorf("wrapped: %w", &jetstream.APIError{ErrorCode: jetstream.JSErrCodeStreamWrongLastSequence})))
+	assert.False(t, isRevisionConflict(errors.New("unrelated failure")))
+	assert.False(t, isRevisionConflict(nil))
+}
+
 // Clearing never writes when there is nothing active to clear: an absent key,
 // a tombstoned key, and a sealed key hidden behind a stale not-found Get all
 // leave the stream exactly where they found it.

spinifex/domains/ec2/account/seal.go

@@ -8,7 +8,6 @@ import (
 
 	awserrors "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
 	awsidentifiers "github.com/mulgadc/spinifex/spinifex/foundation/aws/identifiers"
-	"github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil"
 	"github.com/nats-io/nats.go/jetstream"
 )
 
@@ -59,6 +58,20 @@ func (s *AccountSettingsServiceImpl) checkTerminating(ctx context.Context, accou
 	return nil
 }
 
+// isRevisionConflict reports a lost CAS race SealAccount should retry. Besides
+// the two sentinels, Create's retry against a delete marker returns a bare
+// *jetstream.APIError carrying a wrong-last-sequence code.
+func isRevisionConflict(err error) bool {
+	if errors.Is(err, jetstream.ErrKeyExists) || errors.Is(err, jetstream.ErrKeyRevisionMismatch) {
+		return true
+	}
+	if apiErr, ok := errors.AsType[*jetstream.APIError](err); ok {
+		return apiErr.ErrorCode == jetstream.JSErrCodeStreamWrongLastSequence ||
+			apiErr.ErrorCode == jetstream.JSErrCodeStreamWrongLastSequenceConstant
+	}
+	return false
+}
+
 // SealAccount seals accountID's settings record so no later mutation can
 // recreate it. It never relies on a read for its claim: the only success is a
 // leader-accepted write, evidenced by the returned revision.
@@ -109,7 +122,7 @@ func (s *AccountSettingsServiceImpl) SealAccount(ctx context.Context, accountID
 		switch {
 		case writeErr == nil:
 			return &AccountSettingsSeal{Revision: newRev}, nil
-		case kvutil.IsRevisionConflict(writeErr):
+		case isRevisionConflict(writeErr):
 			continue
 		default:
 			slog.ErrorContext(ctx, "Failed to write sealed account settings record", "accountID", accountID, "err", writeErr)

spinifex/domains/ec2/account/seal_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"sync"
 	"testing"
 
@@ -396,6 +397,16 @@ func TestSealStoreErrorWritesNothing(t *testing.T) {
 	assert.Equal(t, before, lastSettingsSeq(t, svc))
 }
 
+func TestIsRevisionConflictRecognisesTombstoneRetry(t *testing.T) {
+	assert.True(t, isRevisionConflict(jetstream.ErrKeyExists))
+	assert.True(t, isRevisionConflict(jetstream.ErrKeyRevisionMismatch))
+	assert.True(t, isRevisionConflict(&jetstream.APIError{ErrorCode: jetstream.JSErrCodeStreamWrongLastSequence}))
+	assert.True(t, isRevisionConflict(&jetstream.APIError{ErrorCode: jetstream.JSErrCodeStreamWrongLastSequenceConstant}))
+	assert.True(t, isRevisionConflict(fmt.Errorf("wrapped: %w", &jetstream.APIError{ErrorCode: jetstream.JSErrCodeStreamWrongLastSequence})))
+	assert.False(t, isRevisionConflict(errors.New("unrelated failure")))
+	assert.False(t, isRevisionConflict(nil))
+}
+
 // An account IAM does not hold as TERMINATING refuses the seal before any
 // settings-KV write, whether the key is present or absent.
 func TestSealRefusedForActiveAccount(t *testing.T) {

spinifex/domains/ec2/accountinventory/compute.go

@@ -1,88 +0,0 @@
-package accountinventory
-
-import (
-	"context"
-	"fmt"
-
-	ec2metadata "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata"
-	ec2spot "github.com/mulgadc/spinifex/spinifex/domains/ec2/spotinstance"
-)
-
-// SpotRequestScanner reads one account's spot requests, failing on any record
-// it cannot read.
-type SpotRequestScanner interface {
-	ScanAccount(ctx context.Context, accountID string) (*ec2spot.AccountScan, error)
-}
-
-// VolumeScanner reads one account's volume documents, failing on any document
-// it cannot read.
-type VolumeScanner interface {
-	ListVolumesStrict(ctx context.Context, accountID string) ([]ec2metadata.Volume, error)
-}
-
-var (
-	_ SpotRequestScanner = (*ec2spot.SpotInstanceServiceImpl)(nil)
-	_ VolumeScanner      = (*ec2metadata.Store)(nil)
-)
-
-// SpotRequestItem is one request the account holds.
-type SpotRequestItem struct {
-	RequestID string
-	State     string
-	Active    bool
-}
-
-// VolumeItem is one volume document the account holds.
-type VolumeItem struct {
-	VolumeID            string
-	State               string
-	AttachedInstance    string
-	DeleteOnTermination bool
-}
-
-// WithCompute adds the spot-request and volume owner stores.
-func (i *Inventory) WithCompute(spot SpotRequestScanner, volumes VolumeScanner) *Inventory {
-	i.spot = spot
-	i.volumes = volumes
-	return i
-}
-
-// SpotRequestInventory returns every spot request the account holds. A scan
-// that cannot be completed is an error, never a shorter list.
-func (i *Inventory) SpotRequestInventory(ctx context.Context, accountID string) ([]SpotRequestItem, error) {
-	if i.spot == nil {
-		return nil, fmt.Errorf("spot request inventory is not configured")
-	}
-	scan, err := i.spot.ScanAccount(ctx, accountID)
-	if err != nil {
-		return nil, fmt.Errorf("spot request inventory incomplete: %w", err)
-	}
-	items := make([]SpotRequestItem, 0, len(scan.Active)+len(scan.Terminal))
-	for _, r := range scan.Active {
-		items = append(items, SpotRequestItem{RequestID: r.RequestID, State: r.State, Active: true})
-	}
-	for _, r := range scan.Terminal {
-		items = append(items, SpotRequestItem{RequestID: r.RequestID, State: r.State})
-	}
-	return items, nil
-}
-
-// VolumeInventory returns every volume document the account holds, including
-// those already marked deleting. An unreadable document is an error.
-func (i *Inventory) VolumeInventory(ctx context.Context, accountID string) ([]VolumeItem, error) {
-	if i.volumes == nil {
-		return nil, fmt.Errorf("volume inventory is not configured")
-	}
-	docs, err := i.volumes.ListVolumesStrict(ctx, accountID)
-	if err != nil {
-		return nil, fmt.Errorf("volume inventory incomplete: %w", err)
-	}
-	items := make([]VolumeItem, 0, len(docs))
-	for _, v := range docs {
-		items = append(items, VolumeItem{
-			VolumeID: v.VolumeID, State: v.State, AttachedInstance: v.AttachedInstance,
-			DeleteOnTermination: v.DeleteOnTermination,
-		})
-	}
-	return items, nil
-}

spinifex/domains/ec2/accountinventory/compute_test.go

@@ -1,82 +0,0 @@
-package accountinventory
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	ec2metadata "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata"
-	ec2spot "github.com/mulgadc/spinifex/spinifex/domains/ec2/spotinstance"
-)
-
-type fakeSpot struct {
-	scan *ec2spot.AccountScan
-	err  error
-}
-
-func (f fakeSpot) ScanAccount(context.Context, string) (*ec2spot.AccountScan, error) {
-	return f.scan, f.err
-}
-
-type fakeVolumes struct {
-	docs []ec2metadata.Volume
-	err  error
-}
-
-func (f fakeVolumes) ListVolumesStrict(context.Context, string) ([]ec2metadata.Volume, error) {
-	return f.docs, f.err
-}
-
-func TestSpotRequestInventoryMarksActiveAndTerminal(t *testing.T) {
-	inv := New(nil, nil, nil, nil).WithCompute(fakeSpot{scan: &ec2spot.AccountScan{
-		Active:   []ec2spot.AccountSpotRequest{{RequestID: "sir-1", State: "active"}},
-		Terminal: []ec2spot.AccountSpotRequest{{RequestID: "sir-2", State: "cancelled"}},
-	}}, nil)
-
-	items, err := inv.SpotRequestInventory(t.Context(), testAccount)
-	require.NoError(t, err)
-	assert.Equal(t, []SpotRequestItem{
-		{RequestID: "sir-1", State: "active", Active: true},
-		{RequestID: "sir-2", State: "cancelled"},
-	}, items)
-}
-
-func TestSpotRequestInventoryScanFailureIsAnErrorNotAShorterList(t *testing.T) {
-	inv := New(nil, nil, nil, nil).WithCompute(fakeSpot{err: errList}, nil)
-
-	items, err := inv.SpotRequestInventory(t.Context(), testAccount)
-	require.ErrorIs(t, err, errList)
-	assert.Nil(t, items)
-}
-
-func TestVolumeInventoryReportsAttachmentAndDeletingDocuments(t *testing.T) {
-	inv := New(nil, nil, nil, nil).WithCompute(nil, fakeVolumes{docs: []ec2metadata.Volume{
-		{VolumeID: "vol-1", State: "in-use", AttachedInstance: "i-1", DeleteOnTermination: true},
-		{VolumeID: "vol-2", State: "deleting"},
-	}})
-
-	items, err := inv.VolumeInventory(t.Context(), testAccount)
-	require.NoError(t, err)
-	assert.Equal(t, []VolumeItem{
-		{VolumeID: "vol-1", State: "in-use", AttachedInstance: "i-1", DeleteOnTermination: true},
-		{VolumeID: "vol-2", State: "deleting"},
-	}, items)
-}
-
-func TestVolumeInventoryListFailureIsAnErrorNotAShorterList(t *testing.T) {
-	inv := New(nil, nil, nil, nil).WithCompute(nil, fakeVolumes{err: errList})
-
-	items, err := inv.VolumeInventory(t.Context(), testAccount)
-	require.ErrorIs(t, err, errList)
-	assert.Nil(t, items)
-}
-
-func TestComputeInventoriesRefuseWhenNotConfigured(t *testing.T) {
-	inv := New(nil, nil, nil, nil)
-	_, err := inv.SpotRequestInventory(t.Context(), testAccount)
-	require.Error(t, err)
-	_, err = inv.VolumeInventory(t.Context(), testAccount)
-	require.Error(t, err)
-}

spinifex/domains/ec2/accountinventory/inventory.go

@@ -61,8 +61,6 @@ type Inventory struct {
 	groups    PlacementGroupScanner
 	templates LaunchTemplateScanner
 	tags      TagIndexScanner
-	spot      SpotRequestScanner
-	volumes   VolumeScanner
 	now       func() time.Time
 }
 

spinifex/domains/ec2/awsapi/account/DescribeAccountAttributes.go

@@ -4,7 +4,6 @@
 package account
 
 import (
-	"github.com/mulgadc/spinifex/spinifex/foundation/aws/identifiers"
 	"log/slog"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -15,7 +14,12 @@ import (
 // but default-vpc is static; defaultVPCID looks that one up, is called only
 // when it is asked for, and returns "" for an account with no default VPC.
 func DescribeAccountAttributes(input *ec2.DescribeAccountAttributesInput, defaultVPCID func() (string, error)) (*ec2.DescribeAccountAttributesOutput, error) {
-	requestedAttrs := identifiers.Set(input.AttributeNames)
+	requestedAttrs := make(map[string]bool)
+	for _, name := range input.AttributeNames {
+		if name != nil {
+			requestedAttrs[*name] = true
+		}
+	}
 
 	returnAll := len(requestedAttrs) == 0
 

spinifex/domains/ec2/awsapi/actions.go

@@ -151,7 +151,7 @@ var ec2Actions = map[string]ec2Action{
 		launchQuotaCheck := func() error {
 			return c.Quota.EnforceLaunch(ctx, accountID, aws.StringValue(input.InstanceType), int(aws.Int64Value(input.MaxCount)))
 		}
-		reservation, err := ec2instanceapi.RunInstances(ctx, input, c.NATS, c.clientTokenBucket, c.IAM, accountID, passRoleCheck, launchQuotaCheck, c.ExpectedNodes)
+		reservation, err := ec2instanceapi.RunInstances(ctx, input, c.NATS, c.IAM, accountID, passRoleCheck, launchQuotaCheck, c.ExpectedNodes)
 		if err != nil {
 			return nil, err
 		}
@@ -436,7 +436,7 @@ var ec2Actions = map[string]ec2Action{
 		passRoleCheck := func(roleARN string) error {
 			return c.passRole(roleARN)
 		}
-		return ec2spotinstanceapi.RequestSpotInstances(ctx, input, c.NATS, c.clientTokenBucket, c.IAM, accountID, c.AZ, passRoleCheck, c.Quota, c.ExpectedNodes)
+		return ec2spotinstanceapi.RequestSpotInstances(ctx, input, c.NATS, c.IAM, accountID, c.AZ, passRoleCheck, c.Quota, c.ExpectedNodes)
 	}),
 	"DescribeSpotInstanceRequests": ec2Handler(func(ctx context.Context, input *ec2.DescribeSpotInstanceRequestsInput, c *call, accountID string) (any, error) {
 		return ec2spotinstanceapi.DescribeSpotInstanceRequests(ctx, input, c.NATS, accountID)

spinifex/domains/ec2/awsapi/idem/idem.go

@@ -4,15 +4,10 @@
 package idem
 
 import (
-	"context"
-	"errors"
-	"log/slog"
 	"reflect"
 	"time"
 
-	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
 	"github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency"
-	"github.com/nats-io/nats.go/jetstream"
 )
 
 const (
@@ -59,45 +54,3 @@ func TokenAndParams(input any) (token, paramHash string, ok bool) {
 	clone.FieldByName(tokenField).Set(reflect.Zero(field.Type()))
 	return field.Elem().String(), idempotency.ParamHash(clone.Addr().Interface()), true
 }
-
-// Bucket returns the KV bucket that holds the token records. It is called only
-// when a request carries a token, so tokenless requests never bind it.
-type Bucket func(ctx context.Context) (jetstream.KeyValue, error)
-
-// Run runs work under the input's ClientToken, storing its result under
-// namespace. Requests without a token run unwrapped, which is what AWS does:
-// the token is how a client opts in.
-func Run[Out any](
-	ctx context.Context,
-	bucket Bucket,
-	namespace, accountID string,
-	input any,
-	work func() (Out, error),
-) (Out, error) {
-	var zero Out
-	// Hashed before work runs, so work that mutates its input cannot change what
-	// a retry of the same token hashes to.
-	token, paramHash, ok := TokenAndParams(input)
-	if !ok {
-		return work()
-	}
-
-	kv, kerr := bucket(ctx)
-	if kerr != nil {
-		// Running anyway would create the duplicate the token was sent to
-		// prevent, so this fails rather than degrading to no idempotency.
-		slog.ErrorContext(ctx, "client-token store unavailable", "namespace", namespace, "err", kerr)
-		return zero, errors.New(awserrors.ErrorServerInternal)
-	}
-
-	store := idempotency.NewStore[Out](kv, namespace)
-	output, err := idempotency.Do(ctx, store, accountID, token, paramHash, work)
-	switch {
-	case errors.Is(err, idempotency.ErrParamMismatch):
-		return zero, errors.New(awserrors.ErrorIdempotentParameterMismatch)
-	case errors.Is(err, idempotency.ErrUnavailable):
-		slog.ErrorContext(ctx, "client-token replay unavailable", "namespace", namespace, "token", token, "err", err)
-		return zero, errors.New(awserrors.ErrorServerInternal)
-	}
-	return output, err
-}

spinifex/domains/ec2/awsapi/idem/idem_test.go

@@ -1,15 +1,11 @@
 package idem_test
 
 import (
-	"context"
-	"errors"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	ec2idemapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/idem"
-	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
-	"github.com/nats-io/nats.go/jetstream"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -83,21 +79,3 @@ func TestTokenAndParams_LeavesTheInputIntact(t *testing.T) {
 	require.NotNil(t, input.ClientToken)
 	assert.Equal(t, "tok", *input.ClientToken)
 }
-
-// A token the store cannot honour fails the request rather than running it
-// unprotected; a request without a token never touches the store.
-func TestRun_BucketFailure(t *testing.T) {
-	t.Parallel()
-	broken := func(context.Context) (jetstream.KeyValue, error) { return nil, errors.New("no jetstream") }
-	ran := false
-	work := func() (string, error) { ran = true; return "ok", nil }
-
-	_, err := ec2idemapi.Run(t.Context(), broken, "", "acct",
-		&ec2.RunInstancesInput{ClientToken: aws.String("tok")}, work)
-	require.EqualError(t, err, awserrors.ErrorServerInternal)
-	assert.False(t, ran)
-
-	out, err := ec2idemapi.Run(t.Context(), broken, "", "acct", &ec2.RunInstancesInput{}, work)
-	require.NoError(t, err)
-	assert.Equal(t, "ok", out)
-}

spinifex/domains/ec2/awsapi/idempotency.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 
 	ec2idemapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/idem"
 	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
@@ -42,9 +43,7 @@ func ec2IdempotentHandler[In, Out any](handler func(ctx context.Context, input *
 			if !ok {
 				return nil, errors.New(awserrors.ErrorInternalError)
 			}
-			// Namespaced by action: one bucket holds every EC2 action's records, and
-			// without the prefix one action's payload could be decoded as another's Out.
-			output, err := ec2idemapi.Run(ctx, c.clientTokenBucket, action, accountID, input, func() (Out, error) {
+			output, err := runEC2Idempotent(ctx, action, c, accountID, input, func() (Out, error) {
 				return handler(ctx, input, c, accountID)
 			})
 			if err != nil {
@@ -54,3 +53,43 @@ func ec2IdempotentHandler[In, Out any](handler func(ctx context.Context, input *
 		},
 	}
 }
+
+// runEC2Idempotent runs work under the input's ClientToken. Requests without one
+// run unwrapped, which is what AWS does: the token is how a client opts in.
+func runEC2Idempotent[In, Out any](
+	ctx context.Context,
+	action string,
+	c *call,
+	accountID string,
+	input *In,
+	work func() (Out, error),
+) (Out, error) {
+	var zero Out
+	// Hashed before the handler runs, so a handler that mutates its input cannot
+	// change what a retry of the same token hashes to.
+	token, paramHash, ok := ec2idemapi.TokenAndParams(input)
+	if !ok {
+		return work()
+	}
+
+	kv, kerr := c.clientTokenBucket(ctx)
+	if kerr != nil {
+		// Running anyway would create the duplicate the token was sent to
+		// prevent, so this fails rather than degrading to no idempotency.
+		slog.ErrorContext(ctx, "client-token store unavailable", "action", action, "err", kerr)
+		return zero, errors.New(awserrors.ErrorServerInternal)
+	}
+
+	// Namespaced by action: one bucket holds every EC2 action's records, and
+	// without the prefix one action's payload could be decoded as another's Out.
+	store := idempotency.NewStore[Out](kv, action)
+	output, err := idempotency.Do(ctx, store, accountID, token, paramHash, work)
+	switch {
+	case errors.Is(err, idempotency.ErrParamMismatch):
+		return zero, errors.New(awserrors.ErrorIdempotentParameterMismatch)
+	case errors.Is(err, idempotency.ErrUnavailable):
+		slog.ErrorContext(ctx, "client-token replay unavailable", "action", action, "token", token, "err", err)
+		return zero, errors.New(awserrors.ErrorServerInternal)
+	}
+	return output, err
+}

spinifex/domains/ec2/awsapi/instance/DescribeAccountInstancesStrict.go

@@ -1,151 +0,0 @@
-package instance
-
-import (
-	"context"
-	"encoding/json"
-	"log/slog"
-	"slices"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	awserrors "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
-	natsmsg "github.com/mulgadc/spinifex/spinifex/foundation/messaging/nats"
-	"github.com/nats-io/nats.go"
-)
-
-// accountInstanceRecordsSubject serves every non-terminated instance record an
-// account owns from the shared store, whichever node holds the instance.
-const accountInstanceRecordsSubject = "ec2.DescribeAccountInstanceRecords"
-
-// DescribeAccountInstancesStrict lists every non-terminated instance the
-// account owns, or returns a retryable ServiceUnavailable. Existence comes from
-// the shared record store, so an instance no answering node holds is still
-// listed with its recorded state; node answers are joined on for live state.
-// Anything that could make the list shorter than the truth is an error: a
-// configured node that did not answer, a frame from a node outside nodeIDs, a
-// record the owner could not project, or a store that did not answer.
-func DescribeAccountInstancesStrict(ctx context.Context, natsConn *nats.Conn, nodeIDs []string, accountID string, opts ...DescribeOption) (*ec2.DescribeInstancesOutput, error) {
-	if len(nodeIDs) == 0 {
-		slog.ErrorContext(ctx, "DescribeInstances: strict listing refused, configured node set unknown")
-		return nil, incompleteListingError()
-	}
-	cfg := describeConfig{fanoutTimeout: defaultDescribeFanoutTimeout}
-	for _, opt := range opts {
-		opt(&cfg)
-	}
-
-	jsonData, err := json.Marshal(&ec2.DescribeInstancesInput{})
-	if err != nil {
-		return nil, awserrors.Errorf(awserrors.ErrorServerInternal, "marshal describe input: %v", err)
-	}
-
-	records, ok := queryInstanceBucket(ctx, natsConn, accountInstanceRecordsSubject, jsonData, accountID)
-	if !ok {
-		slog.WarnContext(ctx, "DescribeInstances: strict listing refused, instance record store did not answer")
-		return nil, incompleteListingError()
-	}
-
-	// Collect to the deadline with no responder grace, so a reply from a node
-	// outside the set that lands after the configured nodes is still seen.
-	frames, sum, err := natsmsg.Gather(ctx, natsConn, "ec2.DescribeInstances", jsonData, natsmsg.GatherOpts{
-		Timeout:            cfg.fanoutTimeout,
-		AccountID:          accountID,
-		ExpectedResponders: len(nodeIDs),
-		Mode:               natsmsg.CollectUntilDeadline,
-	})
-	if err != nil {
-		return nil, err
-	}
-	live, complete := judgeIdentityCompleteness(ctx, frames, sum, nodeIDs)
-	if stray := unconfiguredNodes(frames, sum, nodeIDs); len(stray) > 0 {
-		slog.WarnContext(ctx, "DescribeInstances: strict listing refused, frame from a node outside the configured set",
-			"unconfigured_nodes", stray)
-		return nil, incompleteListingError()
-	}
-	if !complete {
-		slog.WarnContext(ctx, "DescribeInstances: strict listing refused, fan-out incomplete", "configured_nodes", len(nodeIDs))
-		return nil, incompleteListingError()
-	}
-
-	joined, nodeOnly, malformed := joinLiveOntoRecords(records, live)
-	if malformed {
-		slog.WarnContext(ctx, "DescribeInstances: strict listing refused, a reservation or instance has no usable identity")
-		return nil, incompleteListingError()
-	}
-	if len(nodeOnly) > 0 {
-		slog.WarnContext(ctx, "DescribeInstances: strict listing refused, node reports instances with no record",
-			"instances", nodeOnly)
-		return nil, incompleteListingError()
-	}
-	return &ec2.DescribeInstancesOutput{Reservations: joined}, nil
-}
-
-// unconfiguredNodes returns the node IDs that answered, with a success or an
-// error, but are not in nodeIDs.
-func unconfiguredNodes(frames []natsmsg.Frame, sum natsmsg.Summary, nodeIDs []string) []string {
-	var stray []string
-	note := func(id string) {
-		if id != "" && !slices.Contains(nodeIDs, id) && !slices.Contains(stray, id) {
-			stray = append(stray, id)
-		}
-	}
-	for _, frame := range frames {
-		note(frame.NodeID)
-	}
-	for id := range sum.Responders {
-		note(id)
-	}
-	slices.Sort(stray)
-	return stray
-}
-
-// joinLiveOntoRecords starts from the recorded instances and replaces each with
-// the answering node's view of it. Instances only a node reports are returned
-// by ID: a lost record write can cause one, and it must not be dropped. A nil
-// reservation, instance or instance ID is reported as malformed, never skipped.
-func joinLiveOntoRecords(records, live []*ec2.Reservation) ([]*ec2.Reservation, []string, bool) {
-	type entry struct {
-		reservation *ec2.Reservation
-		instance    *ec2.Instance
-	}
-	byID := map[string]*entry{}
-	var order []string
-	malformed := false
-	add := func(reservations []*ec2.Reservation) {
-		for _, res := range reservations {
-			if res == nil {
-				malformed = true
-				continue
-			}
-			for _, inst := range res.Instances {
-				if inst == nil || aws.StringValue(inst.InstanceId) == "" {
-					malformed = true
-					continue
-				}
-				id := aws.StringValue(inst.InstanceId)
-				if existing, ok := byID[id]; ok {
-					existing.instance = inst
-					continue
-				}
-				byID[id] = &entry{reservation: res, instance: inst}
-				order = append(order, id)
-			}
-		}
-	}
-	add(records)
-	recorded := len(order)
-	add(live)
-	nodeOnly := slices.Clone(order[recorded:])
-
-	out := make([]*ec2.Reservation, 0, len(order))
-	for _, id := range order {
-		e := byID[id]
-		out = append(out, &ec2.Reservation{
-			ReservationId: e.reservation.ReservationId,
-			OwnerId:       e.reservation.OwnerId,
-			Groups:        e.reservation.Groups,
-			Instances:     []*ec2.Instance{e.instance},
-		})
-	}
-	return mergeReservationsByID(out), nodeOnly, malformed
-}

spinifex/domains/ec2/awsapi/instance/DescribeAccountInstancesStrict_test.go

@@ -1,229 +0,0 @@
-package instance
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	awserrors "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
-	natsmsg "github.com/mulgadc/spinifex/spinifex/foundation/messaging/nats"
-	"github.com/nats-io/nats.go"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func strictInstance(id, state string) *ec2.Instance {
-	return &ec2.Instance{InstanceId: aws.String(id), State: &ec2.InstanceState{Name: aws.String(state)}}
-}
-
-func strictReservations(instances ...*ec2.Instance) *ec2.DescribeInstancesOutput {
-	out := &ec2.DescribeInstancesOutput{}
-	for _, inst := range instances {
-		out.Reservations = append(out.Reservations, &ec2.Reservation{
-			ReservationId: aws.String("r-" + aws.StringValue(inst.InstanceId)),
-			OwnerId:       aws.String("123456789012"),
-			Instances:     []*ec2.Instance{inst},
-		})
-	}
-	return out
-}
-
-func subscribeAccountRecords(t *testing.T, nc *nats.Conn, data []byte) {
-	t.Helper()
-	_, err := nc.Subscribe(accountInstanceRecordsSubject, func(msg *nats.Msg) { _ = msg.Respond(data) })
-	require.NoError(t, err)
-}
-
-const strictAccount = "123456789012"
-
-func strictList(nc *nats.Conn, nodes ...string) (*ec2.DescribeInstancesOutput, error) {
-	return DescribeAccountInstancesStrict(context.Background(), nc, nodes, strictAccount, WithFanoutTimeout(2*time.Second))
-}
-
-// Existence comes from the record store, so an instance no node holds is still
-// listed, with the state the record carries.
-func TestDescribeAccountInstancesStrict_UnheldRecordIsReturnedWithItsRecordedState(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations(strictInstance("i-unheld", "stopped"))))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	require.NoError(t, err)
-	require.Len(t, out.Reservations, 1)
-	inst := out.Reservations[0].Instances[0]
-	assert.Equal(t, "i-unheld", aws.StringValue(inst.InstanceId))
-	assert.Equal(t, "stopped", aws.StringValue(inst.State.Name))
-}
-
-// A node's answer replaces the recorded view of the instance it holds.
-func TestDescribeAccountInstancesStrict_NodeAnswersAreJoinedOntoRecords(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations(strictInstance("i-held", "pending"))))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", mustMarshalDescribeOutput(t,
-		strictReservations(strictInstance("i-held", "running"))))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	require.NoError(t, err)
-	states := map[string]string{}
-	for _, res := range out.Reservations {
-		for _, inst := range res.Instances {
-			states[aws.StringValue(inst.InstanceId)] = aws.StringValue(inst.State.Name)
-		}
-	}
-	assert.Equal(t, map[string]string{"i-held": "running"}, states)
-}
-
-// An instance a node reports with no record can come from a lost record write.
-// Returning it or dropping it would both answer for an unproven account.
-func TestDescribeAccountInstancesStrict_NodeOnlyInstanceFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations(strictInstance("i-held", "running"))))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", mustMarshalDescribeOutput(t,
-		strictReservations(strictInstance("i-held", "running"), strictInstance("i-node-only", "running"))))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	require.Error(t, err)
-	assert.Nil(t, out)
-	code, ok := awserrors.ResolveErrorCode(err)
-	require.True(t, ok)
-	assert.Equal(t, awserrors.ErrorServiceUnavailable, code)
-}
-
-// A frame from a node outside the configured set means the expected set is
-// wrong, and a listing built on it could omit that node's instances.
-func TestDescribeAccountInstancesStrict_FrameFromUnconfiguredNodeFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations()))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-stray", mustMarshalDescribeOutput(t, strictReservations(strictInstance("i-on-stray", "running"))))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	assertIncompleteListing(t, out, err)
-}
-
-// A stray node that answers with an error is still a node outside the set, and
-// its instances are unaccounted for.
-func TestDescribeAccountInstancesStrict_ErrorFromUnconfiguredNodeFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations()))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-stray", awserrors.GenerateErrorPayload(awserrors.ErrorServerInternal))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	assertIncompleteListing(t, out, err)
-}
-
-// The configured nodes answer at once, so a reply that lands later but inside
-// the fan-out deadline must still be seen.
-func TestDescribeAccountInstancesStrict_LateFrameFromUnconfiguredNodeFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations()))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	late := mustMarshalDescribeOutput(t, strictReservations(strictInstance("i-on-stray", "running")))
-	_, err := nc.Subscribe("ec2.DescribeInstances", func(msg *nats.Msg) {
-		time.AfterFunc(600*time.Millisecond, func() {
-			reply := nats.NewMsg(msg.Reply)
-			reply.Data = late
-			reply.Header.Set(natsmsg.NodeIDHeader, "node-stray")
-			_ = msg.RespondMsg(reply)
-		})
-	})
-	require.NoError(t, err)
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	assertIncompleteListing(t, out, err)
-}
-
-// A record with no instance ID cannot be listed or counted, so it must fail
-// the read rather than vanish from it.
-func TestDescribeAccountInstancesStrict_RecordWithoutInstanceIDFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations(&ec2.Instance{State: &ec2.InstanceState{Name: aws.String("stopped")}})))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	assertIncompleteListing(t, out, err)
-}
-
-func TestDescribeAccountInstancesStrict_ConfiguredNodeSilentFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations()))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1", "node-2")
-
-	assertIncompleteListing(t, out, err)
-}
-
-func TestDescribeAccountInstancesStrict_RecordStoreErrorFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, awserrors.GenerateErrorPayload(awserrors.ErrorServerInternal))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	assertIncompleteListing(t, out, err)
-}
-
-func TestDescribeAccountInstancesStrict_RecordStoreSilentFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	assertIncompleteListing(t, out, err)
-}
-
-func TestDescribeAccountInstancesStrict_UnknownNodeSetFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations()))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	nc.Flush()
-
-	out, err := strictList(nc)
-
-	assertIncompleteListing(t, out, err)
-}
-
-func TestDescribeAccountInstancesStrict_UnattributedFrameFails(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeAccountRecords(t, nc, mustMarshalDescribeOutput(t, strictReservations()))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "", []byte(`{}`))
-	nc.Flush()
-
-	out, err := strictList(nc, "node-1")
-
-	assertIncompleteListing(t, out, err)
-}

spinifex/domains/ec2/awsapi/instance/DescribeInstanceAttribute.go

@@ -80,5 +80,5 @@ func DescribeInstanceAttribute(ctx context.Context, input *ec2.DescribeInstanceA
 	// terraform retries cleanly.
 	slog.WarnContext(ctx, "DescribeInstanceAttribute: instance absent or no responses",
 		"instance_id", *input.InstanceId, "received", sum.Received, "expected", expectedNodes)
-	return nil, awserrors.IDNotFound(awserrors.ErrorInvalidInstanceIDNotFound, "instance", *input.InstanceId)
+	return nil, errors.New(awserrors.ErrorInvalidInstanceIDNotFound)
 }

spinifex/domains/ec2/awsapi/instance/DescribeInstanceAttribute_test.go

@@ -184,7 +184,7 @@ func TestDescribeInstanceAttribute_AllNodesNotFound(t *testing.T) {
 
 	_, err = DescribeInstanceAttribute(context.Background(), input, nc, 2, "123456789012")
 	require.Error(t, err)
-	assert.EqualError(t, err, "The instance ID 'i-missing' does not exist: "+awserrors.ErrorInvalidInstanceIDNotFound)
+	assert.Equal(t, awserrors.ErrorInvalidInstanceIDNotFound, err.Error())
 }
 
 // TestDescribeInstanceAttribute_ClientErrorPropagates ensures that a
@@ -254,7 +254,7 @@ func TestDescribeInstanceAttribute_NoResponders(t *testing.T) {
 	duration := time.Since(start)
 
 	require.Error(t, err)
-	assert.EqualError(t, err, "The instance ID 'i-nowhere' does not exist: "+awserrors.ErrorInvalidInstanceIDNotFound)
+	assert.Equal(t, awserrors.ErrorInvalidInstanceIDNotFound, err.Error())
 	// Must not block the caller past the 3 s deadline.
 	assert.Less(t, duration, 4*time.Second)
 }

spinifex/domains/ec2/awsapi/instance/DescribeInstanceTypes.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/mulgadc/spinifex/spinifex/foundation/aws/identifiers"
 	"github.com/mulgadc/spinifex/spinifex/foundation/messaging/nats"
 	"log/slog"
 	"sort"
@@ -75,7 +74,12 @@ func DescribeInstanceTypes(ctx context.Context, input *ec2.DescribeInstanceTypes
 		}
 	}
 
-	requestedTypes := identifiers.Set(input.InstanceTypes)
+	requestedTypes := make(map[string]bool)
+	for _, it := range input.InstanceTypes {
+		if it != nil {
+			requestedTypes[*it] = true
+		}
+	}
 
 	var finalInstanceTypes []*ec2.InstanceTypeInfo
 	if showCapacity {

spinifex/domains/ec2/awsapi/instance/DescribeInstances.go

@@ -126,7 +126,7 @@ func DescribeInstancesChecked(ctx context.Context, input *ec2.DescribeInstancesI
 		missing := missingInstanceIDs(reservations, input.InstanceIds)
 		if len(missing) > 0 {
 			if complete {
-				return nil, awserrors.IDsNotFound(awserrors.ErrorInvalidInstanceIDNotFound, "instance", missing)
+				return nil, errors.New(awserrors.ErrorInvalidInstanceIDNotFound)
 			}
 			// An incomplete sweep cannot prove absence, so a missing id is
 			// unresolved, not gone. NotFound would be a false negative and an

spinifex/domains/ec2/awsapi/instance/DescribeInstances_current_behaviour_test.go

@@ -1,63 +0,0 @@
-package instance
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	natsmsg "github.com/mulgadc/spinifex/spinifex/foundation/messaging/nats"
-	"github.com/nats-io/nats.go"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// Pins today: the completeness judge merges the reservations of a frame from a
-// node outside the configured set and still reports the listing complete. The
-// stray node is never named, so a silent unconfigured node cannot be told from
-// one that does not exist.
-func TestCurrentBehaviour_JudgeIdentityCompleteness_FrameFromUnconfiguredNodeIsMerged(t *testing.T) {
-	t.Parallel()
-	stray := mustMarshalDescribeOutput(t, &ec2.DescribeInstancesOutput{
-		Reservations: []*ec2.Reservation{{ReservationId: aws.String("r-stray"), Instances: []*ec2.Instance{{InstanceId: aws.String("i-on-stray")}}}},
-	})
-	frames := []natsmsg.Frame{
-		{NodeID: "node-1", Data: []byte(`{}`)},
-		{NodeID: "node-stray", Data: stray},
-	}
-
-	reservations, complete := judgeIdentityCompleteness(context.Background(), frames, natsmsg.Summary{}, []string{"node-1"})
-
-	assert.True(t, complete, "CURRENT: a node outside nodeIDs does not make the listing incomplete")
-	require.Len(t, reservations, 1)
-	assert.Equal(t, "i-on-stray", *reservations[0].Instances[0].InstanceId,
-		"CURRENT: the unconfigured node's instances are merged into the result")
-}
-
-// Pins today: the fan-out counts every identified frame toward the expected
-// responders, so a stray frame can end collection before a configured node has
-// answered. The listing then refuses, which fails closed, but for a node that
-// was only slow.
-func TestCurrentBehaviour_DescribeAccountInstancesComplete_StrayFrameConsumesAResponderSlot(t *testing.T) {
-	t.Parallel()
-	_, nc := startTestNATSServer(t)
-	subscribeEmptyInstanceBuckets(t, nc)
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-1", []byte(`{}`))
-	subscribeAsNode(t, nc, "ec2.DescribeInstances", "node-stray", []byte(`{}`))
-	_, err := nc.Subscribe("ec2.DescribeInstances", func(msg *nats.Msg) {
-		time.AfterFunc(500*time.Millisecond, func() {
-			reply := nats.NewMsg(msg.Reply)
-			reply.Data = []byte(`{}`)
-			reply.Header.Set(natsmsg.NodeIDHeader, "node-2")
-			_ = msg.RespondMsg(reply)
-		})
-	})
-	require.NoError(t, err)
-	nc.Flush()
-
-	output, err := DescribeAccountInstancesComplete(context.Background(), nc, []string{"node-1", "node-2"}, "123456789012",
-		WithFanoutTimeout(3*time.Second))
-
-	assertIncompleteListing(t, output, err)
-}

spinifex/domains/ec2/awsapi/instance/DescribeInstances_test.go

@@ -448,13 +448,11 @@ func TestDescribeInstancesChecked_ExplicitIDNotFound_CompleteSweep(t *testing.T)
 	require.NoError(t, err)
 	nc.Flush()
 
-	input := &ec2.DescribeInstancesInput{InstanceIds: aws.StringSlice([]string{"i-doesnotexist0000000", "i-real", "i-doesnotexist0000001"})}
+	input := &ec2.DescribeInstancesInput{InstanceIds: []*string{aws.String("i-doesnotexist0000000")}}
 	_, err = DescribeInstancesChecked(context.Background(), input, nc, 1, nil, "123456789012")
 
-	code, message, ok := awserrors.ResolveErrorDetail(err)
-	require.True(t, ok, "err = %v", err)
-	assert.Equal(t, awserrors.ErrorInvalidInstanceIDNotFound, code)
-	assert.Equal(t, "The instance IDs 'i-doesnotexist0000000, i-doesnotexist0000001' do not exist", message)
+	require.Error(t, err)
+	assert.Equal(t, awserrors.ErrorInvalidInstanceIDNotFound, err.Error())
 }
 
 // TestDescribeInstances_ExplicitIDNotFound_StaysSilent guards the internal
@@ -626,7 +624,8 @@ func TestDescribeInstancesChecked_Identity_AllNodesAnswer_NotFoundAsserted(t *te
 	_, err := DescribeInstancesChecked(context.Background(), input, nc, 0, []string{"node-1", "node-2"}, "123456789012",
 		WithFanoutTimeout(2*time.Second))
 
-	assert.True(t, awserrors.IsErrorCode(err, awserrors.ErrorInvalidInstanceIDNotFound), "err = %v", err)
+	require.Error(t, err)
+	assert.Equal(t, awserrors.ErrorInvalidInstanceIDNotFound, err.Error())
 }
 
 // A node answering with a decodable error envelope never becomes a valid
@@ -685,7 +684,7 @@ func TestDescribeInstancesChecked_Identity_NilReservationsIsValidResponder(t *te
 		WithFanoutTimeout(2*time.Second))
 
 	require.Error(t, err, "a nil-Reservations node is a complete, valid responder, so the sweep is complete and NotFound must fire")
-	assert.True(t, awserrors.IsErrorCode(err, awserrors.ErrorInvalidInstanceIDNotFound), "err = %v", err)
+	assert.Equal(t, awserrors.ErrorInvalidInstanceIDNotFound, err.Error())
 }
 
 // An empty nodeIDs falls back to the legacy expectedNodes path, which the

spinifex/domains/ec2/awsapi/instance/GetConsoleOutput.go

@@ -47,7 +47,7 @@ func GetConsoleOutput(ctx context.Context, input *ec2.GetConsoleOutputInput, nat
 	if err != nil {
 		// No daemon subscription or timeout: stopped/terminated/non-existent instances all surface as NotFound.
 		if errors.Is(err, nats.ErrNoResponders) || errors.Is(err, nats.ErrTimeout) {
-			return nil, awserrors.IDNotFound(awserrors.ErrorInvalidInstanceIDNotFound, "instance", *input.InstanceId)
+			return nil, errors.New(awserrors.ErrorInvalidInstanceIDNotFound)
 		}
 		return nil, fmt.Errorf("failed to get console output: %w", err)
 	}

spinifex/domains/ec2/awsapi/instance/GetPasswordData.go

@@ -52,7 +52,7 @@ func GetPasswordData(ctx context.Context, input *ec2.GetPasswordDataInput, natsC
 	if err != nil {
 		// No daemon subscription or timeout: stopped/terminated/non-existent instances all surface as NotFound.
 		if errors.Is(err, nats.ErrNoResponders) || errors.Is(err, nats.ErrTimeout) {
-			return nil, awserrors.IDNotFound(awserrors.ErrorInvalidInstanceIDNotFound, "instance", *input.InstanceId)
+			return nil, errors.New(awserrors.ErrorInvalidInstanceIDNotFound)
 		}
 		return nil, fmt.Errorf("failed to get password data: %w", err)
 	}