Files
computer-playbook/cli/administration/deploy/development/init.py
T
kevinveenbirkenbachandClaude Opus 4.7 eb4bcd23a8 refactor(env/spot): forbid .get() defaults + cache namespace rename
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>
2026-05-20 22:26:16 +02:00

207 lines
7.2 KiB
Python

from __future__ import annotations
import json
import os
from typing import TYPE_CHECKING, Any
from cli.administration.inventory.provision.services_disabler import (
find_provider_roles,
parse_services_disabled,
)
from cli.meta.runtime import detect_runtime
from .common import make_compose
from .inventory import (
DevInventorySpec,
build_dev_inventory,
filter_plan_to_variant,
plan_dev_inventory_matrix,
)
from .storage import detect_storage_constrained
if TYPE_CHECKING:
import argparse
def add_parser(sub: argparse._SubParsersAction) -> None:
p = sub.add_parser(
"init",
help="Create development inventory inside the infinito container.",
)
p.add_argument(
"--inventory-dir",
default=os.environ.get("INFINITO_INVENTORY_DIR"),
required=os.environ.get("INFINITO_INVENTORY_DIR") is None,
help=(
"Inventory directory base (default: $INFINITO_INVENTORY_DIR). "
"When the included apps declare more than one matrix-deploy "
"variant, sibling folders `<dir>-0`, `<dir>-1`, ... are "
"created; otherwise the directory is used as-is."
),
)
g = p.add_mutually_exclusive_group(required=True)
g.add_argument(
"--apps",
help="One or more application ids (will include run_after deps automatically).",
)
g.add_argument(
"--include",
help="Comma-separated list of application ids to include (no deps resolution).",
)
p.add_argument(
"--threshold-gib",
type=int,
default=100,
help="Free-space threshold (GiB) below which STORAGE_CONSTRAINED is enabled (default: 100).",
)
p.add_argument(
"--force-storage-constrained",
choices=["true", "false"],
default=None,
help="Override storage detection explicitly.",
)
p.add_argument(
"--vars",
default=None,
help="JSON object merged into inventory variables (overrides win).",
)
p.add_argument(
"--variant",
type=int,
default=_env_variant(),
help=(
"Pin the matrix init to a single round (zero-based index). "
"Useful when only one variant of a multi-variant app needs to "
"be (re-)materialised. Defaults to the INFINITO_VARIANT "
"environment variable when set, otherwise full-matrix mode."
),
)
p.set_defaults(_handler=handler)
def _env_variant() -> int | None:
raw = os.environ["INFINITO_VARIANT"].strip()
if not raw:
return None
try:
return int(raw)
except ValueError:
raise SystemExit(
f"INFINITO_VARIANT environment variable must be an integer, got {raw!r}"
) from None
def handler(args: argparse.Namespace) -> int:
compose = make_compose()
# `primary_apps` is the user-facing app list before transitive resolution.
# The variant-aware planner expands each round's full include set
# itself (services edges depend on variant-merged services maps), so
# init no longer pre-resolves run_after / service deps here.
if args.apps:
primary_apps = [
x.strip() for x in args.apps.replace(",", " ").split() if x.strip()
]
else:
primary_apps = [x.strip() for x in (args.include or "").split(",") if x.strip()]
if not primary_apps:
raise SystemExit("Primary app list is empty")
# INFINITO_SERVICES_DISABLED removes provider roles from the inventory at
# `infinito administration inventory provision` time anyway, so do the same filter on
# the primary list here. Otherwise the variant-aware resolver would
# still pull a disabled provider in via service edges, only to have
# the inventory step strip it back out — leaving the round's
# include list inconsistent with what the inventory actually
# contains.
raw_disabled = os.environ["INFINITO_SERVICES_DISABLED"].strip()
disabled_app_ids: set[str] = set()
if raw_disabled:
services = parse_services_disabled(raw_disabled)
roles_dir = compose.repo_root / "roles"
provider_map = find_provider_roles(services, roles_dir)
disabled_app_ids = set(provider_map.values())
primary_apps = [a for a in primary_apps if a not in disabled_app_ids]
if not primary_apps:
raise SystemExit(
"All primary apps disabled by INFINITO_SERVICES_DISABLED — nothing to initialise"
)
extra_vars: dict[str, Any] | None = None
if args.vars is not None:
try:
parsed = json.loads(args.vars)
except Exception as exc:
raise SystemExit(f"--vars must be valid JSON: {exc}") from exc
if not isinstance(parsed, dict):
raise SystemExit("--vars must be a JSON object")
extra_vars = parsed
if args.force_storage_constrained is not None:
storage_constrained = args.force_storage_constrained == "true"
else:
storage_constrained = detect_storage_constrained(
compose, threshold_gib=int(args.threshold_gib)
)
plan = plan_dev_inventory_matrix(
roles_dir=str(compose.repo_root / "roles"),
primary_apps=primary_apps,
base_inventory_dir=str(args.inventory_dir),
)
try:
plan = filter_plan_to_variant(plan, args.variant)
except ValueError as exc:
raise SystemExit(f"--variant: {exc}") from exc
runtime = os.environ.get("RUNTIME") or detect_runtime()
services_disabled = os.environ["INFINITO_SERVICES_DISABLED"]
for _round_index, inv_dir, round_variants, include_R, _purge_set in plan:
round_include = tuple(
role for role in include_R if role not in disabled_app_ids
)
if not round_include:
print(
f">>> Skipping inventory at {inv_dir}: include set is empty "
"after INFINITO_SERVICES_DISABLED filter"
)
continue
spec = DevInventorySpec(
inventory_dir=inv_dir,
include=round_include,
storage_constrained=storage_constrained,
runtime=runtime,
extra_vars=extra_vars,
services_disabled=services_disabled,
active_variants=round_variants,
)
build_dev_inventory(compose, spec)
if len(plan) == 1:
_, inv_dir, round_variants, include_R, _purge_set = plan[0]
non_zero = {a: i for a, i in round_variants.items() if i}
suffix = f" variants={non_zero}" if non_zero else ""
print(
f">>> Inventory initialized at {inv_dir} "
f"(include={','.join(include_R)} "
f"storage_constrained={storage_constrained}){suffix}"
)
else:
print(
f">>> Matrix inventory initialized in {len(plan)} folders "
f"(primary_apps={','.join(primary_apps)} "
f"storage_constrained={storage_constrained}):"
)
for round_index, inv_dir, round_variants, include_R, _purge_set in plan:
non_zero = {a: i for a, i in round_variants.items() if i}
print(
f" [round {round_index}] {inv_dir} "
f"include={','.join(include_R)}"
+ (f" variants={non_zero}" if non_zero else "")
)
return 0