mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
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>
205 lines
6.2 KiB
Python
205 lines
6.2 KiB
Python
import os
|
|
import shutil
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from utils.roles.applications.config import (
|
|
AppConfigKeyError,
|
|
ConfigEntryNotSetError,
|
|
get,
|
|
)
|
|
from utils.roles.mapping import ROLE_FILE_META_SECRETS
|
|
|
|
|
|
class TestGetAppConf(unittest.TestCase):
|
|
def setUp(self):
|
|
self._cwd = str(Path.cwd())
|
|
self.tmpdir = tempfile.mkdtemp(prefix="cfgutilstest_")
|
|
os.chdir(self.tmpdir)
|
|
|
|
Path(str(Path("roles") / "web-app-demo" / "meta")).mkdir(
|
|
parents=True, exist_ok=True
|
|
)
|
|
with Path(str(Path("roles") / "web-app-demo" / ROLE_FILE_META_SECRETS)).open(
|
|
"w"
|
|
) as f:
|
|
f.write(
|
|
"features:\n"
|
|
" oidc: {}\n"
|
|
" defined_but_unset: {}\n"
|
|
" nested:\n"
|
|
" list:\n"
|
|
" - {}\n"
|
|
)
|
|
|
|
self.applications = {
|
|
"web-app-demo": {
|
|
"features": {"oidc": True, "nested": {"list": ["first", "second"]}}
|
|
}
|
|
}
|
|
|
|
def tearDown(self):
|
|
os.chdir(self._cwd)
|
|
shutil.rmtree(self.tmpdir, ignore_errors=True)
|
|
|
|
# --- Tests ---
|
|
|
|
def test_missing_app_with_skip_missing_app_returns_default_true(self):
|
|
"""If app ID is missing and skip_missing_app=True, it should return the default (True)."""
|
|
apps = {"some-other-app": {}}
|
|
val = get(
|
|
apps,
|
|
"web-app-nextcloud",
|
|
"features.oidc",
|
|
strict=True,
|
|
default=True,
|
|
skip_missing_app=True,
|
|
)
|
|
self.assertTrue(val)
|
|
|
|
def test_missing_app_with_skip_missing_app_returns_default_false(self):
|
|
"""If app ID is missing and skip_missing_app=True, it should return the default (False)."""
|
|
apps = {"svc-bkp-remote-2-local": {}}
|
|
val = get(
|
|
apps,
|
|
"web-app-nextcloud",
|
|
"features.oidc",
|
|
strict=True,
|
|
default=False,
|
|
skip_missing_app=True,
|
|
)
|
|
self.assertFalse(val)
|
|
|
|
def test_missing_app_without_skip_missing_app_and_strict_true_raises(self):
|
|
"""Missing app ID without skip_missing_app and strict=True should raise."""
|
|
apps = {}
|
|
with self.assertRaises(AppConfigKeyError):
|
|
get(
|
|
apps,
|
|
"web-app-nextcloud",
|
|
"features.oidc",
|
|
strict=True,
|
|
default=True,
|
|
skip_missing_app=False,
|
|
)
|
|
|
|
def test_missing_app_without_skip_missing_app_and_strict_false_raises(self):
|
|
apps = {}
|
|
with self.assertRaises(AppConfigKeyError):
|
|
get(
|
|
apps,
|
|
"web-app-nextcloud",
|
|
"features.oidc",
|
|
strict=False,
|
|
default=True,
|
|
skip_missing_app=False,
|
|
)
|
|
|
|
def test_existing_app_returns_expected_value(self):
|
|
"""Existing app and key should return the configured value."""
|
|
val = get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.oidc",
|
|
strict=True,
|
|
default=False,
|
|
skip_missing_app=False,
|
|
)
|
|
self.assertTrue(val)
|
|
|
|
def test_nested_list_index_access(self):
|
|
"""Accessing list indices should work correctly."""
|
|
val0 = get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.nested.list[0]",
|
|
strict=True,
|
|
default=None,
|
|
skip_missing_app=False,
|
|
)
|
|
val1 = get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.nested.list[1]",
|
|
strict=True,
|
|
default=None,
|
|
skip_missing_app=False,
|
|
)
|
|
self.assertEqual(val0, "first")
|
|
self.assertEqual(val1, "second")
|
|
|
|
def test_schema_defined_but_unset_raises_in_strict_mode(self):
|
|
"""Schema-defined but unset value should raise in strict mode."""
|
|
with self.assertRaises(ConfigEntryNotSetError):
|
|
get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.defined_but_unset",
|
|
strict=True,
|
|
default=False,
|
|
skip_missing_app=False,
|
|
)
|
|
|
|
def test_schema_defined_but_unset_strict_false_returns_default(self):
|
|
"""Schema-defined but unset value should return default when strict=False."""
|
|
val = get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.defined_but_unset",
|
|
strict=False,
|
|
default=True,
|
|
skip_missing_app=False,
|
|
)
|
|
self.assertTrue(val)
|
|
|
|
def test_false_leaf_survives_non_strict_default(self):
|
|
"""A genuinely-False leaf must NOT be coerced to the caller's default
|
|
(the missing-key sentinel used to be False itself)."""
|
|
apps = {"web-app-x": {"services": {"ldap": {"enabled": False}}}}
|
|
val = get(
|
|
apps,
|
|
"web-app-x",
|
|
"services.ldap.enabled",
|
|
strict=False,
|
|
default=True,
|
|
)
|
|
self.assertFalse(val)
|
|
|
|
def test_invalid_key_format_raises(self):
|
|
"""Invalid key format in path should raise AppConfigKeyError."""
|
|
with self.assertRaises(AppConfigKeyError):
|
|
get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.nested.list[not-an-int]",
|
|
strict=True,
|
|
default=None,
|
|
skip_missing_app=False,
|
|
)
|
|
|
|
def test_index_out_of_range_respects_strict(self):
|
|
"""Out-of-range index should respect strict parameter."""
|
|
val = get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.nested.list[99]",
|
|
strict=False,
|
|
default="fallback",
|
|
skip_missing_app=False,
|
|
)
|
|
self.assertEqual(val, "fallback")
|
|
with self.assertRaises(AppConfigKeyError):
|
|
get(
|
|
self.applications,
|
|
"web-app-demo",
|
|
"features.nested.list[99]",
|
|
strict=True,
|
|
default=None,
|
|
skip_missing_app=False,
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|