qontract-reconcile 0.10.1rc879__py3-none-any.whl → 0.10.1rc894__py3-none-any.whl

reconcile/jira_watcher.py

@@ -34,8 +34,8 @@ def format_message(server, key, data, event, previous_state=None, current_state=
         if previous_state and current_state
         else ""
     )
-    url = "{}/browse/{}".format(server, key)
-    return "{} ({}) {}{}".format(url, summary, event, info)
+    url = f"{server}/browse/{key}"
+    return f"{url} ({summary}) {event}{info}"
 
 
 def calculate_diff(server, current_state, previous_state):

reconcile/ldap_groups/integration.py

@@ -3,10 +3,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.gql_definitions.ldap_groups.roles import RoleV1
 from reconcile.gql_definitions.ldap_groups.roles import query as roles_query
@@ -62,7 +59,7 @@ class LdapGroupsIntegration(QontractReconcileIntegration[LdapGroupsIntegrationPa
         return {"roles": [c.dict() for c in self.get_roles(query_func)]}
 
     @defer
-    def run(self, dry_run: bool, defer: Optional[Callable] = None) -> None:
+    def run(self, dry_run: bool, defer: Callable | None = None) -> None:
         """Run the integration."""
         gql_api = gql.get_api()
         roles = self.get_roles(gql_api.query)

reconcile/ocm/types.py

@@ -1,10 +1,5 @@
 from __future__ import annotations
 
-from typing import (
-    Optional,
-    Union,
-)
-
 from pydantic import (
     BaseModel,
     Extra,
@@ -18,29 +13,29 @@ class OCMClusterAutoscale(BaseModel):
 
 
 class OCMClusterNetwork(BaseModel):
-    type: Optional[str]
+    type: str | None
     vpc: str
     service: str
     pod: str
 
 
 class OCMClusterSpec(BaseModel):
-    autoscale: Optional[OCMClusterAutoscale]
+    autoscale: OCMClusterAutoscale | None
     channel: str
-    disable_user_workload_monitoring: Optional[bool]
-    external_id: Optional[str]
-    id: Optional[str]
-    instance_type: Optional[str]
-    multi_az: Optional[bool]
-    nodes: Optional[int]
+    disable_user_workload_monitoring: bool | None
+    external_id: str | None
+    id: str | None
+    instance_type: str | None
+    multi_az: bool | None
+    nodes: int | None
     private: bool
     product: str
     provider: str
-    provision_shard_id: Optional[str]
+    provision_shard_id: str | None
     region: str
-    initial_version: Optional[str]
+    initial_version: str | None
     version: str
-    hypershift: Optional[bool]
+    hypershift: bool | None
 
     class Config:
         extra = Extra.forbid
@@ -57,7 +52,7 @@ class OSDClusterSpec(OCMClusterSpec):
 class ROSAOcmAwsStsAttrs(BaseModel):
     installer_role_arn: str
     support_role_arn: str
-    controlplane_role_arn: Optional[str]
+    controlplane_role_arn: str | None
     worker_role_arn: str
 
     class Config:
@@ -66,7 +61,7 @@ class ROSAOcmAwsStsAttrs(BaseModel):
 
 class ROSAOcmAwsAttrs(BaseModel):
     creator_role_arn: str
-    sts: Optional[ROSAOcmAwsStsAttrs]
+    sts: ROSAOcmAwsStsAttrs | None
 
     class Config:
         extra = Extra.forbid
@@ -82,9 +77,9 @@ class ROSAClusterAWSAccount(BaseModel):
 
 class ROSAClusterSpec(OCMClusterSpec):
     account: ROSAClusterAWSAccount
-    subnet_ids: Optional[list[str]]
-    availability_zones: Optional[list[str]]
-    oidc_endpoint_url: Optional[str]
+    subnet_ids: list[str] | None
+    availability_zones: list[str] | None
+    oidc_endpoint_url: str | None
 
     class Config:
         extra = Extra.forbid
@@ -93,18 +88,18 @@ class ROSAClusterSpec(OCMClusterSpec):
 class ClusterMachinePool(BaseModel):
     id: str
     instance_type: str
-    replicas: Optional[int]
-    autoscale: Optional[OCMClusterAutoscale]
+    replicas: int | None
+    autoscale: OCMClusterAutoscale | None
 
 
 class OCMSpec(BaseModel):
-    path: Optional[str]
-    spec: Union[OSDClusterSpec, ROSAClusterSpec, OCMClusterSpec]
+    path: str | None
+    spec: OSDClusterSpec | ROSAClusterSpec | OCMClusterSpec
     machine_pools: list[ClusterMachinePool] = Field(
         default_factory=list, alias="machinePools"
     )
     network: OCMClusterNetwork
-    domain: Optional[str]
+    domain: str | None
     server_url: str = Field("", alias="serverUrl")
     console_url: str = Field("", alias="consoleUrl")
     elb_fqdn: str = Field("", alias="elbFQDN")

reconcile/ocm_addons_upgrade_tests_trigger.py

@@ -1,8 +1,5 @@
 import logging
-from typing import (
-    Callable,
-    Optional,
-)
+from collections.abc import Callable
 
 from reconcile import queries
 from reconcile.typed_queries.app_interface_vault_settings import (
@@ -18,7 +15,7 @@ QONTRACT_INTEGRATION = "ocm-addons-upgrade-tests-trigger"
 
 
 @defer
-def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
+def run(dry_run: bool, defer: Callable | None = None) -> None:
     settings = queries.get_app_interface_settings()
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
@@ -40,7 +37,7 @@ def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
         )
 
         ocm = ocm_map[ocm_name]
-        state_updates: dict[str, Optional[str]] = {}
+        state_updates: dict[str, str | None] = {}
         for aut in addon_upgrade_tests:
             addon_name = aut["addon"]["name"]
             addon_org_version = None

reconcile/ocm_clusters.py

@@ -4,7 +4,7 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import Any, Optional
+from typing import Any
 
 import reconcile.utils.mr.clusters_updates as cu
 import reconcile.utils.ocm as ocmmod
@@ -283,7 +283,7 @@ def get_cluster_ocm_update_spec(
 
 
 def _app_interface_updates_mr(
-    clusters_updates: Mapping[str, Any], gitlab_project_id: Optional[str], dry_run: bool
+    clusters_updates: Mapping[str, Any], gitlab_project_id: str | None, dry_run: bool
 ):
     """Creates an MR to app-interface with the necessary cluster manifest updates
 
@@ -318,15 +318,15 @@ def _cluster_is_compatible(cluster: Mapping[str, Any]) -> bool:
 
 
 class OcmClustersParams(PydanticRunParams):
-    gitlab_project_id: Optional[str] = None
+    gitlab_project_id: str | None = None
     thread_pool_size: int = 10
 
     # rosa job controller params
-    job_controller_cluster: Optional[str] = None
-    job_controller_namespace: Optional[str] = None
-    rosa_job_service_account: Optional[str] = None
-    rosa_role: Optional[str] = None
-    rosa_job_image: Optional[str] = None
+    job_controller_cluster: str | None = None
+    job_controller_namespace: str | None = None
+    rosa_job_service_account: str | None = None
+    rosa_role: str | None = None
+    rosa_job_image: str | None = None
 
 
 class OcmClusters(QontractReconcileIntegration[OcmClustersParams]):

reconcile/ocm_internal_notifications/integration.py

@@ -5,7 +5,6 @@ from collections.abc import (
     Callable,
 )
 from functools import lru_cache
-from typing import Optional
 
 from reconcile.gql_definitions.common.ocm_environments import (
     query as ocm_environment_query,
@@ -48,7 +47,7 @@ class OcmInternalNotifications(QontractReconcileIntegration[NoParams]):
     @lru_cache
     def slack_get_user_id_by_name(
         self, user_name: str, mail_address: str
-    ) -> Optional[str]:
+    ) -> str | None:
         try:
             return self.slack.get_user_id_by_name(
                 user_name=user_name, mail_address=mail_address

reconcile/ocm_labels/integration.py

@@ -5,10 +5,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from deepdiff import DeepHash
 from pydantic import validator
@@ -124,7 +121,7 @@ class OcmLabelsIntegration(QontractReconcileIntegration[OcmLabelsIntegrationPara
             init_aus_cluster_label_source(query_func),
         ]
 
-    def get_early_exit_desired_state(self) -> Optional[dict[str, Any]]:
+    def get_early_exit_desired_state(self) -> dict[str, Any] | None:
         gqlapi = gql.get_api()
         desired = {
             "org_labels": self.fetch_desired_state(

reconcile/ocm_machine_pools.py

@@ -3,12 +3,8 @@ from abc import (
     ABC,
     abstractmethod,
 )
-from collections.abc import Mapping
+from collections.abc import Iterable, Mapping
 from enum import Enum
-from typing import (
-    Iterable,
-    Optional,
-)
 
 from pydantic import (
     BaseModel,
@@ -100,12 +96,12 @@ class AbstractPool(ABC, BaseModel):
     # Abstract class for machine pools, to be implemented by OSD/HyperShift classes
 
     id: str
-    replicas: Optional[int]
-    taints: Optional[list[Mapping[str, str]]]
-    labels: Optional[Mapping[str, str]]
+    replicas: int | None
+    taints: list[Mapping[str, str]] | None
+    labels: Mapping[str, str] | None
     cluster: str
     cluster_type: ClusterType = Field(..., exclude=True)
-    autoscaling: Optional[AbstractAutoscaling]
+    autoscaling: AbstractAutoscaling | None
 
     @root_validator()
     @classmethod
@@ -131,7 +127,7 @@ class AbstractPool(ABC, BaseModel):
         pass
 
     @abstractmethod
-    def invalid_diff(self, pool: ClusterMachinePoolV1) -> Optional[str]:
+    def invalid_diff(self, pool: ClusterMachinePoolV1) -> str | None:
         pass
 
     @abstractmethod
@@ -184,7 +180,7 @@ class MachinePool(AbstractPool):
             or self._has_diff_autoscale(pool)
         )
 
-    def invalid_diff(self, pool: ClusterMachinePoolV1) -> Optional[str]:
+    def invalid_diff(self, pool: ClusterMachinePoolV1) -> str | None:
         if self.instance_type != pool.instance_type:
             return "instance_type"
         return None
@@ -203,7 +199,7 @@ class MachinePool(AbstractPool):
         cluster: str,
         cluster_type: ClusterType,
     ):
-        autoscaling: Optional[MachinePoolAutoscaling] = None
+        autoscaling: MachinePoolAutoscaling | None = None
         if pool.autoscale:
             autoscaling = MachinePoolAutoscaling(
                 min_replicas=pool.autoscale.min_replicas,
@@ -229,7 +225,7 @@ class NodePool(AbstractPool):
     # Node pool, used for HyperShift clusters
 
     aws_node_pool: AWSNodePool
-    subnet: Optional[str]
+    subnet: str | None
 
     def delete(self, ocm: OCM) -> None:
         ocm.delete_node_pool(self.cluster, self.dict(by_alias=True))
@@ -266,7 +262,7 @@ class NodePool(AbstractPool):
             or self._has_diff_autoscale(pool)
         )
 
-    def invalid_diff(self, pool: ClusterMachinePoolV1) -> Optional[str]:
+    def invalid_diff(self, pool: ClusterMachinePoolV1) -> str | None:
         if self.aws_node_pool.instance_type != pool.instance_type:
             return "instance_type"
         if self.subnet != pool.subnet:
@@ -283,7 +279,7 @@ class NodePool(AbstractPool):
         cluster: str,
         cluster_type: ClusterType,
     ):
-        autoscaling: Optional[NodePoolAutoscaling] = None
+        autoscaling: NodePoolAutoscaling | None = None
         if pool.autoscale:
             autoscaling = NodePoolAutoscaling(
                 min_replica=pool.autoscale.min_replicas,

reconcile/ocm_upgrade_scheduler_org_updater.py

@@ -1,9 +1,6 @@
 import json
 import logging
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import yaml
 
@@ -25,7 +22,7 @@ def render_policy(
     template: dict[str, Any],
     cluster_spec: OCMSpec,
     labels: dict[str, str],
-    settings: Optional[dict[str, Any]] = None,
+    settings: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     body = template["path"]["content"]
     type = template.get("type") or "jinja2"

reconcile/openshift_base.py

@@ -12,9 +12,7 @@ from dataclasses import (
 )
 from typing import (
     Any,
-    Optional,
     Protocol,
-    Union,
     runtime_checkable,
 )
 
@@ -40,6 +38,7 @@ from reconcile.utils.oc import (
     OCClient,
     OCLogMsg,
     PrimaryClusterIPCanNotBeUnsetError,
+    RequestEntityTooLargeError,
     StatefulSetUpdateForbidden,
     StatusCodeError,
     UnsupportedMediaTypeError,
@@ -73,7 +72,7 @@ class BaseStateSpec:
 @dataclass
 class CurrentStateSpec(BaseStateSpec):
     kind: str
-    resource_names: Optional[Iterable[str]]
+    resource_names: Iterable[str] | None
 
 
 @dataclass
@@ -83,7 +82,7 @@ class DesiredStateSpec(BaseStateSpec):
     privileged: bool = False
 
 
-StateSpec = Union[CurrentStateSpec, DesiredStateSpec]
+StateSpec = CurrentStateSpec | DesiredStateSpec
 
 
 @runtime_checkable
@@ -113,7 +112,7 @@ class HasOrgAndGithubUsername(Protocol):
 class ClusterMap(Protocol):
     """An OCMap protocol."""
 
-    def get(self, cluster: str, privileged: bool = False) -> Union[OCCli, OCLogMsg]: ...
+    def get(self, cluster: str, privileged: bool = False) -> OCCli | OCLogMsg: ...
 
     def get_cluster(self, cluster: str, privileged: bool = False) -> OCCli: ...
 
@@ -125,9 +124,9 @@ class ClusterMap(Protocol):
 def init_specs_to_fetch(
     ri: ResourceInventory,
     oc_map: ClusterMap,
-    namespaces: Optional[Iterable[Mapping]] = None,
-    clusters: Optional[Iterable[Mapping]] = None,
-    override_managed_types: Optional[Iterable[str]] = None,
+    namespaces: Iterable[Mapping] | None = None,
+    clusters: Iterable[Mapping] | None = None,
+    override_managed_types: Iterable[str] | None = None,
     managed_types_key: str = "managedResourceTypes",
 ) -> list[StateSpec]:
     state_specs: list[StateSpec] = []
@@ -288,7 +287,7 @@ def populate_current_state(
     ri: ResourceInventory,
     integration: str,
     integration_version: str,
-    caller: Optional[str] = None,
+    caller: str | None = None,
 ):
     # if spec.oc is None: - oc can't be none because init_namespace_specs_to_fetch does not create specs if oc is none
     #    return
@@ -318,17 +317,17 @@ def populate_current_state(
 
 
 def fetch_current_state(
-    namespaces: Optional[Iterable[Mapping]] = None,
-    clusters: Optional[Iterable[Mapping]] = None,
-    thread_pool_size: Optional[int] = None,
-    integration: Optional[str] = None,
-    integration_version: Optional[str] = None,
-    override_managed_types: Optional[Iterable[str]] = None,
-    internal: Optional[bool] = None,
+    namespaces: Iterable[Mapping] | None = None,
+    clusters: Iterable[Mapping] | None = None,
+    thread_pool_size: int | None = None,
+    integration: str | None = None,
+    integration_version: str | None = None,
+    override_managed_types: Iterable[str] | None = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
     init_api_resources: bool = False,
     cluster_admin: bool = False,
-    caller: Optional[str] = None,
+    caller: str | None = None,
 ) -> tuple[ResourceInventory, OC_Map]:
     ri = ResourceInventory()
     settings = queries.get_app_interface_settings()
@@ -402,7 +401,7 @@ def apply(
 
         try:
             oc.apply(namespace, annotated)
-        except InvalidValueApplyError:
+        except (InvalidValueApplyError, RequestEntityTooLargeError):
             oc.remove_last_applied_configuration(
                 namespace, resource_type, resource.name
             )
@@ -567,11 +566,11 @@ class ApplyOptions:
     wait_for_namespace: bool
     recycle_pods: bool
     take_over: bool
-    override_enable_deletion: Optional[bool]
-    caller: Optional[str]
-    all_callers: Optional[Sequence[str]]
-    privileged: Optional[bool]
-    enable_deletion: Optional[bool]
+    override_enable_deletion: bool | None
+    caller: str | None
+    all_callers: Sequence[str] | None
+    privileged: bool | None
+    enable_deletion: bool | None
 
 
 def should_apply(
@@ -886,7 +885,7 @@ def delete_action(
         )
     except StatusCodeError as e:
         ri.register_error()
-        msg = "[{}/{}] {}".format(cluster, namespace, str(e))
+        msg = f"[{cluster}/{namespace}] {str(e)}"
         logging.error(msg)
 
 
@@ -931,7 +930,7 @@ def _realize_resource_data_3way_diff(
     actions: list[dict] = []
 
     if ri.has_error_registered(cluster=cluster):
-        msg = ("[{}] skipping realize_data for " "cluster with errors").format(cluster)
+        msg = f"[{cluster}] skipping realize_data for " "cluster with errors"
         logging.error(msg)
         return actions
 
@@ -1305,8 +1304,8 @@ def aggregate_shared_resources(namespace_info, shared_resources_type):
 
 def determine_user_keys_for_access(
     cluster_name: str,
-    auth_list: Sequence[Union[dict[str, str], HasService]],
-    enforced_user_keys: Optional[list[str]] = None,
+    auth_list: Sequence[dict[str, str] | HasService],
+    enforced_user_keys: list[str] | None = None,
 ) -> list[str]:
     """Return user keys based on enabled cluster authentication methods."""
     AUTH_METHOD_USER_KEY = {
@@ -1352,7 +1351,7 @@ def user_has_cluster_access(
 ) -> bool:
     """Check user has access to cluster."""
     userkeys = determine_user_keys_for_access(cluster.name, cluster.auth)
-    return any((getattr(user, userkey) in cluster_users for userkey in userkeys))
+    return any(getattr(user, userkey) in cluster_users for userkey in userkeys)
 
 
 def get_namespace_type_overrides(namespace: Mapping) -> dict[str, str]:
@@ -1368,7 +1367,7 @@ def get_namespace_type_overrides(namespace: Mapping) -> dict[str, str]:
 
 
 def get_namespace_resource_types(
-    namespace: Mapping, type_overrides: Optional[dict[str, str]] = None
+    namespace: Mapping, type_overrides: dict[str, str] | None = None
 ) -> list[str]:
     """Returns a list with the namespace ResourceTypes, with the overrides in place
 
@@ -1385,7 +1384,7 @@ def get_namespace_resource_types(
 
 
 def get_namespace_resource_names(
-    namespace: Mapping, type_overrides: Optional[dict[str, str]] = None
+    namespace: Mapping, type_overrides: dict[str, str] | None = None
 ) -> dict[str, list[str]]:
     """Returns a list with the namespace ResourceTypeNames, with the overrides in place
 

reconcile/openshift_groups.py

@@ -5,10 +5,7 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from sretoolbox.utils import threaded
 
@@ -53,9 +50,7 @@ def get_cluster_state(
     try:
         group = oc.get_group_if_exists(group_name)
     except Exception as e:
-        msg = ("could not get group state for cluster/group combination: {}/{}").format(
-            cluster, group_name
-        )
+        msg = f"could not get group state for cluster/group combination: {cluster}/{group_name}"
         logging.error(msg)
         raise e
     if group is None:
@@ -84,7 +79,7 @@ def create_groups_list(
 
 
 def fetch_current_state(
-    thread_pool_size: int, internal: Optional[bool], use_jump_host: bool
+    thread_pool_size: int, internal: bool | None, use_jump_host: bool
 ) -> tuple[OCMap, list[dict[str, str]], list[str], list[dict[str, str]]]:
     clusters = [c for c in get_clusters() if is_in_shard(c.name)]
     ocm_clusters = [c.name for c in clusters if c.ocm is not None]
@@ -110,7 +105,7 @@ def fetch_current_state(
 
 
 def fetch_desired_state(
-    clusters: list[str], enforced_user_keys: Optional[list[str]] = None
+    clusters: list[str], enforced_user_keys: list[str] | None = None
 ) -> list[dict[str, str]]:
     gqlapi = gql.get_api()
     roles = expiration.filter(query_managed_roles(query_func=gqlapi.query).roles or [])
@@ -145,8 +140,8 @@ def fetch_desired_state(
 def calculate_diff(
     current_state: Iterable[Mapping[str, str]],
     desired_state: Iterable[Mapping[str, str]],
-) -> list[dict[str, Optional[str]]]:
-    diff: list[dict[str, Optional[str]]] = []
+) -> list[dict[str, str | None]]:
+    diff: list[dict[str, str | None]] = []
     users_to_add = subtract_states(
         desired_state, current_state, "add_user_to_group", "create_group"
     )
@@ -164,8 +159,8 @@ def subtract_states(
     subtract_state: Iterable[Mapping[str, str]],
     user_action: str,
     group_action: str,
-) -> list[dict[str, Optional[str]]]:
-    result: list[dict[str, Optional[str]]] = []
+) -> list[dict[str, str | None]]:
+    result: list[dict[str, str | None]] = []
 
     for f_user in from_state:
         found = False
@@ -199,14 +194,14 @@ def subtract_states(
     return result
 
 
-def validate_diffs(diffs: Iterable[Mapping[str, Optional[str]]]) -> None:
+def validate_diffs(diffs: Iterable[Mapping[str, str | None]]) -> None:
     gqlapi = gql.get_api()
     clusters_query = query_managed_groups(query_func=gqlapi.query).clusters or []
 
     desired_combos = [
         {"cluster": diff["cluster"], "group": diff["group"]} for diff in diffs
     ]
-    desired_combos_unique: list[dict[str, Optional[str]]] = []
+    desired_combos_unique: list[dict[str, str | None]] = []
     for combo in desired_combos:
         if combo in desired_combos_unique:
             continue
@@ -232,13 +227,13 @@ def validate_diffs(diffs: Iterable[Mapping[str, Optional[str]]]) -> None:
         raise RuntimeError(msg)
 
 
-def sort_diffs(diff: Mapping[str, Optional[str]]) -> int:
+def sort_diffs(diff: Mapping[str, str | None]) -> int:
     if diff["action"] in {"create_group", "del_user_from_group"}:
         return 1
     return 2
 
 
-def act(diff: Mapping[str, Optional[str]], oc_map: ClusterMap) -> None:
+def act(diff: Mapping[str, str | None], oc_map: ClusterMap) -> None:
     cluster = diff.get("cluster") or ""
     group = diff["group"]
     user = diff["user"]
@@ -257,16 +252,16 @@ def act(diff: Mapping[str, Optional[str]], oc_map: ClusterMap) -> None:
     elif action == "delete_group":
         logging.debug("skipping group deletion")
     else:
-        raise Exception("invalid action: {}".format(action))
+        raise Exception(f"invalid action: {action}")
 
 
 @defer
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
     oc_map, current_state, ocm_clusters, groups_list = fetch_current_state(
         thread_pool_size, internal, use_jump_host