mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-07 03:15:56 +00:00
Three new lint tests close gaps in the INFINITO_* SPOT contract:
* tests/lint/filesystem/env/test_default_env_keys_handled.py
Every default.env key must be wired through a handler.
* tests/lint/filesystem/env/test_used_keys_declared.py
Every INFINITO_* in .sh/.py must live in env/{default,ci}.env or
a handler; per-line `# nocheck:` suppresses runtime-only refs.
* tests/lint/filesystem/python/test_no_infinito_get_defaults.py
Forbid ANY default in `.get("INFINITO_*", ...)` -- including the
empty-string fallback (which silently masks an unset key). The
nocheck check walks every physical line the call spans so an
autoformat-split call still honours the marker.
Cache namespace flattens to a single prefix:
INFINITO_PACKAGE_CACHE_* -> INFINITO_CACHE_PACKAGE_*
INFINITO_REGISTRY_CACHE_* -> INFINITO_CACHE_REGISTRY_*
The five previously driver-injected paths (APT_LIST, NPMRC,
PIP_CONF, REGISTRY_PROXY_CONF, FRONTEND_CA_FILE) move into
env/default.env and passthrough.STATIC_KEYS; the
`cache_env_overrides()` helper and its two call sites are gone
along with the test-fixture override for FRONTEND_CA_DIR.
SPOT-strict rewrites:
- 19 sites: `something.get("INFINITO_X", "")` -> subscript
`something["INFINITO_X"]` (loud KeyError when env loader did
not run; all keys live in env/default.env).
- 2 handler-internal bootstrap reads suppressed with
`# nocheck: handler-bootstrap-read`.
- 30 runtime-only / driver-injected / test-fixture references
annotated with `# nocheck: <reason>` per-line.
- Unit tests that previously removed SPOT-guaranteed keys via
`{k: v ... if k \!= KEY}` or `clear=True` switch to setting
the key to "" explicitly, matching the new contract.
Side fixes:
- INFINITO_DNS_DOMAIN + INFINITO_DNS_HOSTS_FILE move from
shell-side defaults in common.sh to env/default.env and
passthrough.STATIC_KEYS.
- dns_systemd_is_operational() drops the dead
INFINITO_DNS_FORCE_HOSTS_FALLBACK override branch (the
variable was never set anywhere).
- INFINITO_WORKER_FETCH switches from `os.environ.get(KEY, "1")`
to `os.environ[KEY]`.
- scripts/tests/code/wrapper.sh exec args move into a bash
array so `# nocheck:` on INFINITO_TEST_TYPE can live on its
own element line (SC2215 fix).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
171 lines
5.5 KiB
Python
171 lines
5.5 KiB
Python
from __future__ import annotations
|
|
|
|
import argparse
|
|
import os
|
|
import unittest
|
|
import unittest.mock
|
|
|
|
from cli.administration.deploy.development import exec as exec_cmd
|
|
|
|
|
|
def _args(
|
|
*,
|
|
distro: str = "debian",
|
|
cmd: list[str] | None = None,
|
|
env: list[str] | None = None,
|
|
) -> argparse.Namespace:
|
|
return argparse.Namespace(
|
|
distro=distro,
|
|
cmd=cmd if cmd is not None else [],
|
|
env=env if env is not None else [],
|
|
)
|
|
|
|
|
|
class TestDevelopmentExec(unittest.TestCase):
|
|
def test_handler_forwards_services_disabled(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.administration.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(
|
|
os.environ, {"INFINITO_SERVICES_DISABLED": "email"}, clear=False
|
|
),
|
|
):
|
|
rc = exec_cmd.handler(_args(cmd=["--", "sh", "-lc", "true"]))
|
|
|
|
self.assertEqual(rc, 0)
|
|
compose.exec.assert_called_once_with(
|
|
["sh", "-lc", "true"],
|
|
check=False,
|
|
extra_env={"INFINITO_SERVICES_DISABLED": "email"},
|
|
)
|
|
|
|
def test_handler_omits_extra_env_when_services_disabled_unset(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
env = {**os.environ, "INFINITO_SERVICES_DISABLED": ""}
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.administration.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(os.environ, env, clear=True),
|
|
):
|
|
rc = exec_cmd.handler(_args(cmd=["echo", "hi"]))
|
|
|
|
self.assertEqual(rc, 0)
|
|
compose.exec.assert_called_once_with(
|
|
["echo", "hi"], check=False, extra_env=None
|
|
)
|
|
|
|
def test_handler_requires_command(self):
|
|
with self.assertRaises(SystemExit):
|
|
exec_cmd.handler(_args(cmd=[]))
|
|
|
|
def test_env_pairs_are_injected_into_extra_env(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
env = {**os.environ, "INFINITO_SERVICES_DISABLED": ""}
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.administration.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(os.environ, env, clear=True),
|
|
):
|
|
rc = exec_cmd.handler(
|
|
_args(
|
|
cmd=["bash", "/opt/helper.sh"],
|
|
env=[
|
|
"INFINITO_INVENTORY_FILE=/srv/inv/devices.yml",
|
|
"INFINITO_APPS=web-app-foo",
|
|
],
|
|
)
|
|
)
|
|
|
|
self.assertEqual(rc, 0)
|
|
compose.exec.assert_called_once_with(
|
|
["bash", "/opt/helper.sh"],
|
|
check=False,
|
|
extra_env={
|
|
"INFINITO_INVENTORY_FILE": "/srv/inv/devices.yml",
|
|
"INFINITO_APPS": "web-app-foo",
|
|
},
|
|
)
|
|
|
|
def test_env_pair_with_equals_in_value_is_preserved(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
env = {**os.environ, "INFINITO_SERVICES_DISABLED": ""}
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.administration.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(os.environ, env, clear=True),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["EXTRA_VARS=a=1 b=2"]))
|
|
|
|
# Only the first '=' splits key from value; everything after stays intact.
|
|
compose.exec.assert_called_once_with(
|
|
["true"],
|
|
check=False,
|
|
extra_env={"EXTRA_VARS": "a=1 b=2"},
|
|
)
|
|
|
|
def test_env_pair_overrides_implicit_services_disabled(self):
|
|
compose = unittest.mock.Mock()
|
|
compose.exec.return_value.returncode = 0
|
|
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.administration.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
unittest.mock.patch.dict(
|
|
os.environ, {"INFINITO_SERVICES_DISABLED": "from-env"}, clear=False
|
|
),
|
|
):
|
|
exec_cmd.handler(
|
|
_args(cmd=["true"], env=["INFINITO_SERVICES_DISABLED=from-cli"])
|
|
)
|
|
|
|
compose.exec.assert_called_once_with(
|
|
["true"],
|
|
check=False,
|
|
extra_env={"INFINITO_SERVICES_DISABLED": "from-cli"},
|
|
)
|
|
|
|
def test_env_pair_without_equals_is_rejected(self):
|
|
compose = unittest.mock.Mock()
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.administration.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
self.assertRaisesRegex(SystemExit, "expects KEY=VALUE"),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["BARE"]))
|
|
|
|
def test_env_pair_with_empty_key_is_rejected(self):
|
|
compose = unittest.mock.Mock()
|
|
with (
|
|
unittest.mock.patch(
|
|
"cli.administration.deploy.development.exec.make_compose",
|
|
return_value=compose,
|
|
),
|
|
self.assertRaisesRegex(SystemExit, "KEY is empty"),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["=value"]))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|