mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 19:01:54 +00:00
Module moves (with imports, paths, argv literals, scripts, docs, and
parents[N] formulas updated in lockstep):
- cli/deploy -> cli/administration/deploy
- cli/validate/inventory -> cli/administration/inventory/validate
- cli/vault -> cli/administration/secrets/vault
- cli/administration/inventory/encrypt -> cli/administration/secrets/seal
- cli/mirror -> cli/contributing/mirror
The new cli/administration/secrets cluster collocates the whole-file
ansible-vault wrapper next to the inventory-aware per-field sealer.
The user-facing CLI subcommand paths follow the package layout, e.g.
"infinito administration deploy dedicated <inv>" and
"infinito administration inventory validate <inv>".
Help system redesign in cli/core/{discovery,help,app}.py:
- Discovery now distinguishes runnable commands (directories with
__main__.py) from category folders (directories that only group
further commands). Empty support packages are filtered out.
- Each category folder MAY carry a README.md; its H1 heading is used
as the title and its first paragraph as the one-line description in
the help output.
- "infinito" / "infinito --help" prints only the top-level entries
(one level deep). "infinito <category>" navigates into a folder and
shows its sub-folders and commands one level deep, with the README
title as the page heading and the invocation as a dim subtitle.
- New "--tree [N]" flag walks the tree under the (optional) path
prefix recursively. N caps the depth (1-based); omit N for an
unbounded walk. The output uses Unicode tree connectors, an emoji
per entry (folder for categories, gear for commands), a globally
aligned description column, and multi-line wrapped descriptions
with tree-continuity bars on continuation lines.
- Category and command listings use the full invocation
("infinito meta callorder") rather than the bare leaf name, so the
output is copy-pasteable.
Convention doc + 17 CLI READMEs:
- New docs/contributing/artefact/files/cli/readme_md.md describes the
H1+paragraph layout the help system reads, and how it differs from
role/docs READMEs.
- README.md added for cli/{administration, build, contributing, meta}
and their immediate sub-folders, plus cli/meta/roles/applications
and its resolution sub-folder. Each follows the "title with trailing
emoji + single descriptive paragraph" convention.
Mirror resolver/sync description strings (the help system reads them
from argparse --help output) added so they no longer surface as
"options:" in the global index. cli/mirror/cleanup already had a
description and is unchanged.
Fixes uncovered by the move:
- import unittest.mock added to four dedicated-deploy tests so
unittest.mock.patch resolves under stdlib unittest discovery
(Python 3.13 no longer surfaces unittest.mock through "import
unittest" alone).
- parents[N] index in the new
cli/administration/inventory/validate/__init__.py corrected from
3 to 4 to match the deeper layout.
- test_paths.INVENTORY_VALIDATOR_PATH assertion and test_runner
substring assertions updated to match the new validator path.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
166 lines
5.3 KiB
Python
166 lines
5.3 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, {"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={"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 = {k: v for k, v in os.environ.items() if k != "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 = {k: v for k, v in os.environ.items() if k != "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=["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={
|
|
"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 = {k: v for k, v in os.environ.items() if k != "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, {"SERVICES_DISABLED": "from-env"}, clear=False
|
|
),
|
|
):
|
|
exec_cmd.handler(_args(cmd=["true"], env=["SERVICES_DISABLED=from-cli"]))
|
|
|
|
compose.exec.assert_called_once_with(
|
|
["true"],
|
|
check=False,
|
|
extra_env={"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()
|