mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 03:38:23 +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>
67 lines
1.7 KiB
Python
67 lines
1.7 KiB
Python
from __future__ import annotations
|
|
|
|
import argparse
|
|
import os
|
|
|
|
from .build import handler as build_handler
|
|
from .common import make_compose
|
|
|
|
|
|
def add_parser(sub: argparse._SubParsersAction) -> None:
|
|
p = sub.add_parser("up", help="Start compose stack (coredns + infinito).")
|
|
p.add_argument(
|
|
"--skip-entry-init",
|
|
action="store_true",
|
|
help="Do not run /opt/src/infinito/scripts/docker/entry.sh true after stack is up.",
|
|
)
|
|
p.add_argument(
|
|
"--when-down",
|
|
action="store_true",
|
|
help="Only start stack if it is not already running.",
|
|
)
|
|
p.set_defaults(_handler=handler)
|
|
|
|
|
|
def _maybe_build_missing() -> int:
|
|
# CI: never build (image is pulled). Local: build if missing.
|
|
if os.environ["INFINITO_NO_BUILD"] == "1":
|
|
return 0
|
|
|
|
build_args = argparse.Namespace(
|
|
missing=True,
|
|
no_cache=False,
|
|
target="",
|
|
tag="",
|
|
push=False,
|
|
publish=False,
|
|
registry="",
|
|
owner="",
|
|
repo_prefix="",
|
|
version="",
|
|
stable="",
|
|
)
|
|
|
|
return int(build_handler(build_args))
|
|
|
|
|
|
def _stack_is_running() -> bool:
|
|
compose = make_compose()
|
|
r = compose.run(["ps", "-q", "infinito"], check=False, capture=True)
|
|
cid = (r.stdout or "").strip()
|
|
return bool(cid)
|
|
|
|
|
|
def handler(args: argparse.Namespace) -> int:
|
|
# when-down: skip if already running
|
|
if args.when_down and _stack_is_running():
|
|
print(">>> Stack already running — skipping up")
|
|
return 0
|
|
|
|
rc = _maybe_build_missing()
|
|
if rc != 0:
|
|
return rc
|
|
|
|
compose = make_compose()
|
|
compose.up(run_entry_init=not bool(args.skip_entry_init))
|
|
return 0
|