mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 19:01:54 +00:00
kevinveenbirkenbachandClaude Opus 5
575a5a87ac
Every script a role ships now lives under `files/<language>/`, and the unit
suite is split the same way: `tests/unit/python/` beside new sibling trees for
the other languages. `tests/lint/filesystem/test_role_files_layout.py` keeps it
that way; directories whose shape is dictated from outside carry a `.nocheck`
naming the constraint (Docker build contexts, WordPress mu-plugins, the Joomla
extension, Odoo addons, Playwright suites, the `files/test/test.sh` harness
that `test-e2e-cli` resolves generically).
This cannot be applied in halves. Moving a file and repointing what names it
are the same change: 14 references resolve only at deploy time, so the tree is
green either before or after, never between.
Those 14 were found by static resolution over every reference class, not by the
test suite -- a full `make quality-high` was green while all of them were
broken:
* 7 `src:` values built from a role variable holding a bare filename
(svc-bkp-remote-2-local, decidim, espocrm, friendica, joomla, pixelfed x2).
The variable doubles as the destination name inside the container, so the
language segment belongs at the call site, not in the variable.
* `sys-service/tasks/04_base.yml` resolved every consumer's systemd script
through `first_found(..., errors='strict')` over `files/script.{sh,py}`.
18 roles ship exactly that and have no template fallback: the play would
have died on each.
* `sys-front-inj-javascript` fell back to `<role>/files/javascript.js`; the
interface now reads `files/javascript/javascript.js`.
* `sys-front-inj-logout/templates/head_sub.j2` built the cache-busting mtime
path through `path_absolute(... 'files', ...)`.
* 4 `ansible.builtin.script:` invocations naming a bare command
(pull.py, prune.sh, set_postgres_superuser_password.sh, ganesha-serve.sh).
* `dev-python/files/shell/install.sh` pointed at a sibling role's script.
Depth-dependent paths inside the moved trees were bumped accordingly: 59
`parents[N]` computations, 12 relative climbs, and the per-role recover CLI,
whose path `cli/administration/recover/recoverers.py` still assembled from the
pre-move location.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
113 lines
3.7 KiB
Python
113 lines
3.7 KiB
Python
from __future__ import annotations
|
|
|
|
import io
|
|
import unittest
|
|
from unittest.mock import patch
|
|
|
|
import cli.contributing.mirror.resolver.__main__ as resolver_main
|
|
from cli.contributing.mirror.model import ImageRef
|
|
from utils.cache.yaml import load_yaml_str
|
|
from utils.roles.mapping import ROLE_FILE_META_SERVICES
|
|
|
|
|
|
class TestResolverOutputFormat(unittest.TestCase):
|
|
"""resolver emits per-role services map under the applications key."""
|
|
|
|
def _run_resolver(
|
|
self, images: list[ImageRef], extra_argv: list[str] | None = None
|
|
) -> dict:
|
|
argv = [
|
|
"resolver",
|
|
"--ghcr-namespace",
|
|
"acme",
|
|
"--ghcr-repository",
|
|
"myrepo",
|
|
]
|
|
if extra_argv:
|
|
argv += extra_argv
|
|
|
|
buf = io.StringIO()
|
|
with (
|
|
patch(
|
|
"cli.contributing.mirror.resolver.__main__.iter_role_images",
|
|
return_value=images,
|
|
),
|
|
patch("sys.argv", argv),
|
|
patch("sys.stdout", buf),
|
|
):
|
|
result = resolver_main.main()
|
|
|
|
self.assertEqual(result, 0)
|
|
return load_yaml_str(buf.getvalue()) or {}
|
|
|
|
def test_meta_services_image_goes_to_applications_key(self) -> None:
|
|
image = ImageRef(
|
|
role="web-app-nextcloud",
|
|
service="app",
|
|
name="nextcloud",
|
|
version="31.0.0",
|
|
source="docker.io/library/nextcloud:31.0.0",
|
|
registry="docker.io",
|
|
source_file=ROLE_FILE_META_SERVICES,
|
|
)
|
|
out = self._run_resolver([image])
|
|
|
|
self.assertIn("applications", out)
|
|
self.assertNotIn("images", out)
|
|
svc = out["applications"]["web-app-nextcloud"]["services"]["app"]
|
|
self.assertEqual(svc["version"], "31.0.0")
|
|
self.assertIn("ghcr.io/acme/myrepo/mirror/docker.io/nextcloud", svc["image"])
|
|
|
|
def test_test_role_image_also_goes_to_applications_key(self) -> None:
|
|
image = ImageRef(
|
|
role="test-e2e-playwright",
|
|
service="playwright",
|
|
name="playwright",
|
|
version="v1.58.2-noble",
|
|
source="mcr.microsoft.com/playwright:v1.58.2-noble",
|
|
registry="mcr.microsoft.com",
|
|
source_file=ROLE_FILE_META_SERVICES,
|
|
)
|
|
out = self._run_resolver([image])
|
|
|
|
svc = out["applications"]["test-e2e-playwright"]["services"]["playwright"]
|
|
self.assertEqual(svc["version"], "v1.58.2-noble")
|
|
self.assertIn(
|
|
"ghcr.io/acme/myrepo/mirror/mcr.microsoft.com/playwright",
|
|
svc["image"],
|
|
)
|
|
|
|
def test_multiple_services_same_role_stay_grouped(self) -> None:
|
|
images = [
|
|
ImageRef(
|
|
role="web-app-nextcloud",
|
|
service="app",
|
|
name="nextcloud",
|
|
version="31.0.0",
|
|
source="docker.io/library/nextcloud:31.0.0",
|
|
registry="docker.io",
|
|
source_file=ROLE_FILE_META_SERVICES,
|
|
),
|
|
ImageRef(
|
|
role="web-app-nextcloud",
|
|
service="proxy",
|
|
name="nginx",
|
|
version="alpine",
|
|
source="docker.io/library/nginx:alpine",
|
|
registry="docker.io",
|
|
source_file=ROLE_FILE_META_SERVICES,
|
|
),
|
|
]
|
|
out = self._run_resolver(images)
|
|
|
|
self.assertIn("app", out["applications"]["web-app-nextcloud"]["services"])
|
|
self.assertIn("proxy", out["applications"]["web-app-nextcloud"]["services"])
|
|
|
|
def test_empty_images_yield_empty_applications(self) -> None:
|
|
out = self._run_resolver([])
|
|
self.assertEqual(out["applications"], {})
|
|
|
|
|
|
if __name__ == "__main__": # pragma: no cover
|
|
unittest.main()
|