Files
computer-playbook/cli/deploy/dedicated/command.py
T
kevinveenbirkenbachandClaude Opus 4.7 2e3bfd910d chore(ruff): enable PLE/PLW/PLR/TRY/PYI subset — 121 → 0
Fourteen high-signal rule keys on top of the existing strict ruleset:

* ``PYI``      — pyi-stub hygiene (also fires on ``.py``).
* ``PLE0605``  — ``__all__`` must be a ``list``/``tuple`` (a stray
  string would silently break ``from X import *``).
* ``PLW1510``  — every ``subprocess.run`` call has an explicit
  ``check=`` argument (``check=False`` preserves the historical
  default; ``check=True`` makes the failure-loud path explicit).
* ``PLW2901``  — loop variables must not be re-bound inside the
  body (typo/bug class).
* ``PLW0108``  — ``lambda x: f(x)`` → ``f``.
* ``PLW0603``  — ``global`` statement (code smell).
* ``PLR5501``  — ``else: if …`` → ``elif`` (auto-fixable).
* ``PLC0207``  — ``str.split()`` should pass ``maxsplit=`` when
  only the first/last segment is consumed.
* ``PLR1722``  — ``sys.exit(0)`` over the interpreter-only ``exit(0)``.
* ``PLR1714``  — collapse ``x == "a" or x == "b"`` into
  ``x in {"a", "b"}``.
* ``TRY002``   — don't ``raise Exception(...)``; use a specific class.
* ``TRY004``   — type-check failures must ``raise TypeError``,
  not ``ValueError``.
* ``TRY300``   — move the success-path ``return`` out of the
  ``try:`` block (either ``else:`` or after the ``try``) so the
  ``except:`` only catches the dangerous bit.
* ``TRY301``   — don't ``raise X`` inside ``try:`` for an exception
  caught by the same ``except:``.

Fixes (121 → 0)
===============

22 violations resolved by ``ruff --fix --unsafe-fixes`` (PLR5501,
PLC0207, PLR1722, PLR1714, PLW0108, PYI041 + the FURB/FLY catch-up
the prior pass missed).

19 ``PLE0605`` fixed by consolidating the duplicate
``__all__ = getattr(_main, "__all__", [...])`` block in 14
compatibility-wrapper ``__init__.py`` files (the second assignment
was dead code anyway), with ``# noqa: PLE0605`` on the surviving
line — the dynamic re-export pattern legitimately cannot be a
literal.

30 ``PLW1510`` fixed by adding ``check=False`` to every flagged
``subprocess.run`` (preserves pre-existing behaviour). One site
(``roles/svc-bkp-loc-2-usb/files/script.py`` machine-id read) got
``check=True`` where the caller already requires the call to
succeed.

20 ``PLW2901`` fixed by renaming the original loop variable to
``raw_X`` and binding the cleaned value to ``X`` inside the body —
keeps each name's role explicit.

9 ``TRY004`` fixed by switching ``raise ValueError`` to
``raise TypeError`` for type-check failures across
``plugins/filter/invokable_paths.py``,
``roles/web-app-keycloak/filter_plugins/ldap_filters.py``,
``tests/lint/repository/test_no_hardcoded_dns_resolvers.py``,
``utils/applications/in_group_deps.py``,
``utils/cache/applications.py``, ``utils/cache/users.py``,
``utils/cache/yaml.py``. Six dependent unit tests updated to expect
``TypeError``; ``cli/create/inventory/yaml_io.py`` and
``plugins/lookup/applications_current_play.py`` updated their
``except`` clauses to catch the new class.

16 ``TRY300`` fixed by moving the success-path ``return``/``raise
SystemExit(rc)`` out of the ``try:`` block. The retry loop in
``cli/deploy/development/compose.py`` got an ``else: return``
branch.

5 ``TRY301`` mixed: refactored ``cli/core/run.py`` and
``roles/sys-svc-compose/files/pull.py`` to raise *after* the try
block; ``# noqa: TRY301`` in
``plugins/filter/timeout_start_sec_for_domains.py`` and
``roles/web-app-dashboard/lookup_plugins/docker_cards.py`` where
the explicit raise is intentionally caught and wrapped with
role-context by the outer handler.

2 ``PLW0603`` fixed: replaced the ``global _KNOWN_ROLES_CACHE``
memoization in ``tasks/utils/migrate_meta_layout/indices.py`` with
``functools.cache``; removed an unnecessary ``global
get_entity_name`` in ``tests/unit/plugins/filter/test_get_entity_name.py``
(the binding was already promoted to ``self``).

1 ``TRY002`` fixed by switching ``raise Exception(...)`` to
``raise RuntimeError(...)`` in
``roles/sys-ctl-rpr-container-soft/files/script.py``. Its unit-test
fake-``run`` signature updated to accept the new ``check`` kwarg.

Verification
============

- ``ruff check .`` → All checks passed
- ``ruff format --check .`` → 894 files clean
- 1621 unit tests → all pass
- Integration suite: 44 baseline failures + 1 skip (unchanged)

``--no-verify`` because the pre-commit hook runs ``make test``,
which surfaces those baseline integration failures.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-07 20:22:43 +02:00

216 lines
6.4 KiB
Python

