Files
computer-playbook/cli/deploy/dedicated/command.py
T
kevinveenbirkenbachandClaude Opus 4.7 26ef3ff504 chore(ruff): enable strict ruleset (E/F/I/B/UP, py311) — 2819 → 0
Adds ``[tool.ruff.lint]`` with ``select = ["E", "F", "I", "B", "UP"]``
and ``target-version = "py311"``. ``E501`` is ignored because
``ruff format`` already reflows what it can; the remaining long lines
are unsplittable string literals / URLs.

Auto-fixed (2753 issues, behavior-preserving):
- UP006/UP035: ``List[X]`` → ``list[X]``, ``Dict[X]`` → ``dict[X]``,
  ``from typing import …`` redirected where superseded by builtins.
- UP045: ``Optional[X]`` → ``X | None``.
- UP010/UP009/UP015: dropped Python-2-era pragmas (``from __future__
  import absolute_import, division, print_function``,
  ``# -*- coding: utf-8 -*-``), redundant ``open(..., "r")`` mode.
- UP004: dropped implicit ``class X(object):``.
- UP022/UP008/UP032: stdlib idiom modernization (``capture_output``,
  super-call simplification, etc.).
- B905: ``zip(...)`` → ``zip(..., strict=False)`` (preserves prior
  behavior; switching to ``strict=True`` is a separate semantic
  choice not made here).
- I001: import-block ordering.

Hand-fixed (66 issues):
- B904 × 54: appended ``from <bound>`` (when the enclosing ``except``
  binds a name) or ``from None`` (when it doesn't) so chained
  exceptions stay distinguishable from errors-during-exception-
  handling. Applied via a small AST-aware script that walked back to
  the enclosing ``except`` clause and matched the binding.
- B017 × 4: narrowed broad ``assertRaises(Exception)`` to the actual
  ``AnsibleError`` / ``AnsibleFilterError`` raised by the code under
  test.
- B023 × 2: bound captured loop variables via default args
  (``def _record(name, *, _path_real=path_real, ...)``) so each
  closure gets its own snapshot.
- B007 × 2: unused loop control variables renamed to ``_`` /
  rewritten to ``.values()``.
- UP007 × 2: ``Union[X, Y]`` → ``X | Y`` (plus dropping the now-unused
  ``from typing import Union``).
- B018 × 1: Odoo addon manifests are bare dict expressions at module
  level by design — suppressed with an inline ``# noqa: B018`` and
  rationale comment.
- UP031 × 1: printf-style format → f-string.

The 65 ``# noqa: …`` markers introduced by the auto-fixer all carry
real ruff codes (``B018``, ``E402``, ``F401``, etc.), so
``test_noqa_only_ruff_codes`` stays green.

Verification
============
- ``ruff check .`` → All checks passed
- ``ruff format --check .`` → 894 files already formatted
- ``tests.lint.repository.{test_project_root_import,
  test_no_direct_yaml_calls, test_noqa_only_ruff_codes}`` and
  ``tests.unit.utils.annotations.test_suppress`` → 20 tests OK
- 1621 unit tests → all pass
- Integration suite: 44 failures (pre-existing baseline, none from
  this change), 1 skipped.

Going forward, the new rules block regressions on E (style), F
(pyflakes), I (import order), B (likely-bug patterns), and UP
(modernization to py311) for any new code.

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

218 lines
6.5 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()
if not out:
return "[ansible-playbook --help returned no output]"
return out
except FileNotFoundError:
return "[ansible-playbook not found in PATH]"
except Exception as exc:
return f"[failed to run ansible-playbook --help: {exc}]"
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=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