Kevin Veen-BirkenbachandClaude Opus 5
2129c5e362
ruff was never wired into this repository: no target, no CI step, no pin. It reported 45 findings across sources and tests, so nothing enforced what the codebase already mostly followed. Adds `make ruff` (check + format --check), `make ruff-fix`, and `make lint` as its alias, and makes `make test` run lint as a fourth parallel spur. The CI workflow calls `make test`, so it is covered there too. The linter is pinned in a `lint` extra: a ruff minor bump changes which rules fire, and with the suite gating on a clean run an unpinned linter would fail it on an unrelated day. The 45 findings are fixed rather than configured away. Three needed a decision instead of the mechanical fix: - The generation timestamp keeps its local wall clock (DTZ005 waived). Generations sort by that name, and UTC would order new ones before the existing ones wherever the offset is positive - "newest generation" is what every restore path selects on. - The per-volume `copy` closure now binds volume_name and vol_dir as default arguments (B023). It only worked because it is called inside the same iteration. - The two CLI top-level handlers keep their blind except (BLE001 waived): turning any failure into exit 1 is what a CLI boundary is for. The two in run.py did not need it and were narrowed to what they actually catch. Also drops the comments that restate the code: the section banners in restore/__main__.py, the filename repeated as line 1 of nine test files, step narration above the statement it narrates, and a block in app.py documenting parameters that had moved to another module. What names a trip-wire stays - the snapshot destination rule, the mysql-binary absence in MariaDB 11 images, the session-scoped FOREIGN_KEY_CHECKS, the spooled temp file for multi-GB dumps, and the negative control that loses its discriminating power if it ever passes. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
87 lines
2.2 KiB
Python
87 lines
2.2 KiB
Python
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import sys
|
|
|
|
|
|
def run(
|
|
cmd: list[str],
|
|
*,
|
|
stdin=None,
|
|
capture: bool = False,
|
|
env: dict | None = None,
|
|
) -> subprocess.CompletedProcess:
|
|
try:
|
|
kwargs: dict = {
|
|
"check": True,
|
|
"capture_output": capture,
|
|
"env": env,
|
|
}
|
|
|
|
# If stdin is raw data (bytes/str), pass it via input=.
|
|
# IMPORTANT: when using input=..., do NOT pass stdin=... as well.
|
|
if isinstance(stdin, (bytes, str)):
|
|
kwargs["input"] = stdin
|
|
else:
|
|
kwargs["stdin"] = stdin
|
|
|
|
return subprocess.run(cmd, **kwargs) # noqa: PLW1510 - check lives in kwargs
|
|
|
|
except subprocess.CalledProcessError as e:
|
|
msg = f"ERROR: command failed ({e.returncode}): {' '.join(cmd)}"
|
|
print(msg, file=sys.stderr)
|
|
for stream in (e.stdout, e.stderr):
|
|
if not stream:
|
|
continue
|
|
try:
|
|
print(stream.decode(), file=sys.stderr)
|
|
except (UnicodeDecodeError, AttributeError):
|
|
print(stream, file=sys.stderr)
|
|
raise
|
|
|
|
|
|
def docker_exec(
|
|
container: str,
|
|
argv: list[str],
|
|
*,
|
|
stdin=None,
|
|
capture: bool = False,
|
|
env: dict | None = None,
|
|
docker_env: dict[str, str] | None = None,
|
|
) -> subprocess.CompletedProcess:
|
|
cmd: list[str] = ["docker", "exec", "-i"]
|
|
if docker_env:
|
|
for k, v in docker_env.items():
|
|
cmd.extend(["-e", f"{k}={v}"])
|
|
cmd.extend([container, *argv])
|
|
return run(cmd, stdin=stdin, capture=capture, env=env)
|
|
|
|
|
|
def docker_exec_sh(
|
|
container: str,
|
|
script: str,
|
|
*,
|
|
stdin=None,
|
|
capture: bool = False,
|
|
env: dict | None = None,
|
|
docker_env: dict[str, str] | None = None,
|
|
) -> subprocess.CompletedProcess:
|
|
return docker_exec(
|
|
container,
|
|
["sh", "-lc", script],
|
|
stdin=stdin,
|
|
capture=capture,
|
|
env=env,
|
|
docker_env=docker_env,
|
|
)
|
|
|
|
|
|
def docker_volume_exists(volume: str) -> bool:
|
|
p = subprocess.run(
|
|
["docker", "volume", "inspect", volume],
|
|
stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL,
|
|
check=False,
|
|
)
|
|
return p.returncode == 0
|