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

reconcile/utils/oc.py

@@ -17,7 +17,7 @@ from functools import wraps
 from io import TextIOWrapper
 from subprocess import Popen
 from threading import Lock
-from typing import Any, Optional, Union
+from typing import Any
 
 import urllib3
 from kubernetes.client import (  # type: ignore[attr-defined]
@@ -157,7 +157,7 @@ class OCDecorators:
         @wraps(function)
         def wrapper(*args, **kwargs):
             result = function(*args, **kwargs)
-            msg = result[:-1] if isinstance(result, (list, tuple)) else result
+            msg = result[:-1] if isinstance(result, list | tuple) else result
 
             if not isinstance(msg, OCProcessReconcileTimeDecoratorMsg):
                 return result
@@ -211,7 +211,7 @@ class OCProcessReconcileTimeDecoratorMsg:
         self,
         namespace: str,
         resource: OR,
-        server: Optional[str],
+        server: str | None,
         slow_oc_reconcile_threshold: float,
         is_log_slow_oc_reconcile: bool,
     ):
@@ -255,23 +255,23 @@ class OCCliApiResource:
     @property
     def group_version(self):
         if self.group:
-            return "{}/{}".format(self.group, self.api_version)
+            return f"{self.group}/{self.api_version}"
         return self.api_version
 
 
 class OCCli:  # pylint: disable=too-many-public-methods
     def __init__(
         self,
-        cluster_name: Optional[str],
-        server: Optional[str],
-        token: Optional[str],
-        jh: Optional[Mapping[Any, Any]] = None,
-        settings: Optional[Mapping[Any, Any]] = None,
+        cluster_name: str | None,
+        server: str | None,
+        token: str | None,
+        jh: Mapping[Any, Any] | None = None,
+        settings: Mapping[Any, Any] | None = None,
         init_projects: bool = False,
         init_api_resources: bool = False,
         local: bool = False,
         insecure_skip_tls_verify: bool = False,
-        connection_parameters: Optional[OCConnectionParameters] = None,
+        connection_parameters: OCConnectionParameters | None = None,
     ):
         """
         As of now we have to conform with 2 ways to initialize this client:
@@ -310,10 +310,10 @@ class OCCli:  # pylint: disable=too-many-public-methods
     def _init_old_without_types(
         self,
         cluster_name: str,
-        server: Optional[str],
-        token: Optional[str],
-        jh: Optional[Mapping[Any, Any]] = None,
-        settings: Optional[Mapping[Any, Any]] = None,
+        server: str | None,
+        token: str | None,
+        jh: Mapping[Any, Any] | None = None,
+        settings: Mapping[Any, Any] | None = None,
         init_projects: bool = False,
         init_api_resources: bool = False,
         local: bool = False,
@@ -478,9 +478,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
                 cmd.extend(["-n", namespace])
 
         if "labels" in kwargs:
-            labels_list = [
-                "{}={}".format(k, v) for k, v in kwargs.get("labels").items()
-            ]
+            labels_list = [f"{k}={v}" for k, v in kwargs.get("labels").items()]
 
             cmd.append("-l")
             cmd.append(",".join(labels_list))
@@ -785,7 +783,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
     def get_service_account_username(user):
         namespace = user.split("/")[0]
         name = user.split("/")[1]
-        return "system:serviceaccount:{}:{}".format(namespace, name)
+        return f"system:serviceaccount:{namespace}:{name}"
 
     def get_owned_pods(self, namespace, resource):
         pods = self.get(namespace, "Pod")["items"]
@@ -1222,15 +1220,15 @@ REQUEST_TIMEOUT = 60
 class OCNative(OCCli):
     def __init__(
         self,
-        cluster_name: Optional[str],
-        server: Optional[str],
-        token: Optional[str],
-        jh: Optional[Mapping[Any, Any]] = None,
-        settings: Optional[Mapping[Any, Any]] = None,
+        cluster_name: str | None,
+        server: str | None,
+        token: str | None,
+        jh: Mapping[Any, Any] | None = None,
+        settings: Mapping[Any, Any] | None = None,
         init_projects: bool = False,
         local: bool = False,
         insecure_skip_tls_verify: bool = False,
-        connection_parameters: Optional[OCConnectionParameters] = None,
+        connection_parameters: OCConnectionParameters | None = None,
     ):
         super().__init__(
             cluster_name,
@@ -1335,9 +1333,7 @@ class OCNative(OCCli):
 
         labels = ""
         if "labels" in kwargs:
-            labels_list = [
-                "{}={}".format(k, v) for k, v in kwargs.get("labels").items()
-            ]
+            labels_list = [f"{k}={v}" for k, v in kwargs.get("labels").items()]
 
             labels = ",".join(labels_list)
 
@@ -1395,7 +1391,7 @@ class OCNative(OCCli):
             raise StatusCodeError(f"[{self.server}]: {e}")
 
 
-OCClient = Union[OCNative, OCCli]
+OCClient = OCNative | OCCli
 
 
 class OCLocal(OCCli):
@@ -1423,16 +1419,16 @@ class OC:
 
     def __new__(
         cls,
-        cluster_name: Optional[str] = None,
-        server: Optional[str] = None,
-        token: Optional[str] = None,
-        jh: Optional[Mapping[Any, Any]] = None,
-        settings: Optional[Mapping[Any, Any]] = None,
+        cluster_name: str | None = None,
+        server: str | None = None,
+        token: str | None = None,
+        jh: Mapping[Any, Any] | None = None,
+        settings: Mapping[Any, Any] | None = None,
         init_projects: bool = False,
         init_api_resources: bool = False,
         local: bool = False,
         insecure_skip_tls_verify: bool = False,
-        connection_parameters: Optional[OCConnectionParameters] = None,
+        connection_parameters: OCConnectionParameters | None = None,
     ):
         use_native_env = os.environ.get("USE_NATIVE_CLIENT", "")
         use_native = True
@@ -1865,7 +1861,5 @@ class OpenshiftLazyDiscoverer(LazyDiscoverer):
         if len(results) == 1:
             return results[0]
         if not results:
-            raise ResourceNotFoundError("No matches found for {}".format(kwargs))
-        raise ResourceNotUniqueError(
-            "Multiple matches found for {}: {}".format(kwargs, results)
-        )
+            raise ResourceNotFoundError(f"No matches found for {kwargs}")
+        raise ResourceNotUniqueError(f"Multiple matches found for {kwargs}: {results}")

reconcile/utils/oc_connection_parameters.py

@@ -4,7 +4,6 @@ import logging
 from collections.abc import Iterable
 from dataclasses import dataclass
 from typing import (
-    Optional,
     Protocol,
     runtime_checkable,
 )
@@ -23,13 +22,13 @@ class OCConnectionError(Exception):
 
 
 class Disable(Protocol):
-    integrations: Optional[list[str]]
+    integrations: list[str] | None
 
 
 class Jumphost(Protocol):
     hostname: str
-    port: Optional[int]
-    remote_port: Optional[int]
+    port: int | None
+    remote_port: int | None
     known_hosts: str
     user: str
 
@@ -41,24 +40,24 @@ class Jumphost(Protocol):
 class Cluster(Protocol):
     name: str
     server_url: str
-    internal: Optional[bool]
-    insecure_skip_tls_verify: Optional[bool]
+    internal: bool | None
+    insecure_skip_tls_verify: bool | None
 
     @property
-    def jump_host(self) -> Optional[Jumphost]: ...
+    def jump_host(self) -> Jumphost | None: ...
 
     @property
-    def automation_token(self) -> Optional[HasSecret]: ...
+    def automation_token(self) -> HasSecret | None: ...
 
     @property
-    def cluster_admin_automation_token(self) -> Optional[HasSecret]: ...
+    def cluster_admin_automation_token(self) -> HasSecret | None: ...
 
     @property
-    def disable(self) -> Optional[Disable]: ...
+    def disable(self) -> Disable | None: ...
 
 
 class Namespace(Protocol):
-    cluster_admin: Optional[bool]
+    cluster_admin: bool | None
 
     @property
     def cluster(self) -> Cluster: ...
@@ -82,20 +81,20 @@ class OCConnectionParameters:
 
     cluster_name: str
     server_url: str
-    is_internal: Optional[bool]
+    is_internal: bool | None
     is_cluster_admin: bool
-    skip_tls_verify: Optional[bool]
-    automation_token: Optional[str]
-    cluster_admin_automation_token: Optional[str]
+    skip_tls_verify: bool | None
+    automation_token: str | None
+    cluster_admin_automation_token: str | None
     disabled_integrations: list[str]
-    jumphost_hostname: Optional[str]
-    jumphost_known_hosts: Optional[str]
-    jumphost_user: Optional[str]
-    jumphost_port: Optional[int]
-    jumphost_key: Optional[str]
-    jumphost_remote_port: Optional[int]
+    jumphost_hostname: str | None
+    jumphost_known_hosts: str | None
+    jumphost_user: str | None
+    jumphost_port: int | None
+    jumphost_key: str | None
+    jumphost_remote_port: int | None
     # The local port is currently calculated and set outside of this class
-    jumphost_local_port: Optional[int]
+    jumphost_local_port: int | None
 
     @staticmethod
     def _get_token_verify_server_url(secret: ClusterSecret, cluster: Cluster) -> str:
@@ -112,7 +111,7 @@ class OCConnectionParameters:
     @staticmethod
     def _get_automation_token(
         secret_reader: SecretReaderBase, secret: HasSecret, cluster: Cluster
-    ) -> Optional[str]:
+    ) -> str | None:
         secret_raw = secret_reader.read_all_secret(secret)
         return OCConnectionParameters._get_token_verify_server_url(
             ClusterSecret(
@@ -130,8 +129,8 @@ class OCConnectionParameters:
         cluster_admin: bool,
         use_jump_host: bool = True,
     ) -> OCConnectionParameters:
-        automation_token: Optional[str] = None
-        cluster_admin_automation_token: Optional[str] = None
+        automation_token: str | None = None
+        cluster_admin_automation_token: str | None = None
 
         if cluster_admin:
             if cluster.cluster_admin_automation_token:

reconcile/utils/oc_filters.py

@@ -1,6 +1,5 @@
 from collections.abc import Iterable
 from typing import (
-    Optional,
     Protocol,
     TypeVar,
 )
@@ -34,8 +33,8 @@ def filter_namespaces_by_name(
 
 def filter_namespaces_by_cluster_and_namespace(
     namespaces: Iterable[NS],
-    cluster_names: Optional[Iterable[str]],
-    namespace_names: Optional[Iterable[str]],
+    cluster_names: Iterable[str] | None,
+    namespace_names: Iterable[str] | None,
 ) -> list[NS]:
     """
     Filter namespaces by cluster and namespace name.

