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

reconcile/saas_auto_promotions_manager/integration.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from sretoolbox.utils import threaded
 
@@ -95,8 +94,8 @@ class SaasAutoPromotionsManager:
 
 def init_external_dependencies(
     dry_run: bool,
-    env_name: Optional[str] = None,
-    app_name: Optional[str] = None,
+    env_name: str | None = None,
+    app_name: str | None = None,
 ) -> tuple[
     PromotionState,
     VCS,
@@ -169,9 +168,9 @@ def init_external_dependencies(
 def run(
     dry_run: bool,
     thread_pool_size: int,
-    env_name: Optional[str] = None,
-    app_name: Optional[str] = None,
-    defer: Optional[Callable] = None,
+    env_name: str | None = None,
+    app_name: str | None = None,
+    defer: Callable | None = None,
 ) -> None:
     (
         deployment_state,

reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py

@@ -1,7 +1,6 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
 from enum import Enum
-from typing import Optional
 
 from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_requests import (
     OpenBatcherMergeRequest,
@@ -145,7 +144,7 @@ class Batcher:
         if not unsubmitted_promotions:
             return
 
-        batch_with_capacity: Optional[OpenBatcherMergeRequest] = None
+        batch_with_capacity: OpenBatcherMergeRequest | None = None
         for mr in self._open_mrs:
             if mr.is_batchable and len(mr.content_hashes) < batch_limit:
                 batch_with_capacity = mr

reconcile/saas_auto_promotions_manager/publisher.py

@@ -1,6 +1,5 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Optional
 
 from reconcile.utils.promotion_state import PromotionState
 from reconcile.utils.secret_reader import HasSecret
@@ -18,7 +17,7 @@ class DeploymentInfo:
     success: bool
     saas_file: str
     target_config_hash: str
-    check_in: Optional[datetime]
+    check_in: datetime | None
 
 
 class Publisher:
@@ -37,10 +36,10 @@ class Publisher:
         app_name: str,
         namespace_name: str,
         resource_template_name: str,
-        target_name: Optional[str],
+        target_name: str | None,
         cluster_name: str,
-        auth_code: Optional[HasSecret],
-        publish_job_logs: Optional[bool],
+        auth_code: HasSecret | None,
+        publish_job_logs: bool | None,
         has_subscriber: bool = True,
     ):
         self._ref = ref
@@ -48,7 +47,7 @@ class Publisher:
         self._auth_code = auth_code
         self.channels: set[str] = set()
         self.commit_sha: str = ""
-        self.deployment_info_by_channel: dict[str, Optional[DeploymentInfo]] = {}
+        self.deployment_info_by_channel: dict[str, DeploymentInfo | None] = {}
         self.uid = uid
         self.saas_name = saas_name
         self.saas_file_path = saas_file_path

reconcile/saas_auto_promotions_manager/subscriber.py

@@ -2,8 +2,7 @@ import hashlib
 import logging
 from collections.abc import Iterable
 from dataclasses import dataclass
-from datetime import datetime, timedelta, timezone
-from typing import Optional
+from datetime import UTC, datetime, timedelta
 
 from reconcile.gql_definitions.fragments.saas_target_namespace import (
     SaasTargetNamespace,
@@ -80,7 +79,7 @@ class Subscriber:
 
     def _validate_deployment(
         self, publisher: Publisher, channel: Channel
-    ) -> Optional[DeploymentInfo]:
+    ) -> DeploymentInfo | None:
         deployment_info = publisher.deployment_info_by_channel.get(channel.name)
         if not deployment_info:
             logging.info(
@@ -103,7 +102,7 @@ class Subscriber:
         We accumulate the time a ref is running on all publishers for this subscriber.
         We compare that accumulated time with the soak_days setting of the subscriber.
         """
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         delta = timedelta(days=0)
         for channel in self.channels:
             for publisher in channel.publishers:

reconcile/saas_file_validator.py

@@ -1,9 +1,6 @@
 import logging
 import sys
-from typing import (
-    Callable,
-    Optional,
-)
+from collections.abc import Callable
 
 from reconcile.jenkins_job_builder import init_jjb
 from reconcile.status import ExitCodes
@@ -26,7 +23,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
 @defer
-def run(dry_run: bool, defer: Optional[Callable] = None) -> None:
+def run(dry_run: bool, defer: Callable | None = None) -> None:
     vault_settings = get_app_interface_vault_settings()
     saasherder_settings = get_saasherder_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)

reconcile/signalfx_endpoint_monitoring.py

@@ -1,9 +1,6 @@
 import logging
 import sys
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.closedbox_endpoint_monitoring_base import (
     Endpoint,
@@ -43,7 +40,7 @@ def run(
 
 def build_probe(
     provider: EndpointMonitoringProvider, endpoints: list[Endpoint]
-) -> Optional[OpenshiftResource]:
+) -> OpenshiftResource | None:
     signalfx = provider.signalFx
     if not signalfx:
         return None

reconcile/skupper_network/integration.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import jinja2
 import yaml
@@ -248,9 +245,9 @@ def get_skupper_networks(query_func: Callable) -> list[SkupperNetworkV1]:
 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:
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)

reconcile/skupper_network/models.py

@@ -77,10 +77,8 @@ class SkupperSite(BaseModel):
             if (
                 isinstance(
                     c,
-                    (
-                        ClusterPeeringConnectionClusterRequesterV1,
-                        ClusterPeeringConnectionClusterAccepterV1,
-                    ),
+                    ClusterPeeringConnectionClusterRequesterV1
+                    | ClusterPeeringConnectionClusterAccepterV1,
                 )
             ) and c.cluster.name == other.cluster.name:
                 return True
@@ -168,7 +166,7 @@ class SkupperSite(BaseModel):
 
     def unique_token_name(self, other: SkupperSite) -> str:
         """Generate a unique token name for a site connection."""
-        return hashlib.sha256(f"{other}-{self}".encode("UTF-8")).hexdigest()
+        return hashlib.sha256(f"{other}-{self}".encode()).hexdigest()
 
     def token_name(self, other: SkupperSite) -> str:
         """Get the token name for a site connection."""

reconcile/slack_base.py

@@ -1,8 +1,5 @@
 from collections.abc import Mapping
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils.secret_reader import (
@@ -31,7 +28,7 @@ def slackapi_from_slack_workspace(
     secret_reader: SecretReaderBase,
     integration_name: str,
     init_usergroups: bool = True,
-    channel: Optional[str] = None,
+    channel: str | None = None,
 ) -> SlackApi:
     if "workspace" not in slack_workspace:
         raise ValueError('Slack workspace not containing keyword "workspace"')
@@ -104,9 +101,9 @@ def slackapi_from_permissions(
 def get_slackapi(
     workspace_name: str,
     token: str,
-    client_config: Optional[HasClientConfig] = None,
+    client_config: HasClientConfig | None = None,
     init_usergroups: bool = True,
-    channel: Optional[str] = None,
+    channel: str | None = None,
 ) -> SlackApi:
     """Initiate a SlackApi instance."""
     if client_config:

reconcile/slack_usergroups.py

@@ -3,14 +3,12 @@ import sys
 from collections.abc import (
     Callable,
     Iterable,
+    Sequence,
 )
 from datetime import datetime
 from typing import (
     Any,
-    Optional,
-    Sequence,
     TypedDict,
-    Union,
 )
 from urllib.parse import urlparse
 
@@ -77,7 +75,7 @@ INTEGRATION_VERSION = "0.1.0"
 error_occurred = False
 
 
-def get_git_api(url: str) -> Union[GithubRepositoryApi, GitLabApi]:
+def get_git_api(url: str) -> GithubRepositoryApi | GitLabApi:
     """Return GitHub/GitLab API based on url."""
     parsed_url = urlparse(url)
 
@@ -147,7 +145,7 @@ def compute_cluster_user_group(name: str) -> str:
 def get_slack_map(
     secret_reader: SecretReader,
     permissions: Iterable[PermissionSlackUsergroupV1],
-    desired_workspace_name: Optional[str] = None,
+    desired_workspace_name: str | None = None,
 ) -> SlackMap:
     """Return SlackMap (API) per workspaces."""
     slack_map = {}
@@ -183,8 +181,8 @@ def get_slack_map(
 
 def get_current_state(
     slack_map: SlackMap,
-    desired_workspace_name: Optional[str],
-    desired_usergroup_name: Optional[str],
+    desired_workspace_name: str | None,
+    desired_usergroup_name: str | None,
     cluster_usergroups: list[str],
 ) -> SlackState:
     """
@@ -399,8 +397,8 @@ def get_desired_state(
     pagerduty_map: PagerDutyMap,
     permissions: Iterable[PermissionSlackUsergroupV1],
     users: Iterable[User],
-    desired_workspace_name: Optional[str],
-    desired_usergroup_name: Optional[str],
+    desired_workspace_name: str | None,
+    desired_usergroup_name: str | None,
 ) -> SlackState:
     """Get the desired state of Slack usergroups."""
     desired_state: SlackState = {}
@@ -461,8 +459,8 @@ def get_desired_state_cluster_usergroups(
     slack_map: SlackMap,
     clusters: Iterable[ClusterV1],
     users: Iterable[UserV1],
-    desired_workspace_name: Optional[str],
-    desired_usergroup_name: Optional[str],
+    desired_workspace_name: str | None,
+    desired_usergroup_name: str | None,
 ) -> SlackState:
     """Get the desired state of Slack usergroups."""
     desired_state: SlackState = {}
@@ -752,14 +750,14 @@ class RunnerParams(TypedDict):
     slack_map: SlackMap
     desired_state: SlackState
     clusters: list[ClusterV1]
-    workspace_name: Optional[str]
-    usergroup_name: Optional[str]
+    workspace_name: str | None
+    usergroup_name: str | None
 
 
 def run(
     dry_run: bool,
-    workspace_name: Optional[str] = None,
-    usergroup_name: Optional[str] = None,
+    workspace_name: str | None = None,
+    usergroup_name: str | None = None,
     enable_extended_early_exit: bool = False,
     extended_early_exit_cache_ttl_seconds: int = 3600,
     log_cached_log_output: bool = False,
@@ -841,8 +839,8 @@ def runner(
     slack_map: SlackMap,
     desired_state: SlackState,
     clusters: list[ClusterV1],
-    workspace_name: Optional[str] = None,
-    usergroup_name: Optional[str] = None,
+    workspace_name: str | None = None,
+    usergroup_name: str | None = None,
 ) -> ExtendedEarlyExitRunnerResult:
     current_state = get_current_state(
         slack_map=slack_map,

reconcile/sql_query.py

@@ -2,17 +2,13 @@ import logging
 import sys
 import time
 from collections.abc import (
+    Callable,
     Iterable,
     Mapping,
 )
 from enum import Enum
 from textwrap import indent
-from typing import (
-    Any,
-    Callable,
-    Optional,
-    Union,
-)
+from typing import Any
 
 import jinja2
 
@@ -162,7 +158,7 @@ spec:
 
 def get_tf_resource_info(
     terrascript: Terrascript, namespace: Mapping[str, Any], identifier: str
-) -> Union[dict[str, str], None]:
+) -> dict[str, str] | None:
     """
     Extracting the external resources information from the namespace
     for a given identifier
@@ -191,7 +187,7 @@ def get_tf_resource_info(
 
 
 def collect_queries(
-    settings: dict[str, Any], smtp_client: SmtpClient, query_name: Optional[str] = None
+    settings: dict[str, Any], smtp_client: SmtpClient, query_name: str | None = None
 ) -> list[dict[str, Any]]:
     """
     Consults the app-interface and constructs the list of queries
@@ -835,7 +831,7 @@ def _process_new_query(
 def run(
     dry_run: bool,
     enable_deletion: bool = False,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
     settings = queries.get_app_interface_settings()
     state = init_state(integration=QONTRACT_INTEGRATION)

reconcile/status_board.py

@@ -3,10 +3,9 @@ from abc import (
     ABC,
     abstractmethod,
 )
+from collections.abc import Iterable, Mapping
 from typing import (
     Any,
-    Iterable,
-    Mapping,
     Optional,
 )
 
@@ -39,10 +38,10 @@ class AbstractStatusBoard(ABC, BaseModel):
     """Abstract class for upgrade policies
     Used to create and delete upgrade policies in OCM."""
 
-    id: Optional[str]
+    id: str | None
     name: str
     fullname: str
-    metadata: Optional[dict[str, Any]]
+    metadata: dict[str, Any] | None
 
     @abstractmethod
     def create(self, ocm: OCMBaseClient) -> None:
@@ -63,7 +62,7 @@ class AbstractStatusBoard(ABC, BaseModel):
 
 
 class Product(AbstractStatusBoard):
-    applications: Optional[list["Application"]]
+    applications: list["Application"] | None
 
     def create(self, ocm: OCMBaseClient) -> None:
         spec = self.dict(by_alias=True)

reconcile/statuspage/atlassian.py

@@ -2,7 +2,6 @@ import logging
 import time
 from typing import (
     Any,
-    Optional,
     Self,
 )
 
@@ -29,12 +28,12 @@ class AtlassianRawComponent(BaseModel):
 
     id: str
     name: str
-    description: Optional[str]
+    description: str | None
     position: int
     status: str
-    automation_email: Optional[str]
-    group_id: Optional[str]
-    group: Optional[bool]
+    automation_email: str | None
+    group_id: str | None
+    group: bool | None
 
 
 class AtlassianRawMaintenanceUpdate(BaseModel):
@@ -56,9 +55,9 @@ class AtlassianRawMaintenance(BaseModel):
     scheduled_until: str
     incident_updates: list[AtlassianRawMaintenanceUpdate]
     components: list[AtlassianRawComponent]
-    auto_transition_deliver_notifications_at_end: Optional[bool]
-    auto_transition_deliver_notifications_at_start: Optional[bool]
-    scheduled_remind_prior: Optional[bool]
+    auto_transition_deliver_notifications_at_end: bool | None
+    auto_transition_deliver_notifications_at_start: bool | None
+    scheduled_remind_prior: bool | None
 
 
 class AtlassianAPI:
@@ -177,13 +176,13 @@ class AtlassianStatusPageProvider:
         self._group_name_to_id = {g.name: g.id for g in self._components if g.group}
         self._group_id_to_name = {g.id: g.name for g in self._components if g.group}
 
-    def get_component_by_id(self, id: str) -> Optional[StatusComponent]:
+    def get_component_by_id(self, id: str) -> StatusComponent | None:
         raw = self.get_raw_component_by_id(id)
         if raw:
             return self._bound_raw_component_to_status_component(raw)
         return None
 
-    def get_raw_component_by_id(self, id: str) -> Optional[AtlassianRawComponent]:
+    def get_raw_component_by_id(self, id: str) -> AtlassianRawComponent | None:
         return self._components_by_id.get(id)
 
     def get_current_page(self) -> StatusPage:
@@ -201,7 +200,7 @@ class AtlassianStatusPageProvider:
         )
 
     def _raw_component_to_status_component(
-        self, raw_component: AtlassianRawComponent, name_override: Optional[str] = None
+        self, raw_component: AtlassianRawComponent, name_override: str | None = None
     ) -> StatusComponent:
         group_name = (
             self._group_id_to_name.get(raw_component.group_id)
@@ -222,7 +221,7 @@ class AtlassianStatusPageProvider:
 
     def _bound_raw_component_to_status_component(
         self, raw_component: AtlassianRawComponent
-    ) -> Optional[StatusComponent]:
+    ) -> StatusComponent | None:
         bound_component_name = self._binding_state.get_name_for_component_id(
             raw_component.id
         )
@@ -234,7 +233,7 @@ class AtlassianStatusPageProvider:
 
     def lookup_component(
         self, desired_component: StatusComponent
-    ) -> tuple[Optional[AtlassianRawComponent], bool]:
+    ) -> tuple[AtlassianRawComponent | None, bool]:
         """
         Finds the component on the page that matches the desired component. This
         is either done explicitely by using binding information if available or
@@ -268,7 +267,7 @@ class AtlassianStatusPageProvider:
         return component, bound
 
     def should_apply(
-        self, desired: StatusComponent, current: Optional[AtlassianRawComponent]
+        self, desired: StatusComponent, current: AtlassianRawComponent | None
     ) -> bool:
         """
         Verifies if the desired component should be applied to the status page
@@ -410,7 +409,7 @@ class AtlassianStatusPageProvider:
     def _raw_maintenance_to_status_maintenance(
         self,
         raw_maintenance: AtlassianRawMaintenance,
-        name_override: Optional[str] = None,
+        name_override: str | None = None,
     ) -> StatusMaintenance:
         return StatusMaintenance(
             name=name_override or raw_maintenance.name,

reconcile/statuspage/integrations/maintenances.py

@@ -1,6 +1,6 @@
 import logging
 import sys
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 from reconcile.slack_base import slackapi_from_queries
 from reconcile.statuspage.atlassian import AtlassianStatusPageProvider
@@ -52,7 +52,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
         desired_state: list[StatusMaintenance],
         binding_state: S3ComponentBindingState,
     ) -> None:
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         slack = slackapi_from_queries(QONTRACT_INTEGRATION, init_usergroups=False)
         for m in desired_state:
             scheduled_start = datetime.fromisoformat(m.schedule_start)
@@ -68,7 +68,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
     def run(self, dry_run: bool = False) -> None:
         binding_state = get_binding_state(self.name, self.secret_reader)
         pages = get_status_pages()
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
 
         error = False
         for p in pages:

reconcile/statuspage/page.py

@@ -1,4 +1,4 @@
-from typing import Optional, Self, cast
+from typing import Self, cast
 
 from pydantic import BaseModel
 
@@ -25,8 +25,8 @@ class StatusComponent(BaseModel):
 
     name: str
     display_name: str
-    description: Optional[str]
-    group_name: Optional[str]
+    description: str | None
+    group_name: str | None
     status_provider_configs: list[StatusProvider]
     """
     Status provider configs hold different ways for a component to determine its status
@@ -39,7 +39,7 @@ class StatusComponent(BaseModel):
         """
         return bool(self.status_provider_configs)
 
-    def desired_component_status(self) -> Optional[str]:
+    def desired_component_status(self) -> str | None:
         if self.status_management_enabled():
             for provider in self.status_provider_configs:
                 status = provider.get_status()
@@ -53,7 +53,7 @@ class StatusComponent(BaseModel):
 
     @classmethod
     def init_from_page_component(
-        cls, component: StatusPageComponentV1, name_override: Optional[str] = None
+        cls, component: StatusPageComponentV1, name_override: str | None = None
     ) -> Self:
         status_configs = [
             build_status_provider_config(cfg) for cfg in component.status_config or []
@@ -106,9 +106,9 @@ class StatusMaintenanceAnnouncement(BaseModel):
     Represents the desired state of a status maintenance.
     """
 
-    remind_subscribers: Optional[bool] = None
-    notify_subscribers_on_start: Optional[bool] = None
-    notify_subscribers_on_completion: Optional[bool] = None
+    remind_subscribers: bool | None = None
+    notify_subscribers_on_start: bool | None = None
+    notify_subscribers_on_completion: bool | None = None
 
     @classmethod
     def init_from_announcement(

reconcile/statuspage/state.py

@@ -1,5 +1,4 @@
 from typing import (
-    Optional,
     Protocol,
 )
 
@@ -13,9 +12,9 @@ from reconcile.utils.state import State
 
 
 class ComponentBindingState(Protocol):
-    def get_id_for_component_name(self, component_name: str) -> Optional[str]: ...
+    def get_id_for_component_name(self, component_name: str) -> str | None: ...
 
-    def get_name_for_component_id(self, component_id: str) -> Optional[str]: ...
+    def get_name_for_component_id(self, component_id: str) -> str | None: ...
 
     def bind_component(self, component_name: str, component_id: str) -> None: ...
 
@@ -33,10 +32,10 @@ class S3ComponentBindingState(ComponentBindingState):
             v: k for k, v in self.name_to_id_cache.items()
         }
 
-    def get_id_for_component_name(self, component_name: str) -> Optional[str]:
+    def get_id_for_component_name(self, component_name: str) -> str | None:
         return self.name_to_id_cache.get(component_name)
 
-    def get_name_for_component_id(self, component_id: str) -> Optional[str]:
+    def get_name_for_component_id(self, component_id: str) -> str | None:
         return self.id_to_name_cache.get(component_id)
 
     def bind_component(self, component_name: str, component_id: str) -> None:

reconcile/statuspage/status.py

@@ -3,10 +3,9 @@ from abc import (
     abstractmethod,
 )
 from datetime import (
+    UTC,
     datetime,
-    timezone,
 )
-from typing import Optional
 
 from dateutil.parser import isoparse
 from pydantic import BaseModel
@@ -28,7 +27,7 @@ class StatusProvider(ABC):
     """
 
     @abstractmethod
-    def get_status(self) -> Optional[str]: ...
+    def get_status(self) -> str | None: ...
 
 
 class ManualStatusProvider(StatusProvider, BaseModel):
@@ -38,13 +37,13 @@ class ManualStatusProvider(StatusProvider, BaseModel):
     the component.
     """
 
-    start: Optional[datetime] = None
+    start: datetime | None = None
     """
     The optional start time of the time window in which the manually
     defined status is active.
     """
 
-    end: Optional[datetime] = None
+    end: datetime | None = None
     """
     The optional end time of the time window in which the manually
     defined status is active.
@@ -56,7 +55,7 @@ class ManualStatusProvider(StatusProvider, BaseModel):
     time window is active or if no time window is defined.
     """
 
-    def get_status(self) -> Optional[str]:
+    def get_status(self) -> str | None:
         if self._is_active():
             return self.component_status
         return None
@@ -71,7 +70,7 @@ class ManualStatusProvider(StatusProvider, BaseModel):
             raise ValueError(
                 "manual component status time window is invalid: end before start"
             )
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         if self.start and now < self.start:
             return False
         if self.end and self.end < now:
@@ -81,7 +80,7 @@ class ManualStatusProvider(StatusProvider, BaseModel):
 
 def build_status_provider_config(
     cfg: StatusProviderV1,
-) -> Optional[StatusProvider]:
+) -> StatusProvider | None:
     """
     Translates a status provider config from the desired state into
     provider specific implementation that provides the status resolution logic.