mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-07 03:15:56 +00:00
kevinveenbirkenbachandClaude Opus 4.7
a26bfc4e94
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>
50 lines
1.6 KiB
Python
50 lines
1.6 KiB
Python
from __future__ import annotations
|
|
|
|
import unittest
|
|
import unittest.mock
|
|
|
|
from cli.administration.deploy.dedicated import apps
|
|
|
|
|
|
class TestValidateApplicationIds(unittest.TestCase):
|
|
def test_no_ids_does_nothing(self):
|
|
# Should not raise
|
|
apps.validate_application_ids("/etc/inventories/github-ci/devices.yml", [])
|
|
|
|
@unittest.mock.patch("utils.roles.validation.deploy_id.ValidDeployId")
|
|
def test_invalid_ids_raise_system_exit(self, mock_vdi_cls):
|
|
instance = mock_vdi_cls.return_value
|
|
instance.validate.return_value = {
|
|
"web-app-foo": {"allowed": False, "in_inventory": True},
|
|
"web-app-bar": {"allowed": True, "in_inventory": False},
|
|
}
|
|
|
|
with self.assertRaises(SystemExit) as ctx:
|
|
apps.validate_application_ids(
|
|
"/etc/inventories/github-ci/devices.yml",
|
|
["web-app-foo", "web-app-bar"],
|
|
)
|
|
|
|
self.assertEqual(ctx.exception.code, 1)
|
|
instance.validate.assert_called_once_with(
|
|
"/etc/inventories/github-ci/devices.yml",
|
|
["web-app-foo", "web-app-bar"],
|
|
)
|
|
|
|
@unittest.mock.patch("utils.roles.validation.deploy_id.ValidDeployId")
|
|
def test_valid_ids_do_not_exit(self, mock_vdi_cls):
|
|
instance = mock_vdi_cls.return_value
|
|
instance.validate.return_value = {}
|
|
|
|
# Should not exit
|
|
apps.validate_application_ids(
|
|
"/etc/inventories/github-ci/devices.yml",
|
|
["web-app-foo"],
|
|
)
|
|
|
|
instance.validate.assert_called_once()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|