CherryPicked: [v4.20] ci(deps): lock file maintenance (main) (#2715)

* ci(deps): lock file maintenance (main) (#2702)

* ci(deps): lock file maintenance

* Update Python compatibility markers and modernize code

Update resolution markers to support Python 3.12 as primary version with 3.11 as fallback. Modernize Python 3.10+ syntax by replacing typing constructs with built-in generics (Optional → None union, List → list, Tuple → tuple). Update imports to use traceback at module level and refactor error handling from assert to raise AssertionError. Simplify failure summary output by removing truncation logic. Replace uv.lock with updated dependencies reflecting Python version changes.

* chore: update pre-commit dependencies

Update ruff to v0.15.12, gitleaks to v8.30.1, and mypy to v1.20.2. Also remove unnecessary space in string join operation in test fixture.

* Fix CLI tool invocations with missing configuration flags

Update pytest, prek, and ruff commands to include their required
configuration flags. Add `--group tests` to pytest invocation, add
`-c .pre-commit-config.yaml` to prek invocation, and add
`--config pyproject.toml` to ruff invocation. Also remove extra space
in string join operation for consistency.

* test: Update pytest invocation with test dependency group

The pytest command in the CLI test now includes the `--group tests` flag
to ensure the test dependencies are available when running pytest through
the uv package manager.

* Refactor imports in class_generator_template.j2

Reorganize imports to improve readability and add conditional import for MissingRequiredArgumentError. The exception import is now only included when there are required arguments that will actually use it, reducing unnecessary dependencies in generated classes with no required arguments.

* Remove extra blank line in class_generator_template.j2

* Improve file formatting with prek and ruff fallback

Add ruff as a fallback formatter when prek fails. Extract project root
path calculation to module level and pass configuration paths explicitly
to prek. Introduce _run_ruff_fallback() helper that runs ruff check and
ruff format sequentially. Update logging to clarify fallback behavior
and fix typo in prek stdout log message.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Meni Yakove <myakove@gmail.com>

* fix: revert ruff to v0.14.2, fix mock tests, regenerate manifests

- Revert ruff from v0.15.12 to v0.14.2 in pre-commit config to avoid
  90+ new lint errors from stricter rules on maintenance branch
- Fix TestCheckAndUpdateClusterVersion mock tests by adding
  _get_open_mode() helper to handle missing positional mode argument
- Regenerate 18 test manifest files to match current generator output

Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: rnetser <rnetser@redhat.com>

---------

Signed-off-by: rnetser <rnetser@redhat.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Meni Yakove <myakove@gmail.com>
Co-authored-by: rnetser <rnetser@redhat.com>

Author: 4 people

.pre-commit-config.yaml

@@ -51,12 +51,12 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.28.0
+    rev: v8.30.1
     hooks:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.2
+    rev: v1.20.2
     hooks:
       - id: mypy
         exclude: ^(tests/|examples/|docs/)

class_generator/cli.py

@@ -450,7 +450,7 @@ def handle_test_generation(add_tests: bool) -> None:
         import os
 
         test_file = "class_generator/tests/test_class_generator.py"
-        exit_code = os.system(f"uv run pytest {test_file}")
+        exit_code = os.system(f"uv run --group tests pytest {test_file}")
 
         # os.system returns the exit status shifted left by 8 bits
         if exit_code != 0:

class_generator/formatters/file_writer.py

@@ -1,14 +1,19 @@
 """File writing utilities for generated code."""
 
+from pathlib import Path
+
 from pyhelper_utils.shell import run_command
 from simple_logger.logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 
+# Project root directory (contains pyproject.toml and .pre-commit-config.yaml)
+_PROJECT_ROOT = Path(__file__).resolve().parent.parent.parent
+
 
 def write_and_format_rendered(filepath: str, output: str) -> None:
     """
-    Write rendered content to file and format it with prek.
+    Write rendered content to file and format with prek, falling back to ruff.
 
     Args:
         filepath: Path to write the file to
@@ -17,20 +22,50 @@ def write_and_format_rendered(filepath: str, output: str) -> None:
     with open(filepath, "w", encoding="utf-8") as fd:
         fd.write(output)
 
-    # Run prek on the file
+    pre_commit_config = str(_PROJECT_ROOT / ".pre-commit-config.yaml")
+    pyproject_toml = str(_PROJECT_ROOT / "pyproject.toml")
+
+    # Try prek first (runs all pre-commit hooks including ruff)
+    prek_success = False
     try:
         rc, stdout, stderr = run_command(
-            command=["uvx", "prek", "run", "--files", filepath],
+            command=["uvx", "prek", "-c", pre_commit_config, "run", "--files", filepath],
             verify_stderr=False,
             check=False,
             log_errors=False,
         )
         if not rc:
             if stderr:
-                LOGGER.warning(f"Prek hooks failed for {filepath}. This is non-fatal and generation will continue.")
+                LOGGER.warning(f"Prek hooks failed for {filepath}, falling back to ruff.")
                 LOGGER.debug(f"prek stderr: {stderr}")
+            else:
+                prek_success = True
+
             if stdout:
                 LOGGER.info(f"{filepath} fixed by prek")
-                LOGGER.debug(f"rek stdout: {stdout}")
+                LOGGER.debug(f"prek stdout: {stdout}")
     except Exception as e:
-        LOGGER.error(f"Failed to run prek hooks for {filepath}: {e}. This is non-fatal and generation will continue.")
+        LOGGER.warning(f"Failed to run prek for {filepath}, falling back to ruff: {e}")
+
+    if not prek_success:
+        _run_ruff_fallback(filepath=filepath, pyproject_toml=pyproject_toml)
+
+
+def _run_ruff_fallback(filepath: str, pyproject_toml: str) -> None:
+    """Run ruff check --fix and ruff format as fallback when prek fails."""
+    for ruff_cmd in (
+        ["uvx", "ruff", "check", "--fix", "--config", pyproject_toml, filepath],
+        ["uvx", "ruff", "format", "--config", pyproject_toml, filepath],
+    ):
+        try:
+            _, stdout, _ = run_command(
+                command=ruff_cmd,
+                verify_stderr=False,
+                check=False,
+                log_errors=False,
+            )
+            if stdout:
+                LOGGER.info(f"{filepath} fixed by ruff")
+                LOGGER.debug(f"ruff stdout: {stdout}")
+        except Exception as e:
+            LOGGER.error(f"Ruff fallback failed for {filepath}: {e}")

class_generator/manifests/class_generator_template.j2

@@ -14,8 +14,12 @@
 {% endfor %}
 
 from typing import Any
-from ocp_resources.resource import {{ base_class }}
+
+{% if all_required_args %}
 from ocp_resources.exceptions import MissingRequiredArgumentError
+{% endif %}
+from ocp_resources.resource import {{ base_class }}
+
 
 class {{ kind }}({{ base_class }}):
     """

class_generator/tests/manifests/APIServer/api_server.py

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 

class_generator/tests/manifests/ClusterOperator/cluster_operator.py

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 

class_generator/tests/manifests/ConfigMap/config_map.py

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import NamespacedResource
 
 

class_generator/tests/manifests/DNS/dns_config_openshift_io.py

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 

class_generator/tests/manifests/DNS/dns_operator_openshift_io.py

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 

class_generator/tests/manifests/Deployment/deployment.py

@@ -2,8 +2,9 @@
 
 
 from typing import Any
-from ocp_resources.resource import NamespacedResource
+
 from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class Deployment(NamespacedResource):