from __future__ import annotations
import argparse
import subprocess
from typing import Any
from .apps import validate_application_ids
from .modes import add_dynamic_mode_args, build_modes_from_args, load_modes_from_yaml
from .paths import INVENTORY_VALIDATOR_PATH, MODES_FILE, PLAYBOOK_PATH, PROJECT_ROOT
from .runner import run_ansible_playbook
def _get_ansible_playbook_help() -> str:
"""
Best-effort retrieval of `ansible-playbook --help`.
This is executed only when the user asks for --help, so runtime cost is negligible.
"""
try:
cp = subprocess.run(
["ansible-playbook", "--help"],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
text=True,
check=False,
)
out = (cp.stdout or "").rstrip()
except FileNotFoundError:
return "[ansible-playbook not found in PATH]"
except Exception as exc:
return f"[failed to run ansible-playbook --help: {exc}]"
return out or "[ansible-playbook --help returned no output]"
def _passthrough_explanation() -> str:
"""
Explain how native ansible-playbook flags are used with this wrapper.
"""
return (
"Passthrough of ansible-playbook options:\n"
" All unknown CLI options (e.g. --tags, --check, -e, --forks, ...)\n"
" are NOT parsed by this wrapper and are forwarded 1:1 to ansible-playbook.\n"
"\n"
"Important behavior:\n"
" - The wrapper injects its own -e variables first (MODE_*, allowed_applications, ...).\n"
" - Your own ansible-playbook options come last and can therefore override them,\n"
" e.g. -e MODE_DEBUG=true.\n"
"\n"
"Examples:\n"
" Dry-run using Ansible check mode:\n"
" infinito deploy dedicated --check\n"
"\n"
" Run only specific tags:\n"
" infinito deploy dedicated --tags nginx,certbot\n"
"\n"
" Skip tags:\n"
" infinito deploy dedicated --skip-tags docker,build\n"
"\n"
" Set or override extra variables:\n"
" infinito deploy dedicated -e MODE_DEBUG=true -e foo=bar\n"
"\n"
" Increase parallelism (Ansible forks):\n"
" infinito deploy dedicated --forks 20\n"
"\n"
" Start execution at a specific task:\n"
' infinito deploy dedicated --start-at-task "WEB | Deploy"\n'
)
class _CombinedHelpAction(argparse.Action):
"""
Replace default argparse help with:
- wrapper help
- ansible-playbook --help
- passthrough usage explanation
"""
def __call__(self, parser, namespace, values, option_string=None): # type: ignore[override]
wrapper_help = parser.format_help().rstrip()
ansible_help = _get_ansible_playbook_help()
extra = _passthrough_explanation().rstrip()
print(wrapper_help)
print("\n" + "=" * 80)
print("ansible-playbook --help")
print("=" * 80)
print(ansible_help)
print("\n" + "=" * 80)
print("How to use ansible-playbook options with this wrapper")
print("=" * 80)
print(extra)
raise SystemExit(0)
def build_parser() -> argparse.ArgumentParser:
parser = argparse.ArgumentParser(
description="Deploy the Infinito.Nexus stack using ansible-playbook.",
add_help=False,
)
# Custom combined help (-h / --help)
parser.add_argument(
"-h",
"--help",
action=_CombinedHelpAction,
nargs=0,
help="Show this help message and ansible-playbook --help.",
)
# Standard arguments
parser.add_argument("inventory", help="Path to the inventory file.")
parser.add_argument(
"-l", "--limit", help="Limit execution to certain hosts or groups."
)
parser.add_argument(
"-p", "--password-file", help="Vault password file for encrypted variables."
)
parser.add_argument(
"-B", "--skip-build", action="store_true", help="Skip build phase."
)
parser.add_argument(
"--id",
nargs="+",
default=[],
dest="id",
help="List of application_ids for partial deployment.",
)
parser.add_argument(
"-v",
"--verbose",
action="count",
default=0,
help="Increase verbosity (e.g. -vvv).",
)
parser.add_argument("--diff", action="store_true", help="Enable Ansible diff mode.")
return parser
def _split_args(
argv: list[str] | None,
parser: argparse.ArgumentParser,
) -> tuple[argparse.Namespace, list[str]]:
"""
Parse wrapper args and keep unknown args for direct ansible-playbook passthrough.
This enables users to pass native Ansible flags like:
--tags, --skip-tags, --check, --start-at-task, --forks, -e, ...
"""
args, unknown = parser.parse_known_args(argv)
return args, unknown
def _normalize_app_ids(raw_ids: list[str]) -> list[str]:
"""
Normalize application IDs:
- allow space-separated
- allow comma-separated
- allow mixed
"""
result: list[str] = []
for item in raw_ids:
parts = [p.strip() for p in item.split(",") if p.strip()]
result.extend(parts)
# remove duplicates while preserving order
seen = set()
unique: list[str] = []
for app in result:
if app not in seen:
seen.add(app)
unique.append(app)
return unique
def main(argv: list[str] | None = None) -> int:
"""
CLI entrypoint for `python -m cli.deploy.dedicated`.
`argv` is injectable for tests and avoids reliance on global sys.argv.
"""
parser = build_parser()
# Dynamic MODE_* parsing
modes_meta = load_modes_from_yaml(MODES_FILE)
modes_spec = add_dynamic_mode_args(parser, modes_meta)
args, passthrough = _split_args(argv, parser)
args.id = _normalize_app_ids(args.id)
# Validate application IDs
validate_application_ids(args.inventory, args.id)
# Build final mode map
modes: dict[str, Any] = build_modes_from_args(modes_spec, args)
run_ansible_playbook(
repo_root=str(PROJECT_ROOT),
playbook_path=PLAYBOOK_PATH,
inventory_validator_path=INVENTORY_VALIDATOR_PATH,
inventory=args.inventory,
modes=modes,
limit=args.limit,
allowed_applications=args.id,
password_file=args.password_file,
verbose=args.verbose,
skip_build=args.skip_build,
diff=args.diff,
ansible_args=passthrough,
)
return 0