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

openshift_python_wrapper-4.20.8/.git

@@ -0,0 +1 @@
+gitdir: /tmp/github-webhook-openshift-python-wrapper-zslul6r2/.git/worktrees/github-webhook-openshift-python-wrapper-zslul6r2-worktree-6689080a-f1a6-4520-b182-7e93e358d7b3

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/.pre-commit-config.yaml

@@ -45,7 +45,7 @@ repos:
           ]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.2
+    rev: v0.15.14
     hooks:
       - id: ruff
       - id: ruff-format
@@ -56,7 +56,7 @@ repos:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.20.2
+    rev: v2.1.0
     hooks:
       - id: mypy
         exclude: ^(tests/|examples/|docs/)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 4.20.7
+Version: 4.20.8
 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/
@@ -20,7 +20,7 @@ Requires-Dist: deepdiff>=8.0.1
 Requires-Dist: fastmcp>=2.10.4
 Requires-Dist: jinja2>=3.1.4
 Requires-Dist: jsonschema>=4.20.0
-Requires-Dist: kubernetes>=31.0.0
+Requires-Dist: kubernetes!=36.0.0,>=31.0.0
 Requires-Dist: packaging>=24.1
 Requires-Dist: pyhelper-utils>=0.0.42
 Requires-Dist: python-benedict>=0.33.2

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/cli.py

@@ -1,14 +1,13 @@
 """Command-line interface for the class generator."""
 
 import fnmatch
+import logging
 import shutil
 import sys
 from datetime import datetime
 from pathlib import Path
 from typing import Any
 
-import logging
-
 import cloup
 from cloup.constraints import If, IsSet, accept_none, require_one
 from simple_logger.logger import get_logger
@@ -17,7 +16,7 @@ from class_generator.constants import TESTS_MANIFESTS_DIR
 from class_generator.core.coverage import analyze_coverage, generate_report
 from class_generator.core.discovery import discover_generated_resources
 from class_generator.core.generator import class_generator
-from class_generator.core.schema import update_kind_schema, ClusterVersionError
+from class_generator.core.schema import ClusterVersionError, update_kind_schema
 from class_generator.tests.test_generation import generate_class_generator_tests
 from class_generator.utils import execute_parallel_tasks
 from ocp_resources.utils.utils import convert_camel_case_to_snake_case
@@ -57,7 +56,7 @@ def handle_schema_update(update_schema: bool, generate_missing: bool) -> bool:
         LOGGER.info("Updating resource schema...")
         try:
             update_kind_schema()
-        except (RuntimeError, IOError, ClusterVersionError) as e:
+        except (OSError, RuntimeError, ClusterVersionError) as e:
             LOGGER.exception(f"Failed to update schema: {e}")
             sys.exit(1)
 

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/core/discovery.py

@@ -1,8 +1,8 @@
 """Discovery functions for finding cluster resources and generated files."""
 
+from concurrent.futures import Future, ThreadPoolExecutor, as_completed
 from pathlib import Path
 from typing import Any
-from concurrent.futures import ThreadPoolExecutor, as_completed, Future
 
 from kubernetes.dynamic import DynamicClient
 from simple_logger.logger import get_logger

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/core/generator.py

