mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 11:46:35 +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>
77 lines
2.0 KiB
Bash
Executable File
77 lines
2.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
: "${GHCR_NAMESPACE:?Missing GHCR_NAMESPACE}"
|
|
: "${GHCR_REPOSITORY:?Missing GHCR_REPOSITORY}"
|
|
: "${GHCR_PREFIX:?Missing GHCR_PREFIX}"
|
|
: "${REPO_ROOT:?Missing REPO_ROOT}"
|
|
ghcr_namespace="$(echo "${GHCR_NAMESPACE}" | tr '[:upper:]' '[:lower:]')"
|
|
: "${IMAGE_WAIT_SLEEP_SECONDS:?Missing IMAGE_WAIT_SLEEP_SECONDS}"
|
|
: "${IMAGE_WAIT_ATTEMPTS:?Missing IMAGE_WAIT_ATTEMPTS}"
|
|
|
|
max_attempts="${IMAGE_WAIT_ATTEMPTS}"
|
|
sleep_seconds="${IMAGE_WAIT_SLEEP_SECONDS}"
|
|
|
|
mapfile -t mirror_refs < <(
|
|
GHCR_NAMESPACE="${ghcr_namespace}" \
|
|
GHCR_REPOSITORY="${GHCR_REPOSITORY}" \
|
|
GHCR_PREFIX="${GHCR_PREFIX}" \
|
|
REPO_ROOT="${REPO_ROOT}" \
|
|
python - <<'PY'
|
|
import os
|
|
from pathlib import Path
|
|
from cli.contributing.mirror.providers import GHCRProvider
|
|
from utils.docker.image_discovery import iter_role_images
|
|
|
|
provider = GHCRProvider(
|
|
os.environ["GHCR_NAMESPACE"],
|
|
os.environ["GHCR_REPOSITORY"],
|
|
os.environ["GHCR_PREFIX"],
|
|
)
|
|
repo_root = Path(os.environ["REPO_ROOT"]).resolve()
|
|
|
|
seen = set()
|
|
for img in iter_role_images(repo_root):
|
|
ref = f"{provider.image_base(img)}:{img.version}"
|
|
if ref in seen:
|
|
continue
|
|
seen.add(ref)
|
|
print(ref)
|
|
PY
|
|
)
|
|
|
|
total="${#mirror_refs[@]}"
|
|
if [[ "${total}" -eq 0 ]]; then
|
|
echo "No mirror refs found. Nothing to wait for."
|
|
exit 0
|
|
fi
|
|
|
|
echo "Fork pull_request detected; waiting for mirrored images from pull_request_target."
|
|
echo "Need ${total} mirror refs."
|
|
|
|
missing=()
|
|
for attempt in $(seq 1 "${max_attempts}"); do
|
|
missing=()
|
|
for ref in "${mirror_refs[@]}"; do
|
|
if ! skopeo inspect "docker://${ref}" >/dev/null 2>&1; then
|
|
missing+=("${ref}")
|
|
fi
|
|
done
|
|
|
|
if [[ "${#missing[@]}" -eq 0 ]]; then
|
|
echo "All mirrored images are available."
|
|
exit 0
|
|
fi
|
|
|
|
echo "[${attempt}/${max_attempts}] Missing ${#missing[@]}/${total} mirror refs. Waiting ${sleep_seconds}s..."
|
|
echo "Example missing: ${missing[0]}"
|
|
sleep "${sleep_seconds}"
|
|
done
|
|
|
|
echo "Timed out waiting for mirrored images." >&2
|
|
echo "Still missing (first 20):" >&2
|
|
for ref in "${missing[@]:0:20}"; do
|
|
echo " - ${ref}" >&2
|
|
done
|
|
exit 1
|