3 Commits

Include renames

Author	SHA1	Message	Date
kevinveenbirkenbachandClaude Opus 4.7	a26bfc4e94	refactor(cli): reorg admin/contributing tree + per-folder help system ... 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>	2026-05-08 20:17:09 +02:00
kevinveenbirkenbachandClaude Opus 4.7	170b16c59d	docs(design): rename matrix-deploy.md to variants.md, add inventory.md, sync cross-links ... Two design docs under docs/contributing/design/: - variants.md (renamed from matrix-deploy.md): explains the folder-per-round wrapper that consumes per-role meta/variants.yml and iterates variants at deploy time. Headings normalised to sentence-case; the "legacy unsuffixed inventory path" wording rewritten to drop the historical-context phrasing forbidden by documentation.md. - inventory.md (new): explains how a single round's inventory is assembled out of meta/services.yml plus the variant payloads, which inclusion mechanisms exist (operator --apps, run_after walk, shared-service auto-include via strict `is True`), what lives in the inventory file vs. host_vars/<host>.yml, and when Jinja actually gets rendered (only at play runtime, via utils.cache.applications._render_with_templar). Worked example documents the WordPress + Discourse wiring as a reference case. Cross-links updated wherever they pointed at matrix-deploy.md or its concept name as a file: - docs/agents/action/iteration/role.md - docs/contributing/actions/deploy.md - docs/contributing/artefact/files/plugins/lookup/applications.md - docs/contributing/artefact/files/role/variants.md - scripts/tests/deploy/local/deploy/reuse-kept-app.sh (path comment) Plain-text occurrences of "matrix-deploy" as a concept term inside Python comments, log messages, and test docstrings stay as-is; only file-link references are migrated. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-28 12:54:09 +02:00
kevinveenbirkenbachandClaude Opus 4.7	d97ed7a9e8	feat(deploy): per-role matrix-deploy variants with folder-per-round model ... Introduces per-role `meta/variants.yml` for declaring multi-variant deploys (e.g. WordPress Single-Site vs. Multisite) and reshapes the development deploy CLI to materialise one inventory folder per variant and iterate them with co-located sync+async passes. Why: - The previous single-inventory + Pass-1-then-Pass-2 split deployed each variant twice and ran the async pass against a host left in a different variant's state, masking real bugs. - Inventory and runtime concerns were tangled: variant selection lived as a runtime extra-var and required cross-stage coordination. How: - `roles/<role>/meta/variants.yml` (file format docs at docs/contributing/artefact/files/role/variants.md): YAML list of deep-merge overrides on top of `config/main.yml`. Empty entry `{}` is variant 0 (= legacy payload). 6 roles get their dev overrides moved here from inventories/dev.yml; WordPress declares 2 variants. - `utils/runtime_data.py` gains `_build_variants` / `get_variants` and drops the retired `_active_variants` runtime selector. Loader always returns variant 0 as the default; non-zero variants reach `get_merged_applications` as inventory-level `applications.<app>` overrides baked at init time. - New `cli/deploy/development/inventory.py`: `DevInventorySpec`, `plan_dev_inventory_matrix` (pure planner shared between init and deploy), `build_dev_inventory_matrix` (materialises one folder per round at `<dir>-<R>`, or `<dir>` when single-variant). Single-folder paths preserve full backward compat. - `cli/deploy/development/deploy.py`: matrix loop with per-round cleanup (only apps whose variant changed AND that are about to re-deploy), `--variant <idx>` (or `VARIANT=` env) to pin a single round, and `--full-cycle` (or `FULL_CYCLE=true`) which interleaves sync + async per round so the async re-deploy targets exactly the host state the matching sync deploy just produced. - `cli/deploy/development/exec.py` gains repeatable `--env KEY=VAL` so bash callers can inject per-run context into in-container helpers without inlining heredocs. - `scripts/meta/env/inventory.sh` exports `INVENTORY_VARS_FILE` (Python mirror in `cli.deploy.development.common.DEV_INVENTORY_VARS_FILE`; test_inventory_vars_file_spot.py locks them against drift). - `make deploy-fresh-purged-apps` and `scripts/tests/deploy/ci/dedicated.sh` switch to a single init + single deploy `--full-cycle`. The `make deploy-reuse-*` bash scripts honour `VARIANT=` by suffixing `INVENTORY_DIR`/`INVENTORY_FILE`. - The 5 `scripts/tests/deploy/local/deploy/*.sh` scripts now delegate their in-container heredocs to dedicated helpers in `scripts/tests/deploy/local/utils/`, removing the bash-in-bash quoting hell. Tests: - `tests/unit/utils/test_variants.py` (renamed from `test_application_variants.py`): loader edge cases, variant-zero default, retired-`_active_variants` guard. - `tests/unit/cli/deploy/development/test_inventory.py` (new): planner, variant baking, builder, `filter_plan_to_variant`, `DevInventorySpec`. - `tests/unit/cli/deploy/development/test_matrix_deploy.py` (new): per-round deploy filter, cleanup decisions, `--variant` pinning, `--full-cycle` per-round interleave. - `tests/unit/cli/deploy/development/test_inventory_vars_file_spot.py` (new): drift guard for the bash <-> Python literal pair. - `tests/unit/cli/deploy/development/test_exec.py` extended for `--env`. Docs: - `docs/contributing/artefact/files/role/variants.md` (new): file format. - `docs/contributing/design/matrix-deploy.md` (new): runtime mechanism (folder layout, --variant, --full-cycle, cleanup logic). - `docs/contributing/actions/deploy.md` (new): contributor dev-deploy flow (make targets, --variant pinning). - `docs/administration/deploy.md` slimmed to admin-only (was mixed admin+dev), cross-links to the new contributor doc. - `docs/agents/action/iteration/role.md` keeps only agent-iteration recipes; mechanism explanation moved out and linked. - `docs/contributing/documentation.md` adds the "no self-SPOT declaration" rule; `applications.md` renamed its SoT header for consistency. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-25 13:47:48 +02:00