mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 02:54:26 +00:00
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>
156 lines
5.5 KiB
Python
156 lines
5.5 KiB
Python
"""Walk the role tree to collect occupied ports and subnets.
|
|
|
|
Used by:
|
|
* `cli contributing network ports suggest` gap-first port allocation suggestions
|
|
* `cli contributing network address suggest` gap-first subnet allocation suggestions
|
|
* `tests/lint/...` collision/band checks
|
|
|
|
Reads only ``roles/*/meta/{services,server}.yml`` files.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import ipaddress
|
|
from typing import TYPE_CHECKING
|
|
|
|
from utils.cache.yaml import load_yaml_any
|
|
from utils.roles.mapping import ROLE_FILE_META_NETWORKS, ROLE_FILE_META_SERVICES
|
|
|
|
from . import PROJECT_ROOT
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Iterable
|
|
from pathlib import Path
|
|
|
|
ROLES_DIR = PROJECT_ROOT / "roles"
|
|
|
|
|
|
def _load_yaml(path: Path):
|
|
if not path.is_file():
|
|
return None
|
|
data = load_yaml_any(str(path), default_if_missing=None)
|
|
if data in (None, {}):
|
|
return None
|
|
return data
|
|
|
|
|
|
def iter_role_dirs() -> Iterable[Path]:
|
|
if not ROLES_DIR.is_dir():
|
|
return []
|
|
return sorted(p for p in ROLES_DIR.iterdir() if p.is_dir())
|
|
|
|
|
|
def iter_port_assignments() -> Iterable[tuple[str, str, str, str, int]]:
|
|
"""Yield ``(role, entity, scope, category, port)`` for every single-int port.
|
|
|
|
`internal` is intentionally excluded — internal container ports live in
|
|
per-container network namespaces and never collide.
|
|
"""
|
|
for role_dir in iter_role_dirs():
|
|
services = _load_yaml(role_dir / ROLE_FILE_META_SERVICES)
|
|
if not isinstance(services, dict):
|
|
continue
|
|
for entity_name, entity in services.items():
|
|
if not isinstance(entity, dict):
|
|
continue
|
|
ports = entity.get("ports")
|
|
if not isinstance(ports, dict):
|
|
continue
|
|
for scope_name in ("local", "public"):
|
|
scope_map = ports.get(scope_name)
|
|
if not isinstance(scope_map, dict):
|
|
continue
|
|
for category, value in scope_map.items():
|
|
if category == "relay":
|
|
continue
|
|
if isinstance(value, int):
|
|
yield (
|
|
role_dir.name,
|
|
entity_name,
|
|
scope_name,
|
|
category,
|
|
value,
|
|
)
|
|
|
|
|
|
def iter_relay_ranges() -> Iterable[tuple[str, str, int, int]]:
|
|
"""Yield ``(role, entity, start, end)`` for every public relay range."""
|
|
for role_dir in iter_role_dirs():
|
|
services = _load_yaml(role_dir / ROLE_FILE_META_SERVICES)
|
|
if not isinstance(services, dict):
|
|
continue
|
|
for entity_name, entity in services.items():
|
|
if not isinstance(entity, dict):
|
|
continue
|
|
ports = entity.get("ports")
|
|
if not isinstance(ports, dict):
|
|
continue
|
|
public = ports.get("public")
|
|
if not isinstance(public, dict):
|
|
continue
|
|
relay = public.get("relay")
|
|
if not isinstance(relay, dict):
|
|
continue
|
|
start = relay.get("start")
|
|
end = relay.get("end")
|
|
if isinstance(start, int) and isinstance(end, int):
|
|
yield (role_dir.name, entity_name, start, end)
|
|
|
|
|
|
def iter_subnets() -> Iterable[tuple[str, ipaddress.IPv4Network]]:
|
|
"""Yield ``(role, subnet)`` for every role that declares a local subnet."""
|
|
for role_dir in iter_role_dirs():
|
|
networks = _load_yaml(role_dir / ROLE_FILE_META_NETWORKS)
|
|
if not isinstance(networks, dict):
|
|
continue
|
|
local = networks.get("local")
|
|
if not isinstance(local, dict):
|
|
continue
|
|
subnet_str = local.get("subnet")
|
|
if not isinstance(subnet_str, str):
|
|
continue
|
|
try:
|
|
yield role_dir.name, ipaddress.IPv4Network(subnet_str.strip())
|
|
except (ipaddress.AddressValueError, ValueError):
|
|
continue
|
|
|
|
|
|
def occupied_ports_for(scope: str, category: str) -> list[int]:
|
|
"""Return the sorted, de-duplicated list of host-bound ports in use for
|
|
``<scope>.<category>``.
|
|
"""
|
|
seen: set[int] = set()
|
|
for _role, _entity, scope_name, cat, port in iter_port_assignments():
|
|
if scope_name == scope and cat == category:
|
|
seen.add(port)
|
|
return sorted(seen)
|
|
|
|
|
|
def occupied_relay_ranges() -> list[tuple[int, int]]:
|
|
"""Return the sorted list of ``(start, end)`` relay ranges in use."""
|
|
return sorted({(s, e) for _r, _e, s, e in iter_relay_ranges()})
|
|
|
|
|
|
def occupied_subnets(prefix_length: int) -> list[ipaddress.IPv4Network]:
|
|
"""Return all currently occupied subnets at the requested prefix length."""
|
|
return sorted(
|
|
{net for _role, net in iter_subnets() if net.prefixlen == prefix_length},
|
|
key=lambda n: int(n.network_address),
|
|
)
|
|
|
|
|
|
def host_bound_port_set() -> dict[int, list[tuple[str, str, str, str]]]:
|
|
"""Build the flat host-bound port map for the lint rule.
|
|
|
|
Returns ``{port: [(role, entity, scope, category), ...]}``. Single-int
|
|
`local`/`public` categories AND every integer in each relay span are
|
|
included; ``internal`` is skipped.
|
|
"""
|
|
out: dict[int, list[tuple[str, str, str, str]]] = {}
|
|
for role, entity, scope, category, port in iter_port_assignments():
|
|
out.setdefault(port, []).append((role, entity, scope, category))
|
|
for role, entity, start, end in iter_relay_ranges():
|
|
for port in range(start, end + 1):
|
|
out.setdefault(port, []).append((role, entity, "public", "relay"))
|
|
return out
|