reconcile/utils/oc_map.py

@@ -1,10 +1,6 @@
 import logging
 from collections.abc import Iterable
 from threading import Lock
-from typing import (
-    Optional,
-    Union,
-)
 
 from sretoolbox.utils import threaded
 
@@ -41,15 +37,15 @@ class OCMap:
         self,
         connection_parameters: Iterable[OCConnectionParameters],
         integration: str = "",
-        internal: Optional[bool] = None,
+        internal: bool | None = None,
         use_jump_host: bool = True,
         thread_pool_size: int = 1,
         init_projects: bool = False,
         init_api_resources: bool = False,
-        oc_cls: Optional[type[OC]] = None,
+        oc_cls: type[OC] | None = None,
     ):
-        self._oc_map: dict[str, Union[OCCli, OCLogMsg]] = {}
-        self._privileged_oc_map: dict[str, Union[OCCli, OCLogMsg]] = {}
+        self._oc_map: dict[str, OCCli | OCLogMsg] = {}
+        self._privileged_oc_map: dict[str, OCCli | OCLogMsg] = {}
         self._calling_integration = integration
         self._internal = internal
         self._use_jump_host = use_jump_host
@@ -126,7 +122,7 @@ class OCMap:
                     connection_parameters=connection_parameters
                 )
             try:
