mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-10 04:36:40 +00:00
Extends ``[tool.ruff.lint].select`` with six additional rule families:
``RUF`` (ruff-specific), ``SIM`` (flake8-simplify), ``C4``
(flake8-comprehensions), ``PERF`` (perflint), ``RET`` (flake8-return),
``PIE`` (flake8-pie). Adds ``RUF001/002/003`` to ``ignore`` because
those exist for homoglyph-attack detection, not English typography —
the project uses em/en-dashes and ``ℹ`` as a UI-hint glyph in CLI help
output deliberately.
Auto-fixed (~225, mechanical & behavior-preserving)
====================================================
- RUF005: ``a + [b]`` → ``[*a, b]``
- C408: ``dict(k=v)`` → ``{"k": v}``
- C420: ``dict.fromkeys(seq)`` shape simplifications
- SIM103/SIM110/SIM118: truthy-return / dict-key / dict-method
idiom simplifications
- RET504/RET505: drop unneeded final assigns / ``else`` after
``return``
- PIE810: combine ``str.startswith(a) or .startswith(b)``
into one call with a tuple
- RUF010: ``f"{str(x)}"`` → ``f"{x\!s}"``
- RUF100: removed unused ``# noqa`` directives that
became stale (mostly old ``# noqa: E402``
markers that ruff's smart E402 implementation
no longer flags after ``sys.path`` shims)
- RUF015 / RUF013 / RUF022 / RUF046 / RUF059: misc small wins
- I001: re-sorted import blocks where the new
imports above shifted them
Hand-fixed (~140, scripted where mechanical)
============================================
PERF401 (42): scripted AST rewrite of
``for x in iter: target.append(expr)`` (with optional ``if`` guard)
→ ``target.extend(expr for x in iter [if cond])``.
``list.extend(genexp)`` consumes the generator immediately, so the
rewrite is semantically equivalent to the original eager loop.
SIM117 (41): scripted AST combiner for nested ``with`` blocks where
the inner is the only statement of the outer (38 sites). The remaining
3 multi-line ``patch.object(...)`` chains were combined by hand using
the parenthesised ``with (\\n A,\\n B,\\n):`` form.
SIM102 (14): scripted AST combiner for nested ``if`` (10 sites). The
remaining 4 carry an inline ``# noqa: SIM102`` with rationale —
combining would either change semantics (the outer body has siblings
beyond the inner ``if``, e.g. ``cli/encrypt/inventory/__main__.py``
where ``encrypted_value = …`` runs regardless of ``ask_confirmation``)
or hurt readability (long literal whitelists).
RUF012 (9): annotated mutable class attributes with ``ClassVar[…]``
and added ``from typing import ClassVar``.
SIM105 (6): ``try/except: pass`` → ``with contextlib.suppress(…):``
with the necessary ``import contextlib`` added. Verified on
``utils/templating.py`` (3 occurrences in a ``finally`` block) —
cleanup behaviour is identical.
SIM115 (4): wrapped ``tempfile.NamedTemporaryFile(..., delete=False)``
call patterns in a ``with`` block; ``delete=False`` keeps the file
on disk after the block, so callers' ``return f.name`` still works.
PERF402, PERF403, B007, SIM108, SIM103: 5 misc fixes (loop→list-copy,
loop→dict-comprehension, unused-loop-var rename, ternary, return
expression).
Verification
============
- ``ruff check .`` → All checks passed
- ``ruff format --check .`` → 894 files already formatted
- 1621 unit tests → all pass
- Integration suite: 44 baseline failures, 1 skipped (unchanged)
- Sample-audited PERF401 rewrites in ``resolver.py``, ``inventory.py``,
``cache/files.py``, ``ressources/__main__.py``; SIM117 in
``test_main.py``; SIM105 in ``utils/templating.py``; SIM102 noqa
rationales in ``cli/encrypt/inventory/__main__.py``.
182 files changed, +993 / −960. With this and the prior strict-rule
commit the branch satisfies 11 ruff rule families end-to-end.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
133 lines
4.4 KiB
Python
133 lines
4.4 KiB
Python
from __future__ import annotations
|
|
|
|
import datetime
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from cli.create.inventory.services_disabler import (
|
|
ServicesDisabledConflictError,
|
|
assert_services_disabled_inventory_consistency_from_env,
|
|
)
|
|
|
|
from .proc import run, run_make
|
|
|
|
|
|
def run_ansible_playbook(
|
|
*,
|
|
repo_root: str,
|
|
playbook_path: str,
|
|
inventory_validator_path: str,
|
|
inventory: str,
|
|
modes: dict[str, Any],
|
|
limit: str | None = None,
|
|
allowed_applications: list[str] | None = None,
|
|
password_file: str | None = None,
|
|
verbose: int = 0,
|
|
skip_build: bool = False,
|
|
diff: bool = False,
|
|
ansible_args: list[str] | None = None,
|
|
) -> None:
|
|
"""Run ansible-playbook with the given parameters and execution modes."""
|
|
start_time = datetime.datetime.now()
|
|
print(f"\n▶️ Script started at: {start_time.isoformat()}\n")
|
|
|
|
# ---------------------------------------------------------
|
|
# 1) Cleanup Phase (wrapper-level)
|
|
# ---------------------------------------------------------
|
|
if modes.get("MODE_CLEANUP", False):
|
|
print("\n🧹 Cleaning up...\n", flush=True)
|
|
run_make(repo_root, "clean")
|
|
else:
|
|
print("\n🧹 Cleanup skipped (MODE_CLEANUP not set or False)\n")
|
|
|
|
# ---------------------------------------------------------
|
|
# 2) Build Phase
|
|
# ---------------------------------------------------------
|
|
if not skip_build:
|
|
print("\n🛠️ Running project build (make setup)...\n")
|
|
run_make(repo_root, "setup")
|
|
else:
|
|
print("\n🛠️ Build skipped (--skip-build)\n")
|
|
|
|
# ---------------------------------------------------------
|
|
# 3) SERVICES_DISABLED consistency guard
|
|
# ---------------------------------------------------------
|
|
try:
|
|
assert_services_disabled_inventory_consistency_from_env(
|
|
inventory_dir=Path(inventory).resolve().parent,
|
|
roles_dir=Path(repo_root).resolve() / "roles",
|
|
)
|
|
except ServicesDisabledConflictError as exc:
|
|
print(f"\n[ERROR] {exc}\n", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
# ---------------------------------------------------------
|
|
# 4) Inventory Validation Phase
|
|
# ---------------------------------------------------------
|
|
if modes.get("MODE_ASSERT") is False:
|
|
print("\n🔍 Inventory assertion explicitly disabled (MODE_ASSERT=false)\n")
|
|
else:
|
|
print("\n🔍 Validating inventory before deployment...\n")
|
|
try:
|
|
run(
|
|
[sys.executable, inventory_validator_path, os.path.dirname(inventory)],
|
|
cwd=repo_root,
|
|
check=True,
|
|
)
|
|
except subprocess.CalledProcessError:
|
|
print(
|
|
"\n[ERROR] Inventory validation failed. Aborting deployment.\n",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
|
|
# ---------------------------------------------------------
|
|
# 5) Build ansible-playbook command
|
|
# ---------------------------------------------------------
|
|
cmd: list[str] = ["ansible-playbook", "-i", inventory, playbook_path]
|
|
|
|
if limit:
|
|
cmd.extend(["-l", limit])
|
|
|
|
# Wrapper-provided extra-vars first; user can override via passthrough -e later.
|
|
if allowed_applications:
|
|
joined = ",".join(allowed_applications)
|
|
cmd.extend(["-e", f"allowed_applications={joined}"])
|
|
|
|
for key, value in modes.items():
|
|
val = str(value).lower() if isinstance(value, bool) else str(value)
|
|
cmd.extend(["-e", f"{key}={val}"])
|
|
|
|
if password_file:
|
|
cmd.extend(["--vault-password-file", password_file])
|
|
|
|
if diff:
|
|
cmd.append("--diff")
|
|
|
|
if modes.get("MODE_DEBUG", False):
|
|
verbose = max(verbose, 3)
|
|
|
|
if verbose:
|
|
cmd.append("-" + "v" * verbose)
|
|
|
|
# Native ansible-playbook flags passthrough (must come last for override behavior)
|
|
if ansible_args:
|
|
cmd.extend(ansible_args)
|
|
|
|
print("\n🚀 Launching Ansible Playbook...\n")
|
|
result = subprocess.run(cmd, cwd=repo_root)
|
|
|
|
if result.returncode != 0:
|
|
print(
|
|
f"\n[ERROR] ansible-playbook exited with status {result.returncode}\n",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(result.returncode)
|
|
|
|
end_time = datetime.datetime.now()
|
|
print(f"\n✅ Script ended at: {end_time.isoformat()}\n")
|
|
print(f"⏱️ Total execution time: {end_time - start_time}\n")
|