mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 19:01:54 +00:00
Root cause of step-08 deploy failures across all 4 test-development
distros in run 26572559126: `make compose-deploy mode=reinstall
apps=web-app-dashboard INFINITO_SERVICES_DISABLED=matomo` (step 07)
made make export the cmdline var into the recipe's shell env, which
reached `runner.py` → `make setup` → `make dotenv`. The dotenv
generator's `setdefault` then baked the runtime-only value into the
on-disk `.env`. Step 08 sourced that .env, filtered `web-app-matomo`
out of its primary apps, and exited with "All primary apps disabled".
Fix:
- Drop the 7 routing knobs (apps, mode, purge, bundles, disable,
full_cycle, variant) from `passthrough.STATIC_KEYS` and from
`default.env`. They are per-invocation; .env is the persistent SPOT
and must not capture them.
- Switch every consumer from `os.environ["KEY"]` strict access to
`os.environ.get("KEY", "")` so the missing-key path stops at "no
filter" instead of a KeyError.
- Rename the env-var surface to match the make-alias surface 1:1
(lowercase): INFINITO_APPS → apps, INFINITO_SERVICES_DISABLED →
disable, INFINITO_BUNDLES → bundles, INFINITO_FULL_CYCLE →
full_cycle, INFINITO_VARIANT → variant, INFINITO_DEPLOY_MODE → mode,
INFINITO_PURGE_ENTITIES → purge. The make alias was the user-facing
name in every doc; routing-knob env vars now use the same name so
the cmdline form, the recipe env-prefix, and the consumer reads
all line up.
- Collapse the Makefile `compose-deploy` recipe to just the two
knobs whose alias differs from the env name (`type` →
INFINITO_DEPLOY_TYPE, `debug` → INFINITO_DEBUG). GNU Make
auto-exports cmdline variables into the recipe's shell env, so the
identical-name `$(if $(apps),apps="$(apps)")` lines were pure
noise.
- Drop `disable: ${disable}` from compose.yml. The dev CLI builds
`extra_env` per `docker exec` call and forwards `disable` via
`-e`, so the container env never needs the value frozen at
compose-up time.
- Update the 3 actual leak call sites
(07/08/09_deploy_*.sh) to the make-alias form
(`disable=matomo`, `full_cycle=true`, `variant=1`).
- Add `SIM112` to ruff's ignore set: the lowercase env names are
the deliberate make/env parity, not a typo.
Repro before fix: `INFINITO_SERVICES_DISABLED=matomo make dotenv`
wrote `INFINITO_SERVICES_DISABLED=matomo` to `.env`. After fix:
`disable=matomo make dotenv` leaves `.env` untouched.
Tests: `make test` and `make autoformat` green (2711 tests, 8 lint
sub-targets).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
165 lines
5.2 KiB
Python
165 lines
5.2 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, {"disable": "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={"disable": "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, "disable": ""}
|
|
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, "disable": ""}
|
|
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",
|
|
"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",
|
|
"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, "disable": ""}
|
|
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, {"disable": "from-env"}, clear=False),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["disable=from-cli"]))
|
|
|
|
compose.exec.assert_called_once_with(
|
|
["true"],
|
|
check=False,
|
|
extra_env={"disable": "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()
|