Files
computer-playbook/utils/inventory/bundle_apps.py
T
kevinveenbirkenbachandClaude Opus 4.7 8e293bd921 fix(compose-deploy): stop persisting runtime routing knobs into .env
Root cause of step-08 deploy failures across all 4 test-development
distros in run 26572559126: `make compose-deploy mode=reinstall
apps=web-app-dashboard INFINITO_SERVICES_DISABLED=matomo` (step 07)
made make export the cmdline var into the recipe's shell env, which
reached `runner.py` → `make setup` → `make dotenv`. The dotenv
generator's `setdefault` then baked the runtime-only value into the
on-disk `.env`. Step 08 sourced that .env, filtered `web-app-matomo`
out of its primary apps, and exited with "All primary apps disabled".

Fix:

- Drop the 7 routing knobs (apps, mode, purge, bundles, disable,
  full_cycle, variant) from `passthrough.STATIC_KEYS` and from
  `default.env`. They are per-invocation; .env is the persistent SPOT
  and must not capture them.
- Switch every consumer from `os.environ["KEY"]` strict access to
  `os.environ.get("KEY", "")` so the missing-key path stops at "no
  filter" instead of a KeyError.
- Rename the env-var surface to match the make-alias surface 1:1
  (lowercase): INFINITO_APPS → apps, INFINITO_SERVICES_DISABLED →
  disable, INFINITO_BUNDLES → bundles, INFINITO_FULL_CYCLE →
  full_cycle, INFINITO_VARIANT → variant, INFINITO_DEPLOY_MODE → mode,
  INFINITO_PURGE_ENTITIES → purge. The make alias was the user-facing
  name in every doc; routing-knob env vars now use the same name so
  the cmdline form, the recipe env-prefix, and the consumer reads
  all line up.
- Collapse the Makefile `compose-deploy` recipe to just the two
  knobs whose alias differs from the env name (`type` →
  INFINITO_DEPLOY_TYPE, `debug` → INFINITO_DEBUG). GNU Make
  auto-exports cmdline variables into the recipe's shell env, so the
  identical-name `$(if $(apps),apps="$(apps)")` lines were pure
  noise.
- Drop `disable: ${disable}` from compose.yml. The dev CLI builds
  `extra_env` per `docker exec` call and forwards `disable` via
  `-e`, so the container env never needs the value frozen at
  compose-up time.
- Update the 3 actual leak call sites
  (07/08/09_deploy_*.sh) to the make-alias form
  (`disable=matomo`, `full_cycle=true`, `variant=1`).
- Add `SIM112` to ruff's ignore set: the lowercase env names are
  the deliberate make/env parity, not a typo.

Repro before fix: `INFINITO_SERVICES_DISABLED=matomo make dotenv`
wrote `INFINITO_SERVICES_DISABLED=matomo` to `.env`. After fix:
`disable=matomo make dotenv` leaves `.env` untouched.

Tests: `make test` and `make autoformat` green (2711 tests, 8 lint
sub-targets).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-28 17:47:03 +02:00

107 lines
2.9 KiB
Python

"""
Resolve and aggregate role groups (apps) from one or more inventory bundles.
Bundles live under ``inventories/bundles/{servers,workstations}/<name>/inventory.yml``.
Each bundle declares the role groups it activates beneath ``all.children``.
Invoked from ``scripts/tests/deploy/local/deploy/bundles/fresh.sh`` to feed the `apps` env var into
the existing fresh-purged deploy flow:
python -m utils.inventory.bundle_apps education-suite,startup-essentials
"""
from __future__ import annotations
import argparse
import sys
from typing import TYPE_CHECKING
from utils import PROJECT_ROOT
from utils.cache.yaml import load_yaml
if TYPE_CHECKING:
from collections.abc import Iterable
from pathlib import Path
SEARCH_DIRS = (
PROJECT_ROOT / "inventories" / "bundles" / "servers",
PROJECT_ROOT / "inventories" / "bundles" / "workstations",
)
def _split_csv(raw: str) -> list[str]:
return [item.strip() for item in raw.split(",") if item.strip()]
def _locate(bundle: str) -> Path | None:
for base in SEARCH_DIRS:
candidate = base / bundle / "inventory.yml"
if candidate.is_file():
return candidate
return None
def resolve(bundles: Iterable[str]) -> list[str]:
"""Return deduplicated role-group names from the given bundle inventories.
Raises FileNotFoundError if any bundle is missing.
"""
apps: list[str] = []
seen: set[str] = set()
missing: list[str] = []
for bundle in bundles:
inventory = _locate(bundle)
if inventory is None:
missing.append(bundle)
continue
data = load_yaml(inventory, default_if_missing={}) or {}
children = (data.get("all") or {}).get("children") or {}
for app in children:
if app in seen:
continue
seen.add(app)
apps.append(app)
if missing:
raise FileNotFoundError(
"bundle(s) not found under inventories/bundles/"
"{servers,workstations}: " + ", ".join(missing)
)
return apps
def main(argv: list[str] | None = None) -> int:
parser = argparse.ArgumentParser(
prog="utils.inventory.bundle_apps",
description="Aggregate role groups from inventory bundles into a CSV.",
)
parser.add_argument(
"bundles",
help="Comma-separated bundle names (e.g. education-suite,startup-essentials).",
)
args = parser.parse_args(argv)
names = _split_csv(args.bundles)
if not names:
sys.stderr.write("ERROR: no bundle names provided\n")
return 2
try:
apps = resolve(names)
except FileNotFoundError as exc:
sys.stderr.write(f"ERROR: {exc}\n")
return 2
if not apps:
sys.stderr.write("ERROR: no role groups resolved from bundles\n")
return 2
sys.stdout.write(",".join(apps) + "\n")
return 0
if __name__ == "__main__":
sys.exit(main())