Files
computer-playbook/utils/cache/applications.py
T
kevinveenbirkenbachandClaude Opus 4.8 6ce6780575 refactor(meta): split server.yml into csp/domains/networks.yml
Extract the csp, domains, and networks blocks out of roles/*/meta/server.yml
into dedicated meta files, each mapping to its own top-level applications key
via the recursive meta-walk:

  csp:      -> meta/csp.yml      -> applications.<app>.csp
  domains:  -> meta/domains.yml  -> applications.<app>.domains
  networks: -> meta/networks.yml -> applications.<app>.networks

Residual nginx/proxy keys (status_codes, client_max_body_size, locations,
ip6_enabled, config_upstream_url) stay in server.yml; an emptied server.yml is
deleted. 98 server.yml -> 249 new files, 74 deleted.

- Consumers repointed applications.<app>.server.{csp,domains,networks} ->
  applications.<app>.{csp,domains,networks} across templates, vars, tasks,
  lookups and filters.
- Infra readers migrated: canonical_domains_map, application_domain_index,
  build_ldap_role_entries, service-registry overlay discovery,
  roles_with_service, and the file-based readers utils/domains/list.py +
  utils/meta/scan.py (read the now-deleted server.yml directly).
- Detection + mapping: _META_TOPICS gains csp/domains/networks;
  ROLE_FILE_META_{CSP,DOMAINS,NETWORKS} constants + ROLE_FILES entries.
- New self-expiring lint guard (test_server_meta_no_split_fields) fails if a
  server.yml still carries a split field; auto-fails from 2026-12-28 as a
  delete reminder.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-28 22:45:05 +02:00

487 lines
19 KiB
Python

"""Application-domain cache: variants, defaults, merged lookup.
Owns `_APPLICATIONS_DEFAULTS_CACHE`, `_VARIANTS_CACHE`, and
`_MERGED_APPLICATIONS_CACHE`. Public API: `get_application_defaults`,
`get_variants`, `get_merged_applications`. Strictly ansible-free at
import time so the GitHub Actions runner-host CLI path
(`cli.administration.deploy.development.init` -> `plan_dev_inventory_matrix` ->
`get_variants`) keeps working without ansible installed.
"""
from __future__ import annotations
import copy
from collections.abc import Mapping
from typing import TYPE_CHECKING, Any
from plugins.filter.merge_with_defaults import merge_with_defaults
from utils.roles.mapping import ROLE_FILE_META_VARIANTS
from .base import (
_RENDER_GUARD,
_cache_key,
_deep_merge,
_render_with_templar,
_resolve_override_mapping,
_resolve_roles_dir,
_stable_variables_signature,
)
from .schema_credentials import extract_default_credentials
from .yaml import load_yaml as _load_yaml_cached
from .yaml import load_yaml_any as _load_yaml_any_cached
if TYPE_CHECKING:
import os
from pathlib import Path
_APPLICATIONS_DEFAULTS_CACHE: dict[str, dict[str, Any]] = {}
_VARIANTS_CACHE: dict[str, dict[str, list[Any]]] = {}
_VARIANT_OVERRIDES_ONLY_CACHE: dict[str, dict[str, list[dict[str, Any]]]] = {}
_MERGED_APPLICATIONS_CACHE: dict[tuple, dict[str, Any]] = {}
# Canonical `meta/volumes.yml` dict-of-dicts kept OUT of the templar render
# on purpose: the entries hold raw Jinja strings (`source:
# "{{ lookup('container', ...) }}"`) that `compose_volumes` /
# `container_volumes` emit verbatim into the rendered compose template where
# Ansible resolves them at deploy time. If `_render_with_templar` walked them
# it would either explode (236 roles x deep Jinja) or recurse (volume Jinja
# re-enters applications). `get_merged_applications` re-attaches this raw
# subtree onto `applications.<app>.volumes` AFTER the render, so the merged
# SPOT carries volumes unrendered. Keyed by role name; value is the canonical
# dict-of-dicts itself (semantic_name -> entry). Populated alongside
# `_APPLICATIONS_DEFAULTS_CACHE`.
_CANONICAL_VOLUMES_BY_ROLE: dict[str, dict[str, Any]] = {}
# The file root IS the value of `applications.<app>.<topic>`; there is NO
# wrapping key matching the filename.
_META_TOPICS: tuple[str, ...] = (
"server",
"rbac",
"services",
"volumes",
"csp",
"domains",
"networks",
)
_META_ADDONS_DIR: str = "addons"
# Top-level `meta/<name>.yml` files the generic tree-walk must NOT place
# verbatim: `main`/`variants` are ansible/build mechanism (never app config);
# `volumes`/`schema`/`users` are reshaped by the bespoke blocks below
# (volumes carve-out to a sibling registry, schema->credentials,
# users->lookup rewrite). `addons/` is a directory, assembled separately.
_META_NON_GENERIC_TOPICS: frozenset[str] = frozenset(
{"main", "variants", "volumes", "schema", "users"}
)
def _normalize_addons(addons: Any) -> Any:
"""Normalise the `meta/addons/` map's enable state at load time.
The enable contract (the unified addon contract's enable Decisions) is
materialised here so every consumer reads one already-resolved view instead of
re-deriving it: `required: true` defaults to enabled, an optional addon
defaults to disabled, and an explicitly declared `enabled` value (literal
or Jinja) is preserved verbatim. `required` itself is defaulted to
`false` so downstream reads stay uniform.
A new dict is returned per entry; the YAML cache's payload is never
mutated. Malformed (non-mapping) payloads pass through untouched so the
schema lint reports the offence with a precise message.
"""
if not isinstance(addons, Mapping):
return addons
out: dict[str, Any] = {}
for addon_id, spec in addons.items():
if not isinstance(spec, Mapping):
out[addon_id] = spec
continue
normalised = dict(spec)
required = bool(normalised.get("required", False))
normalised["required"] = required
if "enabled" not in normalised:
normalised["enabled"] = required
out[addon_id] = normalised
return out
def _load_addons_dir(meta_dir: Path) -> dict[str, Any]:
"""Assemble the `addons` map from `meta/addons/<addon_id>.yml` files.
Each file's root IS the addon spec; the filename stem is the addon id.
The enable state is normalised (see `_normalize_addons`). A missing or
empty `meta/addons/` directory yields ``{}``.
"""
addons_dir = meta_dir / _META_ADDONS_DIR
if not addons_dir.is_dir():
return {}
raw: dict[str, Any] = {}
for path in sorted(addons_dir.glob("*.yml")):
spec = _load_yaml_cached(path, default_if_missing={})
if spec:
raw[path.stem] = spec
return _normalize_addons(raw)
def _has_application_metadata(role_dir: Path) -> bool:
"""Detect whether a role behaves as an application.
A role is an "application" iff at least one of its `meta/<topic>.yml`
files exists (plus `meta/schema.yml` and `meta/users.yml` for the
schema-only / users-only special cases).
"""
meta_dir = role_dir / "meta"
if not meta_dir.is_dir():
return False
for topic in _META_TOPICS:
if (meta_dir / f"{topic}.yml").is_file():
return True
if (meta_dir / "schema.yml").is_file():
return True
if (meta_dir / "users.yml").is_file():
return True
addons_dir = meta_dir / _META_ADDONS_DIR
return addons_dir.is_dir() and any(addons_dir.glob("*.yml"))
def _assign_nested(root: dict[str, Any], parts: tuple[str, ...], value: Any) -> None:
"""Place *value* at the nested key path *parts* inside *root*, mirroring
the `meta/` directory layout onto `applications.<app>`: ``("addons", "x")``
lands at ``root["addons"]["x"]``. A non-dict value already sitting on an
intermediate segment is replaced by a fresh dict so a deeper file always
wins its own path.
"""
node = root
for key in parts[:-1]:
child = node.get(key)
if not isinstance(child, dict):
child = {}
node[key] = child
node = child
node[parts[-1]] = value
def _build_role_base_config(
role_dir: Path,
roles_dir: Path,
) -> dict[str, Any]:
"""Assemble a role's effective `applications.<app>` payload by walking its
entire `meta/` tree.
Every `meta/**/*.yml` maps to `applications.<app>.<relpath>` (directory
segments become nested keys, the filename stem the leaf), so nested topics
work without per-topic wiring:
`meta/server.yml` → `server`
`meta/rbac.yml` → `rbac`
`meta/services.yml` → `services`
`meta/info.yml` → `info`
`meta/addons/x.yml` → `addons.x`
`meta/a/b/c.yml` → `a.b.c` (any depth)
Bespoke topics are reshaped instead of placed verbatim:
`meta/main.yml`, `meta/variants.yml` → skipped (ansible/build mechanism).
`meta/volumes.yml` → canonical dict-of-dicts parked in
`_CANONICAL_VOLUMES_BY_ROLE` (kept OUT of this payload
so its raw Jinja `source:` strings never hit the
templar; `get_merged_applications` re-attaches them).
`meta/addons/*.yml` → `addons` (enable state normalised by
`_normalize_addons`).
`meta/schema.yml` → `credentials` (only literal `default:` values;
non-defaults come from the inventory apply_schema step
and are merged in by the caller).
`meta/users.yml` → `users` (rewritten to `lookup('users', ...)` so the
user-domain cache stays the source of truth).
Empty role collapses to ``{}`` (no overrides applied).
"""
# Pure-Python GID resolver; importing the ansible-facing LookupModule
# here would break the ansible-free runner-host CLI path.
from plugins.lookup.application_gid import compute_application_gid
application_id = role_dir.name
config_data: dict[str, Any] = {}
meta_dir = role_dir / "meta"
if not meta_dir.is_dir():
return {}
for path in sorted(meta_dir.rglob("*.yml")):
parts = path.relative_to(meta_dir).with_suffix("").parts
if parts[0] == _META_ADDONS_DIR:
continue
if len(parts) == 1 and parts[0] in _META_NON_GENERIC_TOPICS:
continue
data = _load_yaml_cached(path, default_if_missing={})
if data:
_assign_nested(config_data, parts, data)
# Shape-agnostic loader: a stray legacy list must still load for the
# validator's error path. The canonical dict parks in the sibling registry.
volumes_data = _load_yaml_any_cached(
meta_dir / "volumes.yml", default_if_missing={}
)
if isinstance(volumes_data, dict) and volumes_data:
_CANONICAL_VOLUMES_BY_ROLE[role_dir.name] = volumes_data
addons_data = _load_addons_dir(meta_dir)
if addons_data:
config_data["addons"] = addons_data
schema_data = _load_yaml_cached(meta_dir / "schema.yml", default_if_missing={})
if schema_data:
creds_defaults = extract_default_credentials(
schema_data.get("credentials") or {}
)
if creds_defaults:
config_data["credentials"] = creds_defaults
users_meta = _load_yaml_cached(meta_dir / "users.yml", default_if_missing={})
if isinstance(users_meta, dict) and users_meta:
config_data["users"] = {
user_key: "{{ lookup('users', " + repr(user_key) + ") }}"
for user_key in users_meta
}
if not config_data:
return {}
config_data["group_id"] = compute_application_gid(application_id, str(roles_dir))
return config_data
def _iter_application_role_dirs(roles_dir: Path):
"""Yield application role directories in deterministic alphabetical order."""
for child in sorted(p for p in roles_dir.iterdir() if p.is_dir()):
if _has_application_metadata(child):
yield child
def _load_variants_overrides(path: Path) -> list[dict[str, Any]]:
"""Load a `roles/<role>/meta/variants.yml` variant list through the
shared YAML cache.
Each entry is a deep-merge override for the role's
`meta/services.yml`; ``null`` and ``{}`` are valid no-op entries.
Missing file or empty list collapses to a single empty variant so
the role keeps its pre-variant behaviour.
"""
if not path.exists():
return [{}]
raw = _load_yaml_any_cached(path)
if raw in (None, {}):
return [{}]
if not isinstance(raw, list):
raise TypeError(
f"{path} must contain a YAML list of override mappings (or be empty)."
)
if not raw:
return [{}]
normalised: list[dict[str, Any]] = []
for index, entry in enumerate(raw):
if entry is None:
normalised.append({})
elif isinstance(entry, Mapping):
normalised.append(dict(entry))
else:
raise ValueError(
f"{path}[{index}] must be a mapping (or null); got {type(entry).__name__}"
)
return normalised
def _build_variants(roles_dir: Path) -> dict[str, list[Any]]:
"""Return ``{application_id: [variant_0, variant_1, ...]}``.
Each variant is the role's assembled `meta/<topic>.yml` payload
deep-merged with the corresponding entry from
`roles/<role>/meta/variants.yml`. A missing/empty `meta/variants.yml`
collapses to a single empty variant so the role keeps its pre-variant
behaviour.
"""
variants: dict[str, list[Any]] = {}
for role_dir in _iter_application_role_dirs(roles_dir):
application_id = role_dir.name
base_config = _build_role_base_config(role_dir, roles_dir)
meta_path = role_dir / ROLE_FILE_META_VARIANTS
override_list = _load_variants_overrides(meta_path)
role_variants: list[Any] = []
for override in override_list:
if base_config:
role_variants.append(_deep_merge(base_config, override))
else:
# Role has no meta payload, but a variant list MAY still
# legitimately produce an override-only result. Fall back
# to a deep copy of the override so callers never observe
# shared mutable state.
role_variants.append(copy.deepcopy(override))
variants[application_id] = role_variants
return {key: variants[key] for key in sorted(variants)}
def _build_application_defaults(roles_dir: Path) -> dict[str, Any]:
"""Return ``{application_id: base_config}``, each role's variant-free
``meta/<topic>.yml`` payload only. Variants stay accessible via
:func:`get_variants`. Using variant 0 here would leak its service
flags into variant-N consumers' runtime view via deep-merge."""
defaults: dict[str, Any] = {}
for role_dir in _iter_application_role_dirs(roles_dir):
defaults[role_dir.name] = _build_role_base_config(role_dir, roles_dir)
return {key: defaults[key] for key in sorted(defaults)}
def get_application_defaults(
*, roles_dir: str | os.PathLike[str] | None = None
) -> dict[str, Any]:
resolved_roles_dir = _resolve_roles_dir(roles_dir=roles_dir)
key = _cache_key(resolved_roles_dir)
cached = _APPLICATIONS_DEFAULTS_CACHE.get(key)
if cached is None:
cached = _build_application_defaults(resolved_roles_dir)
_APPLICATIONS_DEFAULTS_CACHE[key] = cached
return copy.deepcopy(cached)
def get_variants(
*, roles_dir: str | os.PathLike[str] | None = None
) -> dict[str, list[Any]]:
"""Return ``{application_id: [variant_0, ...]}`` cached per
``roles_dir``. Each variant is the role's effective configuration
after the corresponding `meta/variants.yml` override has been
deep-merged on top of `meta/services.yml`."""
resolved_roles_dir = _resolve_roles_dir(roles_dir=roles_dir)
key = _cache_key(resolved_roles_dir)
cached = _VARIANTS_CACHE.get(key)
if cached is None:
cached = _build_variants(resolved_roles_dir)
_VARIANTS_CACHE[key] = cached
return copy.deepcopy(cached)
def _build_variant_overrides_only(
roles_dir: Path,
) -> dict[str, list[dict[str, Any]]]:
overrides: dict[str, list[dict[str, Any]]] = {}
for role_dir in _iter_application_role_dirs(roles_dir):
meta_path = role_dir / ROLE_FILE_META_VARIANTS
overrides[role_dir.name] = _load_variants_overrides(meta_path)
return {key: overrides[key] for key in sorted(overrides)}
def get_variant_overrides_only(
*, roles_dir: str | os.PathLike[str] | None = None
) -> dict[str, list[dict[str, Any]]]:
"""Return ``{application_id: [override_0, ...]}``, the raw
`meta/variants.yml` entries per role WITHOUT deep-merging
`meta/services.yml`.
Used by matrix-deploy's `--vars` bake so the host_vars payload
stays sparse: only the variant-specific overrides land there,
leaving `meta/services.yml` fields (notably `image`/`version`)
blank in host_vars so `apply_mirror_overrides` can populate them
from `mirrors.yml`.
"""
resolved_roles_dir = _resolve_roles_dir(roles_dir=roles_dir)
key = _cache_key(resolved_roles_dir)
cached = _VARIANT_OVERRIDES_ONLY_CACHE.get(key)
if cached is None:
cached = _build_variant_overrides_only(resolved_roles_dir)
_VARIANT_OVERRIDES_ONLY_CACHE[key] = cached
return copy.deepcopy(cached)
def get_merged_applications(
*,
variables: dict[str, Any] | None = None,
roles_dir: str | os.PathLike[str] | None = None,
templar: Any = None,
) -> dict[str, Any]:
# Late import keeps `import utils.cache.applications` free of the
# user-domain machinery the runner-host CLI path never needs.
from .users import get_merged_users
variables = variables or {}
resolved_roles_dir = _resolve_roles_dir(roles_dir=roles_dir)
cache_key = (
_cache_key(resolved_roles_dir),
_stable_variables_signature(variables),
)
cached = _MERGED_APPLICATIONS_CACHE.get(cache_key)
if cached is not None:
return cached
defaults = get_application_defaults(roles_dir=resolved_roles_dir)
overrides = _resolve_override_mapping(variables, "applications", templar=templar)
merged = merge_with_defaults(defaults, overrides)
if getattr(_RENDER_GUARD, "applications", False):
# Re-entry via cross-lookup: return unrendered merged payload; the
# outer templar will resolve remaining Jinja at use-site.
return merged
# Drop any `volumes` subtree BEFORE rendering. It can arrive via defaults
# OR via a round-tripped `applications` var (the constructor materialises
# the full merged config back into the var, volumes included, so a later
# lookup reads volumes as overrides). Its raw Jinja `source:` strings must
# never reach the templar (explode/recurse); the canonical registry is
# re-attached raw below.
for app_cfg in merged.values():
if isinstance(app_cfg, dict):
app_cfg.pop("volumes", None)
_RENDER_GUARD.applications = True
try:
raw_users = get_merged_users(
variables=variables,
roles_dir=roles_dir,
templar=None,
)
rendered = _render_with_templar(
merged,
templar=templar,
variables=variables,
raw_applications=merged,
raw_users=raw_users,
)
finally:
_RENDER_GUARD.applications = False
# Re-attach the raw `volumes` subtree so its Jinja `source:` strings reach
# the compose template verbatim. Deep copied so a consumer of the cached
# merged payload cannot mutate the canonical registry.
for app_id in rendered:
raw_volumes = get_canonical_volumes(app_id)
if raw_volumes and isinstance(rendered[app_id], dict):
rendered[app_id]["volumes"] = copy.deepcopy(raw_volumes)
_MERGED_APPLICATIONS_CACHE[cache_key] = rendered
return rendered
def get_canonical_volumes(application_id: str) -> dict[str, Any]:
"""Return the canonical dict-of-dicts `meta/volumes.yml` for *application_id*.
Lives outside the applications payload so its embedded Jinja `source:`
strings stay raw — see the `_CANONICAL_VOLUMES_BY_ROLE` doc-comment.
"""
if not _CANONICAL_VOLUMES_BY_ROLE:
# Force a real rebuild, not get_application_defaults() which no-ops on a warm
# defaults cache and would leave this registry empty (nfs_prep then skips the subdir).
_build_application_defaults(_resolve_roles_dir(roles_dir=None))
return _CANONICAL_VOLUMES_BY_ROLE.get(application_id, {})
def _reset() -> None:
_APPLICATIONS_DEFAULTS_CACHE.clear()
_VARIANTS_CACHE.clear()
_VARIANT_OVERRIDES_ONLY_CACHE.clear()
_MERGED_APPLICATIONS_CACHE.clear()
_CANONICAL_VOLUMES_BY_ROLE.clear()