-                oc_client: Union[OCCli, OCLogMsg] = self._oc_cls(
+                oc_client: OCCli | OCLogMsg = self._oc_cls(
                     connection_parameters=connection_parameters,
                     init_projects=self._init_projects,
                     init_api_resources=self._init_api_resources,
@@ -142,9 +138,7 @@ class OCMap:
                     privileged,
                 )
 
-    def _set_oc(
-        self, cluster: str, value: Union[OCCli, OCLogMsg], privileged: bool
-    ) -> None:
+    def _set_oc(self, cluster: str, value: OCCli | OCLogMsg, privileged: bool) -> None:
         with self._lock:
             if privileged:
                 self._privileged_oc_map[cluster] = value
@@ -160,7 +154,7 @@ class OCMap:
             pass
         return False
 
-    def get(self, cluster: str, privileged: bool = False) -> Union[OCCli, OCLogMsg]:
+    def get(self, cluster: str, privileged: bool = False) -> OCCli | OCLogMsg:
         cluster_map = self._privileged_oc_map if privileged else self._oc_map
         return cluster_map.get(
             cluster,
@@ -200,7 +194,7 @@ def init_oc_map_from_clusters(
     clusters: Iterable[Cluster],
     secret_reader: SecretReaderBase,
     integration: str = "",
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     thread_pool_size: int = 1,
     init_projects: bool = False,
@@ -231,7 +225,7 @@ def init_oc_map_from_namespaces(
     namespaces: Iterable[Namespace],
     secret_reader: SecretReaderBase,
     integration: str = "",
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     thread_pool_size: int = 1,
     init_projects: bool = False,

reconcile/utils/ocm/addons.py

@@ -1,7 +1,4 @@
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.utils.ocm.base import (
     OCMAddonInstallation,
@@ -26,7 +23,7 @@ class AddonService:
         ocm_api: OCMBaseClient,
         cluster_id: str,
         addon_latest_versions: dict[str, str],
-        required_state: Optional[str],
+        required_state: str | None,
     ) -> list[OCMAddonInstallation]:
         """
         Returns a list of Addons installed on a cluster
@@ -37,7 +34,7 @@ class AddonService:
         :param required_state: only return addons with this state
         """
 
-        params: Optional[dict[str, Any]] = None
+        params: dict[str, Any] | None = None
         if required_state:
             params = {"search": f"state='{required_state}'"}
 
@@ -58,7 +55,7 @@ class AddonService:
         raise NotImplementedError()
 
     def get_addon_upgrade_policies(
-        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
+        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: str | None = None
     ) -> list[OCMAddonUpgradePolicy]:
         raise NotImplementedError()
 
@@ -88,7 +85,7 @@ class AddonServiceV1(AddonService):
         return "/api/clusters_mgmt/v1"
 
     def get_addon_upgrade_policies(
-        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
+        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: str | None = None
     ) -> list[OCMAddonUpgradePolicy]:
         results: list[OCMAddonUpgradePolicy] = []
 
@@ -118,7 +115,7 @@ class AddonServiceV1(AddonService):
 
     def _get_addon_upgrade_policy_state(
         self, ocm_api: OCMBaseClient, cluster_id: str, addon_upgrade_policy_id: str
-    ) -> Optional[str]:
+    ) -> str | None:
         try:
             state_data = ocm_api.get(
                 f"{self.addon_base_api_path()}/clusters/{cluster_id}/addon_upgrade_policies/{addon_upgrade_policy_id}/state"
@@ -171,7 +168,7 @@ class AddonServiceV2(AddonService):
         return "/api/addons_mgmt/v1"
 
     def get_addon_upgrade_policies(
-        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: Optional[str] = None
+        self, ocm_api: OCMBaseClient, cluster_id: str, addon_id: str | None = None
     ) -> list[OCMAddonUpgradePolicy]:
         results: list[OCMAddonUpgradePolicy] = []
 

reconcile/utils/ocm/base.py

@@ -2,9 +2,8 @@ from __future__ import annotations
 
 from collections.abc import Iterable
 from datetime import datetime
-from enum import Enum
+from enum import Enum, StrEnum
 from typing import (
-    Optional,
     TypeVar,
 )
 
@@ -22,8 +21,8 @@ CAPABILITY_MANAGE_CLUSTER_ADMIN = "capability.cluster.manage_cluster_admin"
 
 
 class OCMCollectionLink(BaseModel):
-    kind: Optional[str] = None
-    href: Optional[str] = None
+    kind: str | None = None
+    href: str | None = None
 
 
 class OCMModelLink(OCMCollectionLink):
@@ -76,7 +75,7 @@ class OCMClusterUser(BaseModel):
     The id represents the user name.
     """
 
-    href: Optional[str] = None
+    href: str | None = None
     kind: str = "User"
 
 
@@ -86,7 +85,7 @@ class OCMClusterUserList(BaseModel):
     """
 
     kind: str = "UserList"
-    href: Optional[str] = None
+    href: str | None = None
     items: list[OCMClusterUser]
 
 
@@ -96,8 +95,8 @@ class OCMClusterGroup(BaseModel):
     """
 
     id: OCMClusterGroupId
-    href: Optional[str] = None
-    users: Optional[OCMClusterUserList] = None
+    href: str | None = None
+    users: OCMClusterUserList | None = None
 
     def user_ids(self) -> set[str]:
         """
@@ -135,16 +134,16 @@ class OCMClusterAWSOperatorRole(BaseModel):
 
 
 class OCMAWSSTS(OCMClusterFlag):
-    role_arn: Optional[str]
-    support_role_arn: Optional[str]
-    oidc_endpoint_url: Optional[str]
-    operator_iam_roles: Optional[list[OCMClusterAWSOperatorRole]]
-    instance_iam_roles: Optional[dict[str, str]]
-    operator_role_prefix: Optional[str]
+    role_arn: str | None
+    support_role_arn: str | None
+    oidc_endpoint_url: str | None
+    operator_iam_roles: list[OCMClusterAWSOperatorRole] | None
+    instance_iam_roles: dict[str, str] | None
+    operator_role_prefix: str | None
 
 
 class OCMClusterAWSSettings(BaseModel):
-    sts: Optional[OCMAWSSTS]
+    sts: OCMAWSSTS | None
 
     @property
     def sts_enabled(self) -> bool:
@@ -168,7 +167,7 @@ class OCMClusterAWSSettings(BaseModel):
         return roles
 
     @property
-    def account_role_prefix(self) -> Optional[str]:
+    def account_role_prefix(self) -> str | None:
         INSTALLER_ROLE_BASE_NAME = "-Installer-Role"
         installer_role_arn = self.sts.role_arn if self.sts else None
         if installer_role_arn and installer_role_arn.endswith(INSTALLER_ROLE_BASE_NAME):
@@ -231,19 +230,19 @@ class OCMCluster(BaseModel):
     product: OCMModelLink
     identity_providers: OCMCollectionLink
 
-    aws: Optional[OCMClusterAWSSettings]
+    aws: OCMClusterAWSSettings | None
 
     version: OCMClusterVersion
 
     hypershift: OCMClusterFlag
 
-    console: Optional[OCMClusterConsole]
+    console: OCMClusterConsole | None
 
-    api: Optional[OCMClusterAPI]
+    api: OCMClusterAPI | None
 
-    dns: Optional[OCMClusterDns]
+    dns: OCMClusterDns | None
 
-    external_configuration: Optional[OCMExternalConfiguration]
+    external_configuration: OCMExternalConfiguration | None
 
     def minor_version(self) -> str:
         version_info = parse_semver(self.version.raw_id)
@@ -275,15 +274,15 @@ class OCMCluster(BaseModel):
         )
 
     @property
-    def console_url(self) -> Optional[str]:
+    def console_url(self) -> str | None:
         return self.console.url if self.console else None
 
     @property
-    def api_url(self) -> Optional[str]:
+    def api_url(self) -> str | None:
         return self.api.url if self.api else None
 
     @property
-    def base_domain(self) -> Optional[str]:
+    def base_domain(self) -> str | None:
         return self.dns.base_domain if self.dns else None
 
 
@@ -348,7 +347,7 @@ class LabelContainer(BaseModel):
     def __bool__(self) -> bool:
         return len(self.labels) > 0
 
-    def get(self, name: str) -> Optional[OCMLabel]:
+    def get(self, name: str) -> OCMLabel | None:
         return self.labels.get(name)
 
     def __getitem__(self, name: str) -> OCMLabel:
@@ -360,7 +359,7 @@ class LabelContainer(BaseModel):
             raise ValueError(f"Required label '{name}' does not exist.")
         return label
 
-    def get_label_value(self, name: str) -> Optional[str]:
+    def get_label_value(self, name: str) -> str | None:
         label = self.get(name)
         if label:
             return label.value
@@ -370,7 +369,7 @@ class LabelContainer(BaseModel):
         return {label.key: label.value for label in self.labels.values()}
 
 
-class OCMServiceLogSeverity(str, Enum):
+class OCMServiceLogSeverity(StrEnum):
     """
     Represents the severity of a service log.
     """
@@ -462,8 +461,8 @@ class OCMSubscription(BaseModel):
 
     status: OCMSubscriptionStatus
 
-    labels: Optional[list[OCMSubscriptionLabel]] = None
-    capabilities: Optional[list[OCMCapability]] = None
+    labels: list[OCMSubscriptionLabel] | None = None
+    capabilities: list[OCMCapability] | None = None
     """
     Capabilities are a list of features/features flags that are enabled for a subscription.
     """
@@ -477,8 +476,8 @@ class OCMOrganization(BaseModel):
     id: str
     name: str
 
-    labels: Optional[list[OCMOrganizationLabel]] = None
-    capabilities: Optional[list[OCMCapability]] = None
+    labels: list[OCMOrganizationLabel] | None = None
+    capabilities: list[OCMCapability] | None = None
     """
     Capabilities are a list of features/features flags that are enabled for an organization.
     """
@@ -509,7 +508,7 @@ class ClusterDetails(BaseModel):
         return capa is not None and capa.value == value
 
 
-class OCMOIdentityProviderMappingMethod(str, Enum):
+class OCMOIdentityProviderMappingMethod(StrEnum):
     ADD = "add"
     CLAIM = "claim"
     LOOKUP = "lookup"
@@ -519,8 +518,8 @@ class OCMOIdentityProviderMappingMethod(str, Enum):
 class OCMOIdentityProvider(BaseModel):
     type: str
     name: str
-    id: Optional[str] = None
-    href: Optional[str] = None
+    id: str | None = None
+    href: str | None = None
 
 
 class OCMOIdentityProviderGithub(OCMOIdentityProvider):
@@ -543,7 +542,7 @@ class OCMOIdentityProviderOidcOpenIdClaims(BaseModel):
 
 class OCMOIdentityProviderOidcOpenId(BaseModel):
     client_id: str
-    client_secret: Optional[str] = None
+    client_secret: str | None = None
     issuer: str
     claims: OCMOIdentityProviderOidcOpenIdClaims = OCMOIdentityProviderOidcOpenIdClaims(
         email=["email"],
@@ -579,15 +578,15 @@ class OCMAddonUpgradePolicy(BaseModel):
     id: str
     addon_id: str
     cluster_id: str
-    next_run: Optional[str]
-    schedule: Optional[str]
+    next_run: str | None
+    schedule: str | None
     schedule_type: str
     version: str
-    state: Optional[str]
+    state: str | None
 
 
 def build_label_container(
-    *label_iterables: Optional[Iterable[OCMLabel]],
+    *label_iterables: Iterable[OCMLabel] | None,
 ) -> LabelContainer:
     """
     Builds a label container from a list of labels.