mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
kevinveenbirkenbachandClaude Opus 4.7
26ef3ff504
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>
59 lines
2.0 KiB
Python
59 lines
2.0 KiB
Python
from ansible.errors import AnsibleFilterError
|
|
|
|
|
|
def get_primary_domain(domains, application_id):
|
|
"""
|
|
Return the primary domain for application_id from the domains mapping:
|
|
- If value is a string, return it.
|
|
- If value is a dict, return its first value.
|
|
- If value is a list, return its first element.
|
|
- Otherwise, raise an error.
|
|
"""
|
|
if not isinstance(domains, dict):
|
|
raise AnsibleFilterError(
|
|
f"'domains' must be a dict, got {type(domains).__name__}"
|
|
)
|
|
|
|
if application_id not in domains:
|
|
raise AnsibleFilterError(
|
|
f"application_id '{application_id}' not found in domains mapping"
|
|
)
|
|
|
|
val = domains[application_id]
|
|
|
|
if isinstance(val, str):
|
|
if not val:
|
|
raise AnsibleFilterError(f"domains['{application_id}'] is an empty string")
|
|
return val
|
|
|
|
if isinstance(val, dict):
|
|
try:
|
|
first_val = next(iter(val.values()))
|
|
except StopIteration:
|
|
raise AnsibleFilterError(
|
|
f"domains['{application_id}'] dict is empty"
|
|
) from None
|
|
if not isinstance(first_val, str) or not first_val:
|
|
raise AnsibleFilterError(
|
|
f"first value of domains['{application_id}'] must be a non-empty string, got {first_val!r}"
|
|
)
|
|
return first_val
|
|
|
|
if isinstance(val, list):
|
|
if not val:
|
|
raise AnsibleFilterError(f"domains['{application_id}'] list is empty")
|
|
first = val[0]
|
|
if not isinstance(first, str) or not first:
|
|
raise AnsibleFilterError(
|
|
f"first element of domains['{application_id}'] must be a non-empty string, got {first!r}"
|
|
)
|
|
return first
|
|
|
|
raise AnsibleFilterError(
|
|
f"domains['{application_id}'] has unsupported type {type(val).__name__}, must be str, dict or list"
|
|
)
|
|
|
|
|
|
def get_domain(domains, application_id):
|
|
return get_primary_domain(domains, application_id)
|