qontract-reconcile 0.10.1rc884__py3-none-any.whl → 0.10.1rc886__py3-none-any.whl

reconcile/change_owners/change_types.py

@@ -16,7 +16,6 @@ from enum import Enum
 from typing import (
     Any,
     Optional,
-    Tuple,
 )
 
 import jinja2
@@ -59,7 +58,7 @@ class ChangeTypePriority(Enum):
     LOW = "low"
 
 
-def parent_of_jsonpath(path: jsonpath_ng.JSONPath) -> Optional[jsonpath_ng.JSONPath]:
+def parent_of_jsonpath(path: jsonpath_ng.JSONPath) -> jsonpath_ng.JSONPath | None:
     # todo - figure out if this is enough of if we have other
     # structures where a parent can be extracted
     if isinstance(path, jsonpath_ng.Child):
@@ -267,8 +266,8 @@ class PathExpression:
 @dataclass
 class FileChange:
     file_ref: FileRef
-    old: Optional[dict[str, Any]]
-    new: Optional[dict[str, Any]]
+    old: dict[str, Any] | None
+    new: dict[str, Any] | None
     old_backrefs: set[FileRef] = field(default_factory=set)
     new_backrefs: set[FileRef] = field(default_factory=set)
 
@@ -277,7 +276,7 @@ class OwnershipContext(ABC):
     @abstractmethod
     def find_ownership_context(
         self,
-        context_schema: Optional[str],
+        context_schema: str | None,
         change: FileChange,
     ) -> list[FileRef]: ...
 
@@ -285,11 +284,11 @@ class OwnershipContext(ABC):
 @dataclass
 class ForwardrefOwnershipContext(OwnershipContext):
     selector: jsonpath_ng.JSONPath
-    when: Optional[str] = None
+    when: str | None = None
 
     def find_ownership_context(
         self,
-        context_schema: Optional[str],
+        context_schema: str | None,
         change: FileChange,
     ) -> list[FileRef]:
         old_contexts = {e.value for e in self.selector.find(change.old)}
@@ -319,11 +318,11 @@ class ForwardrefOwnershipContext(OwnershipContext):
 class BackrefOwnershipContext(OwnershipContext):
     selector: jsonpath_ng.JSONPath
     file_diff_resolver: FileDiffResolver
-    when: Optional[str] = None
+    when: str | None = None
 
     def find_ownership_context(
         self,
-        context_schema: Optional[str],
+        context_schema: str | None,
         change: FileChange,
     ) -> list[FileRef]:
         # get backref datafile content
