openshift-python-wrapper 4.20.6__tar.gz → 4.20.7__tar.gz

openshift_python_wrapper-4.20.7/.git

@@ -0,0 +1 @@
+gitdir: /tmp/github-webhook-openshift-python-wrapper-mvx5zz5v/.git/worktrees/github-webhook-openshift-python-wrapper-mvx5zz5v-worktree-db6fd4da-16c9-49a3-b058-154eee4a22ff

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/.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/)

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 4.20.6
+Version: 4.20.7
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Project-URL: homepage, https://github.com/RedHatQE/openshift-python-wrapper
 Project-URL: documentation, https://openshift-python-wrapper.readthedocs.io/en/latest/

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/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:

openshift_python_wrapper-4.20.7/class_generator/formatters/file_writer.py

@@ -0,0 +1,71 @@
+"""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 with prek, falling back to ruff.
+
+    Args:
+        filepath: Path to write the file to
+        output: Content to write
+    """
+    with open(filepath, "w", encoding="utf-8") as fd:
+        fd.write(output)
+
+    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", "-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}, 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"prek stdout: {stdout}")
+    except Exception as e:
+        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}")

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/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 }}):
     """

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/APIServer}/api_server.py

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

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/ClusterOperator/cluster_operator.py

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

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/ConfigMap/config_map.py

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

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/DNS}/dns_config_openshift_io.py

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

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/DNS}/dns_operator_openshift_io.py

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

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/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):

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/ImageContentSourcePolicy}/image_content_source_policy.py

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

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/Ingress}/ingress_config_openshift_io.py

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

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/Ingress}/ingress_networking_k8s_io.py

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

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/Machine/machine.py

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

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/NMState}/nm_state.py

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

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/OAuth}/oauth.py

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

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/Pipeline}/pipeline.py

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

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/Pod/pod.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 Pod(NamespacedResource):

{openshift_python_wrapper-4.20.6/ocp_resources → openshift_python_wrapper-4.20.7/class_generator/tests/manifests/RouteAdvertisements}/route_advertisements.py

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

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/Secret/secret.py

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

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/ServiceMeshMember/service_mesh_member.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 ServiceMeshMember(NamespacedResource):

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/ServingRuntime/serving_runtime.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 ServingRuntime(NamespacedResource):

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/manifests/test_parse_explain.j2

@@ -1,16 +1,15 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md#adding-tests
 
 import filecmp
+import traceback
 from pathlib import Path
-import pytest
-from typing import List, Tuple, Optional
 
 from class_generator.constants import TESTS_MANIFESTS_DIR
 from class_generator.core.generator import class_generator
 from class_generator.utils import execute_parallel_tasks
 
 
-def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]]:
+def _test_single_resource(kind: str, tmp_path: Path) -> tuple[str, str] | None:
     """
     Test a single resource kind and return failure info if test fails.
 
@@ -45,9 +44,9 @@ def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]
             if not filecmp.cmp(output_file, expected_file):
                 try:
                     # Read both files to show diff details
-                    with open(output_file, "r") as f:
+                    with open(output_file) as f:
                         generated_content = f.read()
-                    with open(expected_file, "r") as f:
+                    with open(expected_file) as f:
                         expected_content = f.read()
 
                     # Find first difference for debugging
@@ -60,7 +59,7 @@ def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]
                     diff_info += f"\nGenerated lines: {len(generated_lines)}, Expected lines: {len(expected_lines)}"
 
                     # Find first differing line
-                    for i, (gen_line, exp_line) in enumerate(zip(generated_lines, expected_lines)):
+                    for i, (gen_line, exp_line) in enumerate(zip(generated_lines, expected_lines, strict=True)):
                         if gen_line != exp_line:
                             diff_info += f"\nFirst difference at line {i + 1}:"
                             diff_info += f"\nGenerated: {repr(gen_line[:100])}..."
@@ -81,8 +80,6 @@ def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]
         return None
 
     except Exception as e:
-        import traceback
-
         error_details = f"Exception during generation: {str(e)}\n"
         error_details += f"Traceback:\n{traceback.format_exc()}"
         return (kind, error_details)
@@ -97,17 +94,17 @@ def test_parse_explain(tmp_path: Path) -> None:
     {% endfor %}
     ]
 
-    failures: List[Tuple[str, str]] = []
+    failures: list[tuple[str, str]] = []
 
     # Process test results and collect failures
-    def process_test_result(kind: str, result: Optional[Tuple[str, str]]) -> None:
+    def process_test_result(kind: str, result: tuple[str, str] | None) -> None:
         if result is not None:
             failures.append(result)
 
     def handle_test_error(kind: str, exc: Exception) -> None:
         failures.append((kind, f"Task execution failed: {str(exc)}"))
 
