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>
110 lines
3.6 KiB
Python
110 lines
3.6 KiB
Python
import importlib.util
|
|
import unittest
|
|
import unittest.mock as mock
|
|
|
|
from ansible.parsing.dataloader import DataLoader
|
|
from ansible.template import Templar
|
|
|
|
from utils.storage.nfs import client_src, state_path
|
|
|
|
|
|
def _run(name, variables):
|
|
"""Lookups must read resolved values from `variables`; templar.template('{{..}}')
|
|
no-ops on untrusted strings in ansible 2.19+ and emits literal Jinja into exports."""
|
|
spec = importlib.util.spec_from_file_location(name, f"plugins/lookup/{name}.py")
|
|
m = importlib.util.module_from_spec(spec)
|
|
spec.loader.exec_module(m)
|
|
lm = m.LookupModule()
|
|
lm._templar = Templar(loader=DataLoader(), variables=variables)
|
|
return lm.run([], variables=variables)[0]
|
|
|
|
|
|
BASE = {
|
|
"storage": {"nfs": {"server": "192.168.244.2"}},
|
|
"RUNTIME": "github",
|
|
}
|
|
|
|
|
|
class TestNfsLookups(unittest.TestCase):
|
|
def test_state_path_renders(self):
|
|
self.assertEqual(_run("nfs_state_path", BASE), "/srv/nfs/infinito-state")
|
|
|
|
def test_fstype_renders(self):
|
|
self.assertEqual(_run("nfs_fstype", BASE), "nfs4")
|
|
|
|
def test_mount_opts_github_soft(self):
|
|
self.assertEqual(
|
|
_run("nfs_mount_opts", BASE),
|
|
"vers=4,rw,soft,timeo=50,retrans=3",
|
|
)
|
|
|
|
def test_mount_opts_host_hard(self):
|
|
self.assertEqual(
|
|
_run("nfs_mount_opts", {**BASE, "RUNTIME": "host"}),
|
|
"vers=4,rw,hard,timeo=600",
|
|
)
|
|
|
|
def test_mount_opts_act_soft(self):
|
|
self.assertEqual(
|
|
_run("nfs_mount_opts", {**BASE, "RUNTIME": "act"}),
|
|
"vers=4,rw,soft,timeo=50,retrans=3",
|
|
)
|
|
|
|
|
|
def _load(name, variables):
|
|
spec = importlib.util.spec_from_file_location(name, f"plugins/lookup/{name}.py")
|
|
m = importlib.util.module_from_spec(spec)
|
|
spec.loader.exec_module(m)
|
|
lm = m.LookupModule()
|
|
lm._templar = Templar(loader=DataLoader(), variables=variables)
|
|
lm._loader = DataLoader()
|
|
return m, lm
|
|
|
|
|
|
class TestNfsConfigBackedLookups(unittest.TestCase):
|
|
"""nfs_flavor / nfs_client_src reach the merged-config SPOT through
|
|
lookup('config') via lookup_loader, NOT a utils.cache import."""
|
|
|
|
def test_flavor_returns_config_lookup_result(self):
|
|
m, lm = _load("nfs_flavor", {})
|
|
with mock.patch.object(m, "lookup_loader") as loader:
|
|
loader.get.return_value = mock.MagicMock(run=lambda *a, **k: ["ganesha"])
|
|
self.assertEqual(lm.run([], variables={}), ["ganesha"])
|
|
|
|
def test_flavor_config_call_shape(self):
|
|
m, lm = _load("nfs_flavor", {})
|
|
calls = []
|
|
|
|
def _run(args, **kwargs):
|
|
calls.append((tuple(args), kwargs))
|
|
return ["kernel"]
|
|
|
|
with mock.patch.object(m, "lookup_loader") as loader:
|
|
loader.get.return_value = mock.MagicMock(run=_run)
|
|
lm.run([], variables={"RUNTIME": "github"})
|
|
(args, kwargs) = calls[0]
|
|
self.assertEqual(
|
|
args,
|
|
("svc-storage-nfs-server", "services.nfs-server.flavor", "kernel"),
|
|
)
|
|
self.assertEqual(kwargs.get("variables"), {"RUNTIME": "github"})
|
|
|
|
def test_client_src_kernel_v4_uses_root_mount(self):
|
|
nfs = {"server": "10.0.0.2"}
|
|
vars_ = {"storage": {"nfs": nfs}}
|
|
m, lm = _load("nfs_client_src", vars_)
|
|
with mock.patch.object(m, "lookup_loader") as loader:
|
|
loader.get.return_value = mock.MagicMock(run=lambda *a, **k: ["kernel"])
|
|
result = lm.run([], variables=vars_)
|
|
expected = client_src(
|
|
"10.0.0.2",
|
|
4,
|
|
"kernel",
|
|
state_path("/srv/nfs", "infinito-state"),
|
|
)
|
|
self.assertEqual(result, [expected])
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|