mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-09 20:26:33 +00:00
Resolves 68 conflicted files. The governing rule was our structure with their
network semantics: the tor boolean becomes a network mode (clearnet | tor |
multi) throughout the variant layer, while this branch's architecture and mesh
axes, its extracted modules and its i18n content stay.
Where the two sides covered different ground, both are kept rather than one
picked:
- ca_injected answers a ca_client on the deployment's TLS mode OR on an SSO
issuer that resolves self-signed. 3a3e9ed2c9 records why: an issuer is not
an object store, so keeping only one side drops the other's coverage.
- get_merged_domains keeps the loud refusal when svc-net-tor is deployed
without a provisioned node, now gated on their tor_serves_host; their
node_onion_of returns an empty string there, which would have served every
onion-exclusive app on clearnet in silence.
- sso_cookie_domains stays the single source for oauth2-proxy's cookie scope.
Their per-network branch omitted the issuer domain on the onion arm, which
breaks the callback leg.
- The clearnet CSP batch carries --clearnet-timeout again; their batch dict
hardcoded zero while the role still passes the flag.
- The dashboard keeps its i18n content dir, image, version and design
resolution; their side reduced the logo sources to the bare service
provider values.
Their side wins where it is measurably better: the onion mirror rewrite is
gated per vhost rather than per app, the Playwright onion decision reads the
pass's own domain instead of the role's canonical one, and the matomo
reinjection and dashboard config render per network sibling.
Eight files were broken by the merge without ever carrying a conflict marker,
because git marks only the lines both sides touched:
- utils/cache/domains.py lost the onionize block that sat between two hunks
- roles/sys-front-inj-all/templates/body_filter.lua.j2 called it
- web-app-bluesky, keycloak sso_proxy: the get_entity_name filter was renamed
- trigger/__main__.py, playwright_coverage.py and its test: the deleted tor
module
- cli/administration/deploy/ci/timings.py read Label.tor
- plugins/filter/csp_filters.py called _aligned_url with four of six arguments
- tests/unit/python/utils/cache/test_domains.py referenced a renamed class
- tests/.../sys-ctl-hlth-csp/files/test_script.py mocked a function main no
longer calls
Verified: the variant layer (155 tests, 65 subtests), ca_injected (18),
the CI layer (175), the domains cache including the restored guard (32),
retrigger inputs (9), timings and the CSP health script (53). make
quality-high clears autoformat; its remaining findings are tracked separately.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
203 lines
7.8 KiB
Python
203 lines
7.8 KiB
Python
"""Check a run's selection inputs against the branch before anything deploys.
|
|
|
|
Usage:
|
|
python -m cli.meta.ci.validate [--whitelist "..."] [--priority "..."]
|
|
[--modes auto] [--network auto] [--vpn auto]
|
|
[--distros "..."] [--filesystem "..."]
|
|
[--architectures "..."]
|
|
[--lifecycles "..."]
|
|
|
|
A selection token names a row that has to exist *on this branch*
|
|
(:mod:`utils.github.variant.selection`). Nothing else in the chain can tell
|
|
the operator that early: the matrix builder raises on the first bad token, one
|
|
per chunk job, so a stale list costs one full CI round per entry and reports
|
|
the second problem only after the first is fixed. Every problem is collected
|
|
here instead, and the exit code gates the run.
|
|
|
|
What makes a token bad, in the order this checks it:
|
|
|
|
* it does not parse, or names a mode or network mode that does not exist;
|
|
* it pins a variant the role does not declare (any more): the usual case is a
|
|
list carried over from an older run whose variants have since been renumbered;
|
|
* it pins a mode the row cannot take, a network mode the row, the mode or the
|
|
run's own network axis rules out, or a distro, filesystem or architecture
|
|
the run's own pool does not hold.
|
|
|
|
A token naming a role the discovery query does not return at all is reported
|
|
too, but as a warning, whether or not it pins axes: the diff-derived whitelist
|
|
legitimately names roles the envelope filters out, and it pins the variants a
|
|
change reaches. Role names themselves are checked against `roles/` before the
|
|
run starts (scripts/github/resolve/effective_whitelist.sh), so a typo is caught
|
|
there rather than swallowed here.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import sys
|
|
|
|
from cli.meta.ci import query
|
|
from utils.cache.applications import get_variants
|
|
from utils.github.variant import axes, network, pools, selection, vpn
|
|
from utils.roles.display import display_names
|
|
|
|
|
|
def problems(
|
|
tokens: str,
|
|
*,
|
|
modes: tuple[str, ...],
|
|
network_input: str,
|
|
vpn_mode: str,
|
|
distros: tuple[str, ...],
|
|
filesystems: tuple[str, ...],
|
|
architectures: tuple[str, ...] = pools.ARCHITECTURES,
|
|
lifecycles: str,
|
|
label: str,
|
|
) -> tuple[list[str], list[str]]:
|
|
"""Every reason the tokens of one input cannot deploy on this branch.
|
|
|
|
A token that narrows nothing beyond the role name is answered by existence:
|
|
it asks for the role in whatever axes the rotation picks, so any discovered
|
|
row satisfies it. Rows are keyed by ``(name, variant)`` and a variant is an
|
|
int, so looking such a token up variant-first can only miss, which reported
|
|
every collapsed priority entry as matching nothing and left a role that
|
|
really had no row indistinguishable from one with a full set.
|
|
|
|
Args:
|
|
tokens: the raw ``whitelist``/``priority`` value.
|
|
modes: the run's selected deploy modes.
|
|
network_input: the run's network axis.
|
|
vpn_mode: the run's mesh axis.
|
|
distros: the distro pool the run draws from.
|
|
filesystems: the filesystem pool the run draws from.
|
|
architectures: the CPU architecture pool the run draws from; a role
|
|
that declares its own narrows it further.
|
|
lifecycles: the run's lifecycle envelope.
|
|
label: the input's name, for the messages.
|
|
|
|
Returns:
|
|
``(errors, warnings)``.
|
|
"""
|
|
pins = selection.parse_list(display_names().decode_list(tokens))
|
|
if not pins:
|
|
return [], []
|
|
|
|
discovered = {
|
|
(row["name"], row["variant"]): row
|
|
for row in query.discover_rows(
|
|
modes, whitelist=selection.names(pins), lifecycles=lifecycles
|
|
)
|
|
}
|
|
rows = {key: query.row_modes(row, modes) for key, row in discovered.items()}
|
|
discovered_apps = {app for app, _variant in rows}
|
|
declared = get_variants()
|
|
errors: list[str] = []
|
|
warnings: list[str] = []
|
|
for pin in pins:
|
|
token = selection.describe(pin)
|
|
if pin.app not in discovered_apps:
|
|
warnings.append(
|
|
f"{label}: {token!r} matches no discovered row "
|
|
f"(no row in this run's mode and lifecycle envelope)"
|
|
)
|
|
continue
|
|
if not pin.pinned:
|
|
continue
|
|
variants = pin.variants or (None,)
|
|
for variant in variants:
|
|
offered = rows.get((pin.app, variant))
|
|
if offered is None:
|
|
count = len(declared.get(pin.app) or [])
|
|
reason = (
|
|
f"role declares {count} variant(s)"
|
|
if pin.variants
|
|
else "no row in this run's mode and lifecycle envelope"
|
|
)
|
|
message = f"{label}: {token!r} matches no discovered row ({reason})"
|
|
(errors if pin.pinned else warnings).append(message)
|
|
continue
|
|
try:
|
|
axes.check_pins(
|
|
pin.app,
|
|
"" if variant is None else str(variant),
|
|
offered,
|
|
pin_mode=pin.mode,
|
|
pin_network=pin.network,
|
|
pin_distro=pin.distro,
|
|
pin_filesystem=pin.filesystem,
|
|
pin_architecture=pin.architecture,
|
|
pin_vpn=pin.vpn,
|
|
states=network.row_states(
|
|
pin.app,
|
|
variant,
|
|
declared,
|
|
pulls_tor=network.row_pulls_tor(discovered[(pin.app, variant)]),
|
|
),
|
|
network_input=network_input,
|
|
vpn_mode=vpn_mode,
|
|
distros=distros,
|
|
filesystems=filesystems,
|
|
architectures=axes.row_architectures(pin.app, architectures),
|
|
)
|
|
except SystemExit as refusal:
|
|
errors.append(f"{label}: {token!r} {str(refusal).split(': ', 1)[-1]}")
|
|
return errors, warnings
|
|
|
|
|
|
def main(argv: list[str] | None = None) -> int:
|
|
parser = argparse.ArgumentParser(
|
|
description="Validate a run's selection inputs against this branch."
|
|
)
|
|
parser.add_argument("--whitelist", default="")
|
|
parser.add_argument("--priority", default="")
|
|
parser.add_argument("--modes", default=query.ALL_MODES)
|
|
parser.add_argument("--network", default=None)
|
|
parser.add_argument("--vpn", default=None)
|
|
parser.add_argument("--distros", default="")
|
|
parser.add_argument("--filesystem", default="")
|
|
parser.add_argument("--architectures", default="")
|
|
parser.add_argument("--lifecycles", default="")
|
|
args = parser.parse_args(argv)
|
|
|
|
modes = query.resolve_modes(args.modes)
|
|
network_input = network.resolve_network_input(args.network)
|
|
vpn_mode = vpn.resolve_vpn_mode(args.vpn)
|
|
distros = pools.resolve_distros(args.distros)
|
|
filesystems = pools.resolve_filesystems(args.filesystem)
|
|
architectures = pools.resolve_architectures(args.architectures)
|
|
|
|
errors: list[str] = []
|
|
warnings: list[str] = []
|
|
for label, tokens in (("whitelist", args.whitelist), ("priority", args.priority)):
|
|
found, warned = problems(
|
|
tokens,
|
|
modes=modes,
|
|
network_input=network_input,
|
|
vpn_mode=vpn_mode,
|
|
distros=distros,
|
|
filesystems=filesystems,
|
|
architectures=architectures,
|
|
lifecycles=args.lifecycles,
|
|
label=label,
|
|
)
|
|
errors += found
|
|
warnings += warned
|
|
|
|
for warning in warnings:
|
|
print(f"::warning::{warning}")
|
|
for error in errors:
|
|
print(f"::error::{error}", file=sys.stderr)
|
|
if errors:
|
|
print(
|
|
f"\n{len(errors)} unusable selection(s). Every one of them would abort a "
|
|
f"chunk's discovery, so the run is refused here instead.",
|
|
file=sys.stderr,
|
|
)
|
|
return 1
|
|
print("Selection inputs are valid for this branch.")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|