-    def create_test_task(kind: str) -> Optional[Tuple[str, str]]:
+    def create_test_task(kind: str) -> tuple[str, str] | None:
         return _test_single_resource(kind, tmp_path / f"test-{kind}")
 
     # Run tests in parallel
@@ -136,12 +133,10 @@ def test_parse_explain(tmp_path: Path) -> None:
 
         # Create a concise failure message for pytest
         failed_kinds = [kind for kind, _ in failures]
-        failure_summary = f"{len(failures)} resource(s) failed: {', '.join(failed_kinds[:5])}"
-        if len(failed_kinds) > 5:
-            failure_summary += f" and {len(failed_kinds) - 5} more"
+        failure_summary = f"{len(failures)} resource(s) failed: {','.join(failed_kinds)}"
 
         # Fail the test with summary - detailed output is already printed above
-        assert False, failure_summary
+        raise AssertionError(failure_summary)
 
     # If we get here, all tests passed
     print(f"\nAll {len(resource_kinds)} resource generation tests passed successfully!")

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/test_class_generator.py

@@ -99,14 +99,14 @@ def test_parse_explain(tmp_path: Path) -> None:
         "ImageContentSourcePolicy",
         "Machine",
         "NMState",
-        "OAuth",
-        "Pipeline",
         "Pod",
         "Secret",
         "ServiceMeshMember",
-        "ServingRuntime",
         "Ingress",
+        "OAuth",
+        "Pipeline",
         "RouteAdvertisements",
+        "ServingRuntime",
     ]
 
     failures: List[Tuple[str, str]] = []
@@ -148,9 +148,7 @@ def test_parse_explain(tmp_path: Path) -> None:
 
         # Create a concise failure message for pytest
         failed_kinds = [kind for kind, _ in failures]
-        failure_summary = f"{len(failures)} resource(s) failed: {', '.join(failed_kinds[:5])}"
-        if len(failed_kinds) > 5:
-            failure_summary += f" and {len(failed_kinds) - 5} more"
+        failure_summary = f"{len(failures)} resource(s) failed: {','.join(failed_kinds)}"
 
         # Fail the test with summary - detailed output is already printed above
         assert False, failure_summary

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/test_cli.py

@@ -169,7 +169,9 @@ class TestCLIFunctionality:
 
             assert result.exit_code == 0
             mock_test_gen.assert_called_once()
-            mock_os_system.assert_called_once_with("uv run pytest class_generator/tests/test_class_generator.py")
+            mock_os_system.assert_called_once_with(
+                "uv run --group tests pytest class_generator/tests/test_class_generator.py"
+            )
 
     def test_add_tests_requires_kind(self):
         """Test that --add-tests cannot be used alone."""

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/class_generator/tests/test_schema_new_functions.py

@@ -184,6 +184,13 @@ class TestBuildNamespacingDict:
         assert result == expected
 
 
+def _get_open_mode(call):
+    """Extract file open mode from a mock call, defaulting to 'r'."""
+    if len(call[0]) > 1:
+        return call[0][1]
+    return call[1].get("mode", "r")
+
+
 class TestCheckAndUpdateClusterVersion:
     """Test check_and_update_cluster_version function."""
 
@@ -201,14 +208,14 @@ class TestCheckAndUpdateClusterVersion:
 
         # Verify that the file was opened for writing
         assert mock_open.call_count == 2  # Once for reading, once for writing
-        write_calls = [call for call in mock_open.call_args_list if call[0][1] == "w"]
+        write_calls = [call for call in mock_open.call_args_list if _get_open_mode(call) == "w"]
         assert len(write_calls) == 1, "File should be opened for writing exactly once"
 
         # Verify that the correct cluster version file path is used
         from pathlib import Path
 
         expected_path = Path("class_generator/schema/__cluster_version__.txt")
-        read_calls = [call for call in mock_open.call_args_list if call[0][1] == "r"]
+        read_calls = [call for call in mock_open.call_args_list if _get_open_mode(call) == "r"]
         assert len(read_calls) == 1, "File should be opened for reading exactly once"
         # Check that the file path used matches expected cluster version file
         assert str(expected_path) in str(read_calls[0][0][0]) or expected_path.name in str(read_calls[0][0][0])
@@ -230,7 +237,7 @@ class TestCheckAndUpdateClusterVersion:
 
         # Verify that the file was only opened for reading, not writing
         assert mock_open.call_count == 1  # Only once for reading
-        read_calls = [call for call in mock_open.call_args_list if call[0][1] == "r"]
+        read_calls = [call for call in mock_open.call_args_list if _get_open_mode(call) == "r"]
         assert len(read_calls) == 1, "File should be opened for reading exactly once"
 
         # Verify that write() was never called
@@ -250,14 +257,14 @@ class TestCheckAndUpdateClusterVersion:
 
         # Verify that the file was opened for both reading and writing
         assert mock_open.call_count == 2  # Once for reading, once for writing
