mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-11 21:26:44 +00:00
Single atomic landing for three back-to-back role-meta refactor requirements
(see docs/requirements/008-role-meta-layout.md, 009-per-role-networks-and-ports.md,
010-role-meta-runafter-lifecycle-migration.md).
req-008 — role meta layout
* Move every role's metadata under meta/<topic>.yml with file-root
convention (no wrapping key matching the basename):
- schema/main.yml + config/main.yml.credentials → meta/schema.yml
- users/main.yml → meta/users.yml
- config/main.yml.server → meta/server.yml
- config/main.yml.rbac → meta/rbac.yml
- config/main.yml.compose.services + every other top-level key
of config/main.yml inlined under <entity>.<key>
→ meta/services.yml
- config/main.yml.compose.volumes → meta/volumes.yml
* Drop the legacy schema/, users/, config/ directories from every role.
* meta/schema.yml: support nested credential keys, optional `default:`
field (Jinja literal, not rendered/validated/regenerated), implicit
`algorithm: plain`.
* Materialised paths drop the `compose.` prefix:
compose.services.<e>.<…> → services.<e>.<…>
compose.volumes.<k> → volumes.<k>
<former-top-level>.<…> → services.<entity_name>.<former-top-level>.<…>
* Update every Python consumer (utils/cache, utils/manager, utils/applications,
plugins/lookup, plugins/filter, cli/*) plus every Jinja template, vars/*.yml
and task file to the new paths.
* No legacy fallback. Repository-wide grep for `compose.services.` /
`compose.volumes.` / `schema/main.yml` / `users/main.yml` / `config/main.yml`
is empty outside docs/requirements/ and tasks/utils/migrate_meta_layout.py.
* Add tests/lint/repository/test_role_meta_layout.py guarding against the
old paths returning, and an explicit lint guard that meta/variants.yml
files do not carry a `compose:` wrapper.
req-009 — per-role networks/ports
* Move group_vars/all/08_networks.yml.defaults_networks.local.<role>.{subnet,
dns_resolver} into roles/<role>/meta/server.yml.networks.local.{subnet,
dns_resolver}.
* Delete group_vars/all/09_ports.yml entirely; ports now live on the
service entity that exposes them at
roles/<role>/meta/services.yml.<entity>.ports.{inter,local,public}.
* Rename + int-cast every former top-level `services.<entity>.port`
field to `services.<entity>.ports.inter` (single int).
* Always-category-keyed maps for ports.local / ports.public; relay
spans use {start, end} integers.
* Add PORT_BANDS map to group_vars/all/08_networks.yml — single source
of truth for the per-<scope>.<category> band ranges, consumed by both
the new CLI helpers and the lint test.
* New CLI helpers (cli meta ports suggest, cli meta networks suggest)
walk the live role tree gap-first then increment-fallback, with
deterministic output and non-zero exit on capacity overflow.
* cli create role consumes both helpers when scaffolding a new role.
* Lint extensions: bare-int port shape rejection, host-bound port
collision check (single ints + relay span integers, inter excluded),
band-membership check with documented allow-list for the legacy
web-app-bigbluebutton.bigbluebutton.local.http: 48087 entry.
req-010 — run_after / lifecycle migration
* Move galaxy_info.run_after and galaxy_info.lifecycle out of
meta/main.yml into meta/services.yml.<primary_entity>.{run_after,
lifecycle}; <primary_entity> is the value returned by
get_entity_name(role_name).
* For multi-entity roles whose primary entity has no compose service
(web-app-bluesky → bluesky, web-app-matrix → matrix, desk/dev/drv/
gen roles), create a dedicated metadata-only top-level entry under
<primary_entity>.
* Introduce utils/roles/meta_lookup.py with get_role_run_after /
get_role_lifecycle that resolve <primary_entity> once and read from
meta/services.yml; degrade gracefully when meta/services.yml is
absent OR the field is absent; raise MetaServicesShapeError when the
file exists but is malformed.
* Update every consumer (utils/service_registry, utils/invokable,
cli/meta/applications/resolution/run_after/__main__, cli/meta/roles/
lifecycle_filter/__main__, cli/meta/applications/resolution/combined,
cli/build/{tree,graph,role_include}, cli/deploy/development/{common,
init,deps,deploy}, plugins/filter/canonical_domains_map, etc.) to
use the helper.
* Lint guards: no run_after/lifecycle in meta/main.yml; lifecycle
values restricted to {planned,pre-alpha,alpha,beta,stable,deprecated};
run_after/lifecycle never on a non-primary entity; empty run_after
lists rejected.
Also folded into this change set
* services_disabler now writes `services.<svc>.{enabled,shared}` into
host_vars instead of the old `compose.services.<svc>.{...}` path; the
discover/find pair walks meta/services.yml and only treats entries
carrying enabled/shared/provides as provider declarations (so
metadata-only entries from req-010 do not create spurious provider
rows).
* service_registry skips `run_after` deps whose target was filtered
out via SERVICES_DISABLED instead of failing the whole load.
* cli/mirror/resolver and cli/create/inventory/mirror_overrides emit/
consume the new applications.<role>.services.<svc>.image shape
(mirror.md updated to match).
* utils/domains/list.build_applications_from_roles now reads
meta/server.yml directly (it had been silently returning {} since
config/main.yml stopped existing).
* utils/roles/resource_validation.filter_roles_by_min_storage reads
meta/services.yml.<entity>.min_storage instead of the legacy
compose.services path.
* web-app-bluesky pre-clones the social-app build context BEFORE
sys-svc-compose so the build context is on disk by the time
sys-stk-front-proxy/tasks/main.yml flushes the docker build handler.
* 4 meta/variants.yml files (svc-ai-ollama, web-app-phpmyadmin,
web-app-wordpress, web-app-keycloak) lose their `compose: services:`
wrapper so deep-merge over meta/services.yml lands on the new
file-root shape.
Validation
* Unit tests: 1571 passed.
* Lint tests: 50 passed.
* Integration tests: 161 passed (1 skipped).
* Full-cycle fresh-purged-apps deploy succeeded for the 8-app validation
set: web-app-{nextcloud,wordpress,yourls,bigbluebutton,bluesky,gitea,
discourse,mattermost}.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
95 lines
3.8 KiB
Python
95 lines
3.8 KiB
Python
from __future__ import absolute_import, division, print_function
|
|
|
|
__metaclass__ = type
|
|
|
|
import os
|
|
|
|
|
|
def compute_application_gid(application_id, roles_dir="roles", base_gid=10000):
|
|
"""Pure-Python GID resolver — no ansible dependency.
|
|
|
|
Sorts every `<roles_dir>/<role>/meta/services.yml`-bearing role
|
|
alphabetically by `<role>` and returns ``base_gid + index`` for the
|
|
requested ``application_id``. Extracted so callers that only need
|
|
the GID computation (e.g. ``utils.cache.applications._build_variants`` on
|
|
the GitHub Actions runner host, where the runner Python ships
|
|
without ``ansible``) can import THIS function instead of the
|
|
``LookupModule`` class — that one transitively pulls
|
|
``ansible.plugins.lookup.LookupBase`` and raises
|
|
``ModuleNotFoundError`` on ansible-less hosts.
|
|
|
|
Raises ``ValueError`` (not ``AnsibleError``) for portability.
|
|
"""
|
|
if not os.path.isdir(roles_dir):
|
|
raise ValueError(f"Roles directory '{roles_dir}' not found")
|
|
|
|
# Per req-008, an "application role" is identified by the presence of
|
|
# at least one of the project-owned `meta/<topic>.yml` files (services,
|
|
# server, rbac, volumes, schema, users). This preserves the prior
|
|
# assignment ordering: every role that previously had `meta/services.yml`
|
|
# now has at least one of these files.
|
|
application_marker_files = {
|
|
"services.yml",
|
|
"server.yml",
|
|
"rbac.yml",
|
|
"volumes.yml",
|
|
"schema.yml",
|
|
"users.yml",
|
|
}
|
|
discovered: set[str] = set()
|
|
for entry in os.listdir(roles_dir):
|
|
role_dir = os.path.join(roles_dir, entry)
|
|
meta_dir = os.path.join(role_dir, "meta")
|
|
if not os.path.isdir(meta_dir):
|
|
continue
|
|
for marker in application_marker_files:
|
|
if os.path.isfile(os.path.join(meta_dir, marker)):
|
|
discovered.add(entry)
|
|
break
|
|
sorted_ids = sorted(discovered)
|
|
|
|
try:
|
|
index = sorted_ids.index(application_id)
|
|
except ValueError:
|
|
raise ValueError(f"Application ID '{application_id}' not found in any role")
|
|
|
|
return base_gid + index
|
|
|
|
|
|
# The Ansible LookupModule wrapper. We define it conditionally on
|
|
# ansible being importable: ansible's plugin loader only needs the class
|
|
# when an Ansible process actually loads this module via the lookup
|
|
# loader, and that always happens inside a process that has ansible
|
|
# installed (the playbook runner). Pure-Python importers (e.g.
|
|
# `utils.cache.applications._build_variants` running inside `cli.deploy.
|
|
# development init` on the GitHub Actions runner host) want
|
|
# `compute_application_gid` only and MUST NOT pay the ansible-import
|
|
# cost — see CI run 24935979190 for the regression that motivated this
|
|
# split.
|
|
try:
|
|
from ansible.plugins.lookup import LookupBase
|
|
from ansible.errors import AnsibleError
|
|
|
|
class LookupModule(LookupBase):
|
|
def run(self, terms, variables=None, **kwargs):
|
|
application_id = terms[0]
|
|
base_gid = kwargs.get("base_gid", 10000)
|
|
roles_dir = kwargs.get("roles_dir", "roles")
|
|
|
|
try:
|
|
return [compute_application_gid(application_id, roles_dir, base_gid)]
|
|
except ValueError as exc:
|
|
raise AnsibleError(str(exc))
|
|
|
|
except ImportError: # pragma: no cover - exercised on ansible-less hosts only
|
|
# Sentinel so callers that *try* to instantiate the lookup outside
|
|
# an Ansible process get a clear, actionable error instead of a
|
|
# confusing AttributeError or NameError.
|
|
class LookupModule: # type: ignore[no-redef]
|
|
def __init__(self, *args, **kwargs):
|
|
raise RuntimeError(
|
|
"plugins.lookup.application_gid.LookupModule requires "
|
|
"ansible at runtime. Use compute_application_gid() "
|
|
"directly for ansible-less code paths."
|
|
)
|