@@ -369,7 +368,7 @@ class ContextExpansion:
     def expand_from_file_ref(
         self,
         file_ref: FileRef,
-        expansion_trail: Set[Tuple[str, FileRef]],
+        expansion_trail: Set[tuple[str, FileRef]],
     ) -> list["ResolvedContext"]:
         old_data, new_data = self.file_diff_resolver.lookup_file_diff(file_ref)
         return self.expand(
@@ -384,7 +383,7 @@ class ContextExpansion:
     def expand(
         self,
         change: FileChange,
-        expansion_trail: Set[Tuple[str, FileRef]],
+        expansion_trail: Set[tuple[str, FileRef]],
     ) -> list["ResolvedContext"]:
         """
         Find context based on the `self.context`, lookup the file diff for
@@ -395,7 +394,7 @@ class ContextExpansion:
             context_schema=self.change_type.context_schema,
             change=change,
         )
-        expaned_context_file_refs: list["ResolvedContext"] = []
+        expaned_context_file_refs: list[ResolvedContext] = []
         for ref in context_file_refs:
             ref_old_data, ref_new_data = self.file_diff_resolver.lookup_file_diff(ref)
             expaned_context_file_refs.extend(
@@ -429,9 +428,9 @@ class ChangeDetector(ABC):
     Represents an item from a change-types `change` list.
     """
 
-    context_schema: Optional[str]
-    change_schema: Optional[str]
-    context: Optional[OwnershipContext]
+    context_schema: str | None
+    change_schema: str | None
+    context: OwnershipContext | None
 
     @abstractmethod
     def find_context_file_refs(
@@ -478,14 +477,14 @@ class ChangeTypeProcessor:
     description: str
     priority: ChangeTypePriority
     context_type: BundleFileType
-    context_schema: Optional[str]
+    context_schema: str | None
     disabled: bool
     implicit_ownership: list[ChangeTypeImplicitOwnershipV1]
-    restrictive: Optional[bool] = False
+    restrictive: bool | None = False
 
     def __post_init__(self) -> None:
         self._expressions_by_file_type_schema: dict[
-            tuple[BundleFileType, Optional[str]], list[PathExpression]
+            tuple[BundleFileType, str | None], list[PathExpression]
         ] = defaultdict(list)
         self._change_detectors: list[ChangeDetector] = []
         self._context_expansions: list[ContextExpansion] = []
@@ -498,7 +497,7 @@ class ChangeTypeProcessor:
     def find_context_file_refs(
         self,
         change: FileChange,
-        expansion_trail: Set[Tuple[str, FileRef]],
+        expansion_trail: Set[tuple[str, FileRef]],
     ) -> list[ResolvedContext]:
         """
         ChangeTypeV1 are attached to bundle files, react to changes within
@@ -638,7 +637,7 @@ class ChangeTypeProcessor:
     def _allowed_changed_paths_for_file_type_and_schema(
         self,
         file_type: BundleFileType,
-        file_schema: Optional[str],
+        file_schema: str | None,
         file_content: Any,
         ctx: "ChangeTypeContext",
     ) -> list[jsonpath_ng.JSONPath]:
@@ -692,8 +691,8 @@ class ChangeTypeProcessor:
 def build_ownership_context(
     file_diff_resolver: FileDiffResolver,
     selector: jsonpath_ng.JSONPath,
-    when: Optional[str] = None,
-    where: Optional[str] = None,
+    when: str | None = None,
+    where: str | None = None,
 ) -> OwnershipContext:
     """
     create an OwnershipContext object based on the provided parameters
@@ -840,8 +839,8 @@ class ChangeTypeContext:
     origin: str
     context_file: FileRef
     approvers: list[Approver]
-    approver_reachability: Optional[list[ApproverReachability]] = None
-    change_owner_labels: Optional[set[str]] = None
+    approver_reachability: list[ApproverReachability] | None = None
+    change_owner_labels: set[str] | None = None
 
     @property
     def disabled(self) -> bool:

reconcile/change_owners/changes.py

@@ -7,10 +7,7 @@ from dataclasses import (
     dataclass,
     field,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import anymarkup
 
@@ -50,8 +47,8 @@ class BundleFileChange:
     """
 
     fileref: FileRef
-    old: Optional[dict[str, Any]]
-    new: Optional[dict[str, Any]]
+    old: dict[str, Any] | None
+    new: dict[str, Any] | None
     old_content_sha: str
     new_content_sha: str
     diffs: list[Diff]
@@ -81,16 +78,16 @@ class BundleFileChange:
         return self._diff_coverage[METADATA_CHANGE_PATH]
 
     @property
-    def old_content_with_metadata(self) -> Optional[dict[str, Any]]:
+    def old_content_with_metadata(self) -> dict[str, Any] | None:
         return self._content_with_metadata(self.old)
 
     @property
-    def new_content_with_metadata(self) -> Optional[dict[str, Any]]:
+    def new_content_with_metadata(self) -> dict[str, Any] | None:
         return self._content_with_metadata(self.new)
 
     def _content_with_metadata(
-        self, content: Optional[dict[str, Any]]
-    ) -> Optional[dict[str, Any]]:
+        self, content: dict[str, Any] | None
+    ) -> dict[str, Any] | None:
         if content and self.fileref.file_type == BundleFileType.DATAFILE:
             content_copy = copy.deepcopy(content)
             content_copy[DATAFILE_PATH_FIELD_NAME] = self.fileref.path
@@ -219,7 +216,7 @@ class BundleFileChange:
         return change_types
 
 
-def parse_resource_file_content(content: Optional[Any]) -> tuple[Any, Optional[str]]:
+def parse_resource_file_content(content: Any | None) -> tuple[Any, str | None]:
     if content:
         try:
             data = anymarkup.parse(content, force_types=None)
@@ -233,7 +230,7 @@ def parse_resource_file_content(content: Optional[Any]) -> tuple[Any, Optional[s
 
 def _create_bundle_file_change(
     path: str,
-    schema: Optional[str],
+    schema: str | None,
     file_type: BundleFileType,
     old_file_content: Any,
     new_file_content: Any,
@@ -241,9 +238,9 @@ def _create_bundle_file_change(
     new_content_sha: str,
     old_path: str,
     new_path: str,
-    old_backrefs: Optional[list[FileRef]] = None,
-    new_backrefs: Optional[list[FileRef]] = None,
-) -> Optional[BundleFileChange]:
+    old_backrefs: list[FileRef] | None = None,
+    new_backrefs: list[FileRef] | None = None,
+) -> BundleFileChange | None:
     """
     this is a factory method that creates a BundleFileChange object based
     on the old and new content of a file from app-interface. it detects differences
@@ -305,7 +302,7 @@ def _create_bundle_file_change(
 
 def get_priority_for_changes(
     bundle_file_changes: list[BundleFileChange],
-) -> Optional[ChangeTypePriority]:
+) -> ChangeTypePriority | None:
     """
     Finds the lowest priority of all change types involved in the provided bundle file changes.
     """

reconcile/change_owners/decision.py

@@ -5,10 +5,7 @@ from collections.abc import (
 )
 from dataclasses import dataclass
 from enum import Enum
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.change_owners.approver import (
     Approver,
@@ -70,7 +67,7 @@ def get_approver_decisions_from_mr_comments(
 class ChangeResponsibles:
     context: str
     approvers: list[Approver]
-    approver_reachability: Optional[list[ApproverReachability]] = None
+    approver_reachability: list[ApproverReachability] | None = None
 
 
 @dataclass

reconcile/change_owners/diff.py

@@ -3,11 +3,7 @@ import json
 from dataclasses import dataclass
 from enum import Enum
 from functools import reduce
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 
 import jsonpath_ng
 from deepdiff import DeepDiff
@@ -32,8 +28,8 @@ class Diff:
 
     path: jsonpath_ng.JSONPath
     diff_type: DiffType
-    old: Optional[Any]
-    new: Optional[Any]
+    old: Any | None
+    new: Any | None
 
     def create_subdiff(self, sub_path: jsonpath_ng.JSONPath) -> "Diff":
         if sub_path == self.path:
@@ -60,7 +56,7 @@ class Diff:
             new=sub_new[0].value if len(sub_new) > 0 else None,
         )
 
-    def get_context_data_copy(self) -> Optional[Any]:
+    def get_context_data_copy(self) -> Any | None:
         if self.diff_type in {DiffType.ADDED, DiffType.CHANGED}:
             return copy.deepcopy(self.new)
         if self.diff_type == DiffType.REMOVED:
@@ -70,15 +66,15 @@ class Diff:
     def path_str(self) -> str:
         return str(self.path)
 
-    def old_value_repr(self) -> Optional[str]:
+    def old_value_repr(self) -> str | None:
         return self._value_repr(self.old)
 
-    def new_value_repr(self) -> Optional[str]:
+    def new_value_repr(self) -> str | None:
         return self._value_repr(self.new)
 
-    def _value_repr(self, value: Optional[Any]) -> Optional[str]:
+    def _value_repr(self, value: Any | None) -> str | None:
         if value:
-            if isinstance(value, (dict, list)):
+            if isinstance(value, dict | list):
                 return json.dumps(value, indent=2)
             return str(value)
         return value
@@ -88,7 +84,7 @@ IDENTIFIER_FIELD_NAME = "__identifier"
 REF_FIELD_NAME = "$ref"
 
 
-def _extract_identifier_from_object(obj: Any) -> Optional[str]:
+def _extract_identifier_from_object(obj: Any) -> str | None:
     if isinstance(obj, dict):
         if IDENTIFIER_FIELD_NAME in obj:
             return obj.get(IDENTIFIER_FIELD_NAME)
@@ -98,7 +94,7 @@ def _extract_identifier_from_object(obj: Any) -> Optional[str]:
 
 
 def compare_object_ctx_identifier(
-    x: Any, y: Any, level: Optional[DiffLevel] = None
+    x: Any, y: Any, level: DiffLevel | None = None
 ) -> bool:
     """
     this function helps the deepdiff library to decide if two objects are
@@ -250,7 +246,7 @@ def deepdiff_path_to_jsonpath(deep_diff_path: str) -> jsonpath_ng.JSONPath:
     if not deep_diff_path.startswith("root"):
         raise ValueError("a deepdiff path must start with 'root'")
 
-    def build_jsonpath_part(element: Union[str, int]) -> jsonpath_ng.JSONPath:
+    def build_jsonpath_part(element: str | int) -> jsonpath_ng.JSONPath:
         match element:
             case int():
                 return jsonpath_ng.Index(element)

reconcile/change_owners/self_service_roles.py

@@ -1,5 +1,4 @@
 from collections import defaultdict
-from typing import Optional
 
 from reconcile.change_owners.approver import (
     ApproverReachability,
@@ -202,7 +201,7 @@ def change_type_contexts_for_self_service_roles(
     return change_type_contexts
 
 
-def build_approver(role_member: RoleMember) -> Optional[Approver]:
+def build_approver(role_member: RoleMember) -> Approver | None:
     """
     Builds an approver from a role member. Can return None if the passed
     approver is not considered valid within this context, e.g. not having

reconcile/change_owners/tester.py

@@ -2,10 +2,7 @@ import os
 import sys
 from collections.abc import Generator
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import jsonpath_ng
 import pygments
@@ -151,7 +148,7 @@ class AppInterfaceRepo:
             for file in files:
                 if file.endswith(".yml") or file.endswith(".yaml"):
                     filepath = os.path.join(root, file)
-                    with open(filepath, "r", encoding="locale") as f:
+                    with open(filepath, encoding="locale") as f:
                         parsed_yaml = yaml.safe_load(f)
                         if parsed_yaml.get("$schema") == schema:
                             relative_path = filepath[len(self.data_dir()) :]
@@ -166,7 +163,7 @@ class AppInterfaceRepo:
         self, file_type: BundleFileType, path: str
     ) -> BundleFileChange:
         if file_type == BundleFileType.DATAFILE:
-            with open(f"{self.data_dir()}{path}", "r", encoding="locale") as f:
+            with open(f"{self.data_dir()}{path}", encoding="locale") as f:
                 parsed_yaml = yaml.safe_load(f)
                 return BundleFileChange(
                     fileref=FileRef(
@@ -181,7 +178,7 @@ class AppInterfaceRepo:
                     diffs=[],
                 )
         elif file_type == BundleFileType.RESOURCEFILE:
-            with open(f"{self.resource_dir()}{path}", "r", encoding="locale") as f:
+            with open(f"{self.resource_dir()}{path}", encoding="locale") as f:
                 content = f.read()
                 parsed_content, schema = parse_resource_file_content(content)
                 return BundleFileChange(
@@ -223,7 +220,7 @@ class FilesystemFileDiffResolver:
 
     def lookup_file_diff(
         self, file_ref: FileRef
-    ) -> tuple[Optional[dict[str, Any]], Optional[dict[str, Any]]]:
+    ) -> tuple[dict[str, Any] | None, dict[str, Any] | None]:
         file = self.app_interface_repo.bundle_file_for_path(
             file_type=file_ref.file_type, path=file_ref.path
         )
@@ -232,7 +229,7 @@ class FilesystemFileDiffResolver:
 
 def get_changetype_processor_by_name(
     change_type_name: str, app_interface_repo: AppInterfaceRepo
-) -> Optional[ChangeTypeProcessor]:
+) -> ChangeTypeProcessor | None:
     processors = fetch_change_type_processors(
         gql.get_api(), FilesystemFileDiffResolver(app_interface_repo)
     )
@@ -241,7 +238,7 @@ def get_changetype_processor_by_name(
 
 def get_self_service_role_by_name(
     role_name: str,
-) -> Optional[RoleV1]:
+) -> RoleV1 | None:
     result = self_service_roles.query(
         gql.get_api().query, variables={"name": role_name}
     ).roles

reconcile/checkpoint.py

@@ -18,10 +18,7 @@ from functools import (
 )
 from http import HTTPStatus
 from pathlib import Path
-from typing import (
-    Any,
-    Union,
-)
+from typing import Any
 
 import requests
 from jinja2 import Template
@@ -121,7 +118,7 @@ def file_ticket(
 def report_invalid_metadata(
     app: Mapping[str, Any],
     path: str,
-    board: Mapping[str, Union[str, Mapping]],
+    board: Mapping[str, str | Mapping],
     settings: Mapping[str, Any],
     parent: str,
     dry_run: bool = False,

reconcile/cli.py

@@ -6,12 +6,9 @@ import os
 import re
 import sys
 import traceback
+from collections.abc import Iterable
 from signal import SIGUSR1
 from types import ModuleType
-from typing import (
-    Iterable,
-    Optional,
-)
 
 import click
 import sentry_sdk
@@ -2530,13 +2527,13 @@ def ocm_groups(ctx, thread_pool_size):
 @click.pass_context
 def ocm_clusters(
     ctx,
-    gitlab_project_id: Optional[str],
+    gitlab_project_id: str | None,
     thread_pool_size: int,
-    job_controller_cluster: Optional[str],
-    job_controller_namespace: Optional[str],
-    rosa_job_service_account: Optional[str],
-    rosa_role: Optional[str],
-    rosa_job_image: Optional[str],
+    job_controller_cluster: str | None,
+    job_controller_namespace: str | None,
+    rosa_job_service_account: str | None,
+    rosa_role: str | None,
+    rosa_job_image: str | None,
 ):
     from reconcile.ocm_clusters import (
         OcmClusters,
@@ -2802,7 +2799,7 @@ def version_gate_approver(
     job_controller_namespace: str,
     rosa_job_service_account: str,
     rosa_role: str,
-    rosa_job_image: Optional[str],
+    rosa_job_image: str | None,
 ) -> None:
     from reconcile.aus.version_gate_approver import (
         VersionGateApprover,
@@ -3376,7 +3373,7 @@ def signalfx_prometheus_endpoint_monitoring(
     )
 
 
-def parse_image_tag_from_ref(ctx, param, value) -> Optional[dict[str, str]]:
+def parse_image_tag_from_ref(ctx, param, value) -> dict[str, str] | None:
     if value:
         result = {}
         for v in value:

reconcile/closedbox_endpoint_monitoring_base.py

@@ -3,10 +3,7 @@ import logging
 from collections import defaultdict
 from collections.abc import Callable
 from dataclasses import field
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 from urllib.parse import urlparse
 
 from pydantic.dataclasses import dataclass
@@ -49,14 +46,14 @@ class EndpointMonitoringProvider:
     name: str
     provider: str
     description: str
-    timeout: Optional[str] = None
-    checkInterval: Optional[str] = None
-    blackboxExporter: Optional[BlackboxMonitoringProvider] = None
-    signalFx: Optional[SignalfxMonitoringProvier] = None
-    metricLabels: Optional[str] = None
+    timeout: str | None = None
+    checkInterval: str | None = None
+    blackboxExporter: BlackboxMonitoringProvider | None = None
+    signalFx: SignalfxMonitoringProvier | None = None
+    metricLabels: str | None = None
 
     @property
-    def namespace(self) -> Optional[dict[str, Any]]:
+    def namespace(self) -> dict[str, Any] | None:
         if self.blackboxExporter:
             return self.blackboxExporter.namespace
 
@@ -131,7 +128,7 @@ def fill_desired_state(
 def run_for_provider(
     provider: str,
     probe_builder: Callable[
-        [EndpointMonitoringProvider, list[Endpoint]], Optional[OpenshiftResource]
+        [EndpointMonitoringProvider, list[Endpoint]], OpenshiftResource | None
     ],
     integration: str,
     integration_version: str,

reconcile/cluster_deployment_mapper.py

@@ -1,9 +1,6 @@
 import logging
 import sys
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.status import ExitCodes
 from reconcile.typed_queries.app_interface_vault_settings import (
@@ -18,7 +15,7 @@ from reconcile.utils.vault import VaultClient
 QONTRACT_INTEGRATION = "cluster-deployment-mapper"
 
 
-def run(dry_run: bool, vault_output_path: Optional[str]) -> None:
+def run(dry_run: bool, vault_output_path: str | None) -> None:
     """Get Hive ClusterDeployments from clusters and save mapping to Vault"""
     if not vault_output_path:
         logging.error("must supply vault output path")

reconcile/cna/assets/asset.py

@@ -9,10 +9,7 @@ from dataclasses import (
     field,
 )
 from enum import Enum
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 
 class AssetError(Exception):
@@ -31,9 +28,9 @@ class AssetStatus(Enum):
 
 @dataclass(frozen=True)
 class Asset(ABC):
-    uuid: Optional[str] = field(compare=False, hash=True)
-    href: Optional[str] = field(compare=False, hash=True)
-    status: Optional[AssetStatus] = field(compare=False, hash=True)
+    uuid: str | None = field(compare=False, hash=True)
+    href: str | None = field(compare=False, hash=True)
+    status: AssetStatus | None = field(compare=False, hash=True)
     name: str
     kind: AssetType
 

reconcile/cna/assets/null.py

@@ -2,10 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.cna.assets.asset import (
     Asset,
@@ -18,7 +15,7 @@ from reconcile.gql_definitions.cna.queries.cna_resources import CNANullAssetV1
 
 @dataclass(frozen=True)
 class NullAsset(Asset):
-    addr_block: Optional[str]
+    addr_block: str | None
 
     def api_payload(self) -> dict[str, Any]:
         return {

reconcile/cna/integration.py

@@ -3,7 +3,6 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import Optional
 
 from reconcile.cna.assets.asset_factory import asset_factory_from_schema
 from reconcile.cna.client import CNAClient
@@ -45,8 +44,8 @@ class CNAIntegration:
         self,
         cna_clients: Mapping[str, CNAClient],
         namespaces: Iterable[NamespaceV1],
-        desired_states: Optional[Mapping[str, State]] = None,
-        current_states: Optional[Mapping[str, State]] = None,
+        desired_states: Mapping[str, State] | None = None,
+        current_states: Mapping[str, State] | None = None,
     ):
         self._cna_clients = cna_clients
         self._namespaces = namespaces

reconcile/cna/state.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.cna.assets.asset import (
     Asset,
@@ -29,7 +26,7 @@ class State:
     deletions and updates to reach another state.
     """
 
-    def __init__(self, assets: Optional[dict[AssetType, dict[str, Asset]]] = None):
+    def __init__(self, assets: dict[AssetType, dict[str, Asset]] | None = None):
         self._assets: dict[AssetType, dict[str, Asset]] = {}
         for kind in AssetType:
             self._assets[kind] = {}