-        write_calls = [call for call in mock_open.call_args_list if call[0][1] == "w"]
+        write_calls = [call for call in mock_open.call_args_list if _get_open_mode(call) == "w"]
         assert len(write_calls) == 1, "File should be opened for writing exactly once"
 
         # Verify that the correct cluster version file path is used
         from pathlib import Path
 
         expected_path = Path("class_generator/schema/__cluster_version__.txt")
-        read_calls = [call for call in mock_open.call_args_list if call[0][1] == "r"]
+        read_calls = [call for call in mock_open.call_args_list if _get_open_mode(call) == "r"]
         assert len(read_calls) == 1, "File should be opened for reading exactly once"
         # Check that the file path used matches expected cluster version file
         assert str(expected_path) in str(read_calls[0][0][0]) or expected_path.name in str(read_calls[0][0][0])

openshift_python_wrapper-4.20.7/ocp_resources/mig_controller.py

@@ -0,0 +1,54 @@
+# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
+
+
+from typing import Any
+
+from ocp_resources.resource import NamespacedResource
+
+
+class MigController(NamespacedResource):
+    """
+    MigController is the Schema for the migcontrollers API.
+    """
+
+    api_group: str = NamespacedResource.ApiGroup.MIGRATIONS_KUBEVIRT_IO
+
+    def __init__(
+        self,
+        image_pull_policy: str | None = None,
+        infra: dict[str, Any] | None = None,
+        priority_class: str | None = None,
+        **kwargs: Any,
+    ) -> None:
+        r"""
+        Args:
+            image_pull_policy (str): PullPolicy describes a policy for if/when to pull a container image
+
+            infra (dict[str, Any]): Rules on which nodes infrastructure pods will be scheduled
+
+            priority_class (str): PriorityClass of the control plane
+
+        """
+        super().__init__(**kwargs)
+
+        self.image_pull_policy = image_pull_policy
+        self.infra = infra
+        self.priority_class = priority_class
+
+    def to_dict(self) -> None:
+        super().to_dict()
+
+        if not self.kind_dict and not self.yaml_file:
+            self.res["spec"] = {}
+            _spec = self.res["spec"]
+
+            if self.image_pull_policy is not None:
+                _spec["imagePullPolicy"] = self.image_pull_policy
+
+            if self.infra is not None:
+                _spec["infra"] = self.infra
+
+            if self.priority_class is not None:
+                _spec["priorityClass"] = self.priority_class
+
+    # End of generated code

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/pyproject.toml

@@ -65,7 +65,7 @@ include = [
 [project]
 requires-python = ">=3.10"
 name = "openshift-python-wrapper"
-version = "4.20.6"
+version = "4.20.7"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 readme = "README.md"
 license = "Apache-2.0"

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/tests/scripts/generate_pytest_test.py

@@ -517,7 +517,7 @@ def run_ruff_on_files(filepaths: list[str]) -> bool:
 
         # Run ruff format and check on all files
         for op in ("format", "check"):
-            cmd_str = f"uvx ruff {op} {' '.join(filepaths)}"
+            cmd_str = f"uvx ruff --config pyproject.toml {op} {' '.join(filepaths)}"
             rc, _, _ = run_command(
                 command=shlex.split(cmd_str),
                 verify_stderr=False,

{openshift_python_wrapper-4.20.6 → openshift_python_wrapper-4.20.7}/uv.lock

@@ -1202,7 +1202,7 @@ wheels = [
 
 [[package]]
 name = "openshift-python-wrapper"
-version = "4.20.6"
+version = "4.20.7"
 source = { editable = "." }
 dependencies = [
     { name = "cloup" },

openshift_python_wrapper-4.20.6/.git

@@ -1 +0,0 @@
-gitdir: /tmp/github-webhook-openshift-python-wrapper-dqce99hp/.git/worktrees/github-webhook-openshift-python-wrapper-dqce99hp-worktree-36a53fdf-0c01-44a4-9a42-75e5de729bcb

openshift_python_wrapper-4.20.6/class_generator/formatters/file_writer.py

@@ -1,36 +0,0 @@
-"""File writing utilities for generated code."""
-
-from pyhelper_utils.shell import run_command
-from simple_logger.logger import get_logger
-
-LOGGER = get_logger(name=__name__)
-
-
-def write_and_format_rendered(filepath: str, output: str) -> None:
-    """
-    Write rendered content to file and format it with prek.
-
-    Args:
-        filepath: Path to write the file to
-        output: Content to write
-    """
-    with open(filepath, "w", encoding="utf-8") as fd:
-        fd.write(output)
-
-    # Run prek on the file
-    try:
-        rc, stdout, stderr = run_command(
-            command=["uvx", "prek", "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.debug(f"prek stderr: {stderr}")
-            if stdout:
-                LOGGER.info(f"{filepath} fixed by prek")
-                LOGGER.debug(f"rek 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.")