mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-09 04:06:42 +00:00
kevinveenbirkenbachandClaude Opus 4.7
eb4bcd23a8
Three new lint tests close gaps in the INFINITO_* SPOT contract:
* tests/lint/filesystem/env/test_default_env_keys_handled.py
Every default.env key must be wired through a handler.
* tests/lint/filesystem/env/test_used_keys_declared.py
Every INFINITO_* in .sh/.py must live in env/{default,ci}.env or
a handler; per-line `# nocheck:` suppresses runtime-only refs.
* tests/lint/filesystem/python/test_no_infinito_get_defaults.py
Forbid ANY default in `.get("INFINITO_*", ...)` -- including the
empty-string fallback (which silently masks an unset key). The
nocheck check walks every physical line the call spans so an
autoformat-split call still honours the marker.
Cache namespace flattens to a single prefix:
INFINITO_PACKAGE_CACHE_* -> INFINITO_CACHE_PACKAGE_*
INFINITO_REGISTRY_CACHE_* -> INFINITO_CACHE_REGISTRY_*
The five previously driver-injected paths (APT_LIST, NPMRC,
PIP_CONF, REGISTRY_PROXY_CONF, FRONTEND_CA_FILE) move into
env/default.env and passthrough.STATIC_KEYS; the
`cache_env_overrides()` helper and its two call sites are gone
along with the test-fixture override for FRONTEND_CA_DIR.
SPOT-strict rewrites:
- 19 sites: `something.get("INFINITO_X", "")` -> subscript
`something["INFINITO_X"]` (loud KeyError when env loader did
not run; all keys live in env/default.env).
- 2 handler-internal bootstrap reads suppressed with
`# nocheck: handler-bootstrap-read`.
- 30 runtime-only / driver-injected / test-fixture references
annotated with `# nocheck: <reason>` per-line.
- Unit tests that previously removed SPOT-guaranteed keys via
`{k: v ... if k \!= KEY}` or `clear=True` switch to setting
the key to "" explicitly, matching the new contract.
Side fixes:
- INFINITO_DNS_DOMAIN + INFINITO_DNS_HOSTS_FILE move from
shell-side defaults in common.sh to env/default.env and
passthrough.STATIC_KEYS.
- dns_systemd_is_operational() drops the dead
INFINITO_DNS_FORCE_HOSTS_FALLBACK override branch (the
variable was never set anywhere).
- INFINITO_WORKER_FETCH switches from `os.environ.get(KEY, "1")`
to `os.environ[KEY]`.
- scripts/tests/code/wrapper.sh exec args move into a bash
array so `# nocheck:` on INFINITO_TEST_TYPE can live on its
own element line (SC2215 fix).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
71 lines
2.5 KiB
Bash
Executable File
71 lines
2.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# shellcheck shell=bash
|
|
#
|
|
# Wipe the on-disk caches that the `cache` compose profile populates:
|
|
# the rpardini/docker-registry-proxy mirror + MITM CA, and the
|
|
# Sonatype Nexus 3 OSS data dir. Both live under /var/cache/infinito/
|
|
# core/<service>/ by default; the per-cache env scripts under
|
|
# scripts/meta/env/cache/ are sourced first so a custom HOST_PATH
|
|
# from the developer's environment is honoured.
|
|
#
|
|
# Removing the directories is enough: docker compose recreates them
|
|
# on the next `up` thanks to `bind: { create_host_path: true }`. For
|
|
# the Nexus side, the next bootstrap rotates a fresh admin password
|
|
# and re-creates blobstore + proxy repos.
|
|
#
|
|
# Use `make cache-clean` rather than calling this script directly.
|
|
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
REPO_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
|
|
cd "${REPO_ROOT}"
|
|
|
|
# shellcheck source=scripts/meta/env/load.sh
|
|
source "scripts/meta/env/load.sh"
|
|
# shellcheck source=scripts/meta/env/load.sh
|
|
source "scripts/meta/env/load.sh"
|
|
|
|
# Stop any running cache containers first so wipe is safe (a running
|
|
# Nexus would re-create files mid-rm). `docker compose down` of the
|
|
# whole stack would also kill the runner, which is too destructive;
|
|
# scope to the two cache services explicitly.
|
|
if docker ps --format '{{.Names}}' | grep -qE '^infinito-(registry|package)-cache$'; then
|
|
echo "[cache-clean] stopping infinito-registry-cache + infinito-package-cache"
|
|
docker stop infinito-registry-cache infinito-package-cache 2>/dev/null || true
|
|
docker rm infinito-registry-cache infinito-package-cache 2>/dev/null || true
|
|
fi
|
|
|
|
PATHS=(
|
|
"${INFINITO_CACHE_REGISTRY_HOST_PATH}"
|
|
"${INFINITO_CACHE_REGISTRY_CA_HOST_PATH}"
|
|
"${INFINITO_CACHE_PACKAGE_HOST_PATH}"
|
|
)
|
|
|
|
# Remove each cache path individually (keeps the parent /var/cache/
|
|
# infinito/ dir alive so other future cache services can co-locate).
|
|
# Use sudo when the path is root-owned (Nexus chowns its data dir to
|
|
# uid 200 for the in-container nexus user) so the rm does not silently
|
|
# leave half-deleted state behind.
|
|
remove_path() {
|
|
local p="$1"
|
|
[[ -z "${p}" ]] && return 0
|
|
if [[ ! -e "${p}" ]]; then
|
|
echo "[cache-clean] not present, skipping: ${p}"
|
|
return 0
|
|
fi
|
|
if [[ -w "${p}" ]] || [[ -O "${p}" ]]; then
|
|
echo "[cache-clean] removing: ${p}"
|
|
rm -rf -- "${p}"
|
|
else
|
|
echo "[cache-clean] removing (sudo): ${p}"
|
|
sudo rm -rf -- "${p}"
|
|
fi
|
|
}
|
|
|
|
remove_path "${PATHS[0]}"
|
|
remove_path "${PATHS[1]}"
|
|
remove_path "${PATHS[2]}"
|
|
|
|
echo "[cache-clean] done. Re-run 'make up' to recreate empty caches."
|