@@ -155,7 +155,7 @@ def class_generator(
             LOGGER.info("Updating schema")
             try:
                 update_kind_schema()
-            except (RuntimeError, IOError) as e:
+            except (OSError, RuntimeError) as e:
                 error_msg = f"Failed to update schema: {e}"
                 LOGGER.error(error_msg)
                 raise RuntimeError(error_msg) from e
@@ -188,7 +188,7 @@ def class_generator(
     unique_groups = set()
     for resource in resources:
         # Use the original group name that we stored
-        if "original_group" in resource and resource["original_group"]:
+        if resource.get("original_group"):
             unique_groups.add(resource["original_group"])
 
     use_output_file_suffix: bool = len(unique_groups) > 1

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/core/schema.py

@@ -12,7 +12,7 @@ from pyhelper_utils.shell import run_command
 from simple_logger.logger import get_logger
 
 from class_generator.constants import DEFINITIONS_FILE, RESOURCES_MAPPING_FILE, SCHEMA_DIR
-from class_generator.utils import execute_parallel_with_mapping, execute_parallel_tasks
+from class_generator.utils import execute_parallel_tasks, execute_parallel_with_mapping
 from ocp_resources.utils.archive_utils import save_json_archive
 from ocp_resources.utils.schema_validator import SchemaValidator
 
@@ -22,8 +22,6 @@ LOGGER = get_logger(name=__name__)
 class ClusterVersionError(Exception):
     """Raised when there are issues with cluster version operations."""
 
-    pass
-
 
 def get_client_binary() -> str:
     """Determine whether to use 'oc' or 'kubectl' binary."""
@@ -138,7 +136,7 @@ def check_and_update_cluster_version(client: str) -> bool:
     try:
         with open(cluster_version_file, "r") as fd:
             last_cluster_version_generated = fd.read().strip()
-    except (FileNotFoundError, IOError):
+    except (OSError, FileNotFoundError):
         # Treat missing file as first run - use baseline version that allows updates
         last_cluster_version_generated = "v0.0.0"
         LOGGER.info("Cluster version file not found - treating as first run with baseline version v0.0.0")
@@ -1360,10 +1358,10 @@ def write_schema_files(
     # Ensure schema directory exists
     try:
         Path(SCHEMA_DIR).mkdir(parents=True, exist_ok=True)
-    except (OSError, IOError) as e:
+    except OSError as e:
         error_msg = f"Failed to create schema directory {SCHEMA_DIR}: {e}"
         LOGGER.error(error_msg)
-        raise IOError(error_msg) from e
+        raise OSError(error_msg) from e
 
     # Fetch missing core definitions if schemas are available
     if schemas:
@@ -1400,18 +1398,18 @@ def write_schema_files(
             with open(definitions_file, "w") as fd:
                 json.dump(definitions_data, fd, indent=2, sort_keys=True)
             LOGGER.info(f"Written {len(definitions)} definitions to {definitions_file}")
-        except (OSError, IOError, TypeError) as e:
+        except (OSError, TypeError) as e:
             error_msg = f"Failed to write definitions file {definitions_file}: {e}"
             LOGGER.error(error_msg)
-            raise IOError(error_msg) from e
+            raise OSError(error_msg) from e
 
     # Write and archive resources mapping
     try:
         save_json_archive(resources_mapping, RESOURCES_MAPPING_FILE)
-    except (OSError, IOError, TypeError) as e:
+    except (OSError, TypeError) as e:
         error_msg = f"Failed to save and archive resources mapping file {RESOURCES_MAPPING_FILE}: {e}"
         LOGGER.error(error_msg)
-        raise IOError(error_msg) from e
+        raise OSError(error_msg) from e
 
 
 @dataclasses.dataclass
@@ -1527,7 +1525,7 @@ def _handle_no_schemas_case() -> None:
             existing_definitions_data = json.load(fd)
             definitions = existing_definitions_data.get("definitions", {})
             LOGGER.info(f"Found {len(definitions)} existing definitions that will be preserved")
-    except (FileNotFoundError, IOError, json.JSONDecodeError):
+    except (OSError, FileNotFoundError, json.JSONDecodeError):
         LOGGER.debug("Could not load existing definitions file. No existing definitions to preserve.")
 
 

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/parsers/type_parser.py

@@ -6,7 +6,7 @@ from typing import Any
 
 from simple_logger.logger import get_logger
 
-from class_generator.constants import MISSING_DESCRIPTION_STR, SPEC_STR, DEFINITIONS_FILE
+from class_generator.constants import DEFINITIONS_FILE, MISSING_DESCRIPTION_STR, SPEC_STR
 from class_generator.utils import sanitize_python_name
 from ocp_resources.utils.utils import convert_camel_case_to_snake_case
 

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/parsers/user_code_parser.py

@@ -39,7 +39,7 @@ def parse_user_code_from_file(file_path: str) -> tuple[str, str]:
             f"Failed to decode file {file_path} with UTF-8 encoding. The file may contain invalid characters.",
         )
     except Exception as e:
-        raise Exception(f"Unexpected error reading file {file_path}: {type(e).__name__}: {str(e)}")
+        raise Exception(f"Unexpected error reading file {file_path}: {type(e).__name__}: {e!s}")
 
     end_of_generated_code_line = "    # End of generated code"
     user_code: str = ""

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -71,6 +72,7 @@ class APIServer(Resource):
         self.tls_security_profile = tls_security_profile
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -48,6 +48,7 @@ class ConfigMap(NamespacedResource):
         self.immutable = immutable
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -54,6 +55,7 @@ class DNS(Resource):
         self.public_zone = public_zone
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -93,6 +94,7 @@ class DNS(Resource):
         self.upstream_resolvers = upstream_resolvers
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/tests/manifests/Deployment/deployment.py

@@ -280,6 +280,7 @@ class Deployment(NamespacedResource):
         self.template = template
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -48,6 +49,7 @@ class ImageContentSourcePolicy(Resource):
         self.repository_digest_mirrors = repository_digest_mirrors
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -92,6 +93,7 @@ class Ingress(Resource):
         self.required_hsts_policies = required_hsts_policies
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -41,6 +42,7 @@ class Ingress(Resource):
         self.tls = tls
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -69,6 +69,7 @@ class Machine(NamespacedResource):
         self.taints = taints
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -76,6 +77,7 @@ class NMState(Resource):
         self.tolerations = tolerations
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
@@ -41,6 +42,7 @@ class OAuth(Resource):
         self.token_config = token_config
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -2,6 +2,7 @@
 
 
 from typing import Any
+
 from ocp_resources.resource import NamespacedResource
 
 
@@ -61,6 +62,7 @@ class Pipeline(NamespacedResource):
         self.workspaces = workspaces
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/tests/manifests/Pod/pod.py

@@ -493,6 +493,7 @@ class Pod(NamespacedResource):
         self.volumes = volumes
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-4.20.7/ocp_resources → openshift_python_wrapper-4.20.8/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):
@@ -49,6 +50,7 @@ class RouteAdvertisements(Resource):
         self.target_vrf = target_vrf
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -53,6 +53,7 @@ class Secret(NamespacedResource):
         self.type = type
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/tests/manifests/ServiceMeshMember/service_mesh_member.py

@@ -29,6 +29,7 @@ class ServiceMeshMember(NamespacedResource):
         self.control_plane_ref = control_plane_ref
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.20.8}/class_generator/tests/manifests/ServingRuntime/serving_runtime.py

@@ -97,6 +97,7 @@ class ServingRuntime(NamespacedResource):
         self.volumes = volumes
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

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

@@ -71,7 +71,7 @@ def _test_single_resource(kind: str, tmp_path: Path) -> tuple[str, str] | None:
 
                     return (kind, diff_info)
 
-                except Exception as read_error:
+                except Exception as read_error:  # noqa: BLE001
                     return (
                         kind,
                         f"Generated file {Path(output_file).name} does not match expected file. Error reading files for diff: {read_error}",
@@ -79,7 +79,7 @@ def _test_single_resource(kind: str, tmp_path: Path) -> tuple[str, str] | None:
 
         return None
 
-    except Exception as e:
+    except Exception as e:  # noqa: BLE001
         error_details = f"Exception during generation: {str(e)}\n"
         error_details += f"Traceback:\n{traceback.format_exc()}"
         return (kind, error_details)

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

@@ -1,15 +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
-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.
 
@@ -44,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
@@ -59,11 +59,11 @@ 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])}..."
-                            diff_info += f"\nExpected:  {repr(exp_line[:100])}..."
+                            diff_info += f"\nGenerated: {gen_line[:100]!r}..."
+                            diff_info += f"\nExpected:  {exp_line[:100]!r}..."
                             break
 
                     if len(generated_lines) != len(expected_lines):
@@ -80,9 +80,7 @@ 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"Exception during generation: {e!s}\n"
         error_details += f"Traceback:\n{traceback.format_exc()}"
         return (kind, error_details)
 
@@ -91,35 +89,35 @@ def test_parse_explain(tmp_path: Path) -> None:
     """Test all resource kinds in parallel and collect all failures."""
     # List of all resource kinds to test
     resource_kinds = [
+        "Deployment",
+        "Pod",
         "APIServer",
         "ClusterOperator",
         "ConfigMap",
         "DNS",
-        "Deployment",
         "ImageContentSourcePolicy",
         "Machine",
         "NMState",
-        "Pod",
         "Secret",
         "ServiceMeshMember",
-        "Ingress",
         "OAuth",
         "Pipeline",
-        "RouteAdvertisements",
         "ServingRuntime",
+        "Ingress",
+        "RouteAdvertisements",
     ]
 
-    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)}"))
+        failures.append((kind, f"Task execution failed: {exc!s}"))
 
-    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
@@ -151,7 +149,7 @@ def test_parse_explain(tmp_path: Path) -> None:
         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!")