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

reconcile/utils/ocm/clusters.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Iterable,
 )
 from functools import lru_cache
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.utils.ocm.base import (
     ACTIVE_SUBSCRIPTION_STATES,
@@ -96,7 +93,7 @@ def discover_clusters_by_labels(
 def discover_clusters_for_subscriptions(
     ocm_api: OCMBaseClient,
     subscription_ids: list[str],
-    cluster_filter: Optional[Filter] = None,
+    cluster_filter: Filter | None = None,
 ) -> list[ClusterDetails]:
     """
     Discover clusters by filtering on their subscription IDs.
@@ -118,7 +115,7 @@ def discover_clusters_for_subscriptions(
 def discover_clusters_for_organizations(
     ocm_api: OCMBaseClient,
     organization_ids: Iterable[str],
-    cluster_filter: Optional[Filter] = None,
+    cluster_filter: Filter | None = None,
 ) -> list[ClusterDetails]:
     """
     Discover clusters by filtering on their organization IDs.
@@ -151,8 +148,8 @@ def get_ocm_clusters(
 
 def get_cluster_details_for_subscriptions(
     ocm_api: OCMBaseClient,
-    subscription_filter: Optional[Filter] = None,
-    cluster_filter: Optional[Filter] = None,
+    subscription_filter: Filter | None = None,
+    cluster_filter: Filter | None = None,
     init_labels: bool = False,
 ) -> Generator[ClusterDetails, None, None]:
     """
@@ -227,7 +224,7 @@ def get_node_pools(ocm_api: OCMBaseClient, cluster_id: str) -> list[dict[str, An
     return results
 
 
-@lru_cache()
+@lru_cache
 def get_version(ocm_api: OCMBaseClient, version: str) -> dict[str, Any]:
     api = f"/api/clusters_mgmt/v1/versions/{version}"
 

reconcile/utils/ocm/label_sources.py

@@ -3,13 +3,12 @@ from abc import (
     abstractmethod,
 )
 from dataclasses import dataclass
-from typing import Optional
 
 
 @dataclass(frozen=True)
 class LabelOwnerRef(ABC):
     ocm_env: str
-    label_container_href: Optional[str]
+    label_container_href: str | None
 
     @abstractmethod
     def identity_labels(self) -> list[str]:

reconcile/utils/ocm/labels.py

@@ -1,9 +1,6 @@
 from collections import defaultdict
 from collections.abc import Generator
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.utils.ocm.base import (
     LabelContainer,
@@ -171,7 +168,7 @@ def build_container_for_prefix(
     )
 
 
-def label_filter(key: str, value: Optional[str] = None) -> Filter:
+def label_filter(key: str, value: str | None = None) -> Filter:
     """
     Creates a filter that matches a label with the given key and
     optionally a value.
@@ -183,7 +180,7 @@ def label_filter(key: str, value: Optional[str] = None) -> Filter:
 
 
 def get_org_labels(
-    ocm_api: OCMBaseClient, org_ids: set[str], label_filter: Optional[Filter]
+    ocm_api: OCMBaseClient, org_ids: set[str], label_filter: Filter | None
 ) -> dict[str, LabelContainer]:
     """
     Fetch all labels from organizations. Optionally, label filtering can be

reconcile/utils/ocm/ocm.py

@@ -3,10 +3,7 @@ from __future__ import annotations
 import functools
 import re
 from collections.abc import Mapping
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from sretoolbox.utils import retry
 
@@ -96,8 +93,8 @@ class OCM:  # pylint: disable=too-many-public-methods
         init_addons=False,
         init_version_gates=False,
         blocked_versions=None,
-        inheritVersionData: Optional[list[dict[str, Any]]] = None,
-        product_portfolio: Optional[OCMProductPortfolio] = None,
+        inheritVersionData: list[dict[str, Any]] | None = None,
+        product_portfolio: OCMProductPortfolio | None = None,
     ):
         """Initiates access token and gets clusters information."""
         self.name = name
@@ -174,7 +171,7 @@ class OCM:  # pylint: disable=too-many-public-methods
         return cluster in self.clusters
 
     def get_product_impl(
-        self, product: str, hypershift: Optional[bool] = False
+        self, product: str, hypershift: bool | None = False
     ) -> OCMProduct:
         return self.product_portfolio.get_product_impl(product, hypershift)
 
@@ -255,7 +252,7 @@ class OCM:  # pylint: disable=too-many-public-methods
         )
         self._delete(api)
 
-    def get_cluster_aws_account_id(self, cluster: str) -> Optional[str]:
+    def get_cluster_aws_account_id(self, cluster: str) -> str | None:
         """Returns the AWS account id of the cluster.
         Since there is no direct API to get this information,
         we hack our way by relying on existing role grants
@@ -768,7 +765,7 @@ class OCM:  # pylint: disable=too-many-public-methods
         self,
         cluster: str,
         with_version: bool = False,
-        required_state: Optional[str] = None,
+        required_state: str | None = None,
     ) -> list[dict[str, str]]:
         """Returns a list of Addons installed on a cluster
 
@@ -784,7 +781,7 @@ class OCM:  # pylint: disable=too-many-public-methods
             return results
         api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/addons"
 
-        p: Optional[dict[str, Any]] = None
+        p: dict[str, Any] | None = None
         if required_state:
             p = {"search": f"state='{required_state}'"}
 
@@ -845,7 +842,7 @@ class OCM:  # pylint: disable=too-many-public-methods
         return rs["kind"].endswith("List")
 
     def _get_json(
-        self, api: str, params: Optional[dict[str, Any]] = None, page_size: int = 100
+        self, api: str, params: dict[str, Any] | None = None, page_size: int = 100
     ) -> dict[str, Any]:
         responses = []
         if not params:
@@ -933,7 +930,7 @@ class OCMMap:  # pylint: disable=too-many-public-methods
         init_provision_shards=False,
         init_addons=False,
         init_version_gates=False,
-        product_portfolio: Optional[OCMProductPortfolio] = None,
+        product_portfolio: OCMProductPortfolio | None = None,
     ) -> None:
         """Initiates OCM instances for each OCM referenced in a cluster."""
         self.clusters_map: dict[str, str] = {}
@@ -984,7 +981,7 @@ class OCMMap:  # pylint: disable=too-many-public-methods
         init_provision_shards,
         init_addons,
         init_version_gates,
-        product_portfolio: Optional[OCMProductPortfolio] = None,
+        product_portfolio: OCMProductPortfolio | None = None,
     ):
         if self.cluster_disabled(cluster_info):
             return
@@ -1009,7 +1006,7 @@ class OCMMap:  # pylint: disable=too-many-public-methods
         init_provision_shards,
         init_addons,
         init_version_gates,
-        product_portfolio: Optional[OCMProductPortfolio] = None,
+        product_portfolio: OCMProductPortfolio | None = None,
     ):
         """
         Initiate OCM client.

reconcile/utils/ocm/products.py

@@ -5,9 +5,7 @@ import random
 import string
 from abc import abstractmethod
 from collections.abc import Mapping
-from typing import (
-    Any,
-)
+from typing import Any
 
 from pydantic import BaseModel
 

reconcile/utils/ocm/search_filters.py

@@ -5,14 +5,13 @@ from abc import (
 from collections.abc import Iterable
 from dataclasses import dataclass
 from datetime import (
+    UTC,
     datetime,
-    timezone,
 )
 from enum import Enum
 from typing import (
     Any,
     Optional,
-    Union,
 )
 
 import dateparser
@@ -128,8 +127,8 @@ class DateRangeCondition(FilterCondition):
     by the dateparser library is supported, e.g. "now", "today", "5 days ago"
     """
 
-    start: Optional[Union[datetime, str]]
-    end: Optional[Union[datetime, str]]
+    start: datetime | str | None
+    end: datetime | str | None
 
     def copy_and_merge(self, other: "FilterCondition") -> "FilterCondition":
         raise InvalidFilterError("daterange merge not supported")
@@ -150,7 +149,7 @@ class DateRangeCondition(FilterCondition):
             conditions.append(f"{self.key} <= '{resolved_end.isoformat()}'")
         return " and ".join(conditions)
 
-    def resolve_start(self) -> Optional[datetime]:
+    def resolve_start(self) -> datetime | None:
         """
         Resolves the start bound of the date range. If the start bound is a
         string, it is parsed by the dateparser library. If it is already a
@@ -158,7 +157,7 @@ class DateRangeCondition(FilterCondition):
         """
         return DateRangeCondition._resolve_date(self.start) if self.start else None
 
-    def resolve_end(self) -> Optional[datetime]:
+    def resolve_end(self) -> datetime | None:
         """
         Resolves the end bound of the date range. If the end bound is a
         string, it is parsed by the dateparser library. If it is already a
@@ -166,7 +165,7 @@ class DateRangeCondition(FilterCondition):
         return DateRangeCondition._resolve_date(self.end) if self.end else None
 
     @staticmethod
-    def _resolve_date(date: Union[datetime, str]) -> datetime:
+    def _resolve_date(date: datetime | str) -> datetime:
         if isinstance(date, datetime):
             return date
         parsed = dateparser.parse(
@@ -180,7 +179,7 @@ class DateRangeCondition(FilterCondition):
 
     @staticmethod
     def now() -> datetime:
-        return datetime.now(tz=timezone.utc)
+        return datetime.now(tz=UTC)
 
 
 class InvalidFilterError(Exception):
@@ -210,13 +209,13 @@ class Filter:
 
     def __init__(
         self,
-        conditions: Optional[list[FilterCondition]] = None,
+        conditions: list[FilterCondition] | None = None,
         mode: FilterMode = FilterMode.AND,
     ):
         self.conditions: list[FilterCondition] = conditions or []
         self.mode = mode
 
-    def condition_by_key(self, key: str) -> Optional[FilterCondition]:
+    def condition_by_key(self, key: str) -> FilterCondition | None:
         """
         Returns the condition with the given key, or None if it does not exist.
         """
@@ -258,7 +257,7 @@ class Filter:
         merged_condition = existing_condition.copy_and_merge(condition)
         return self.copy_and_override(merged_condition)
 
-    def eq(self, key: str, value: Optional[str]) -> "Filter":
+    def eq(self, key: str, value: str | None) -> "Filter":
         """
         Copies the filter and adds a condition to the copy, that requires
         the given key to be equal to the given value. If the value is None,
@@ -268,7 +267,7 @@ class Filter:
             return self.is_in(key, [value])
         return self
 
-    def like(self, key: str, value: Optional[str]) -> "Filter":
+    def like(self, key: str, value: str | None) -> "Filter":
         """
         Copies the filter and adds a condition to the copy, that requires
         the given key to be similar to the given value based on the % wildcard.
@@ -278,7 +277,7 @@ class Filter:
             return self.add_condition(LikeCondition(key, [value]))
         return self
 
-    def is_in(self, key: str, values: Optional[Iterable[Any]]) -> "Filter":
+    def is_in(self, key: str, values: Iterable[Any] | None) -> "Filter":
         """
         Copies the filter and adds a condition to the copy, that requires
         the given key to be equal to one of the given values. If the values
@@ -293,7 +292,7 @@ class Filter:
             return self.add_condition(EqCondition(key, value_list))
         return self
 
-    def before(self, key: str, date: Optional[Union[datetime, str]]) -> "Filter":
+    def before(self, key: str, date: datetime | str | None) -> "Filter":
         """
         Copies the filter and adds a condition to the copy, that requires
         the given key to be before the given date. If the date is None,
@@ -303,7 +302,7 @@ class Filter:
             return self.add_condition(DateRangeCondition(key, None, date))
         return self
 
-    def after(self, key: str, date: Optional[Union[datetime, str]]) -> "Filter":
+    def after(self, key: str, date: datetime | str | None) -> "Filter":
         """
         Copies the filter and adds a condition to the copy, that requires
         the given key to be after the given date. If the date is None,
@@ -316,8 +315,8 @@ class Filter:
     def between(
         self,
         key: str,
-        start: Optional[Union[datetime, str]],
-        end: Optional[Union[datetime, str]],
+        start: datetime | str | None,
+        end: datetime | str | None,
     ) -> "Filter":
         """
         Copies the filter and adds a condition to the copy, that requires

reconcile/utils/ocm/service_log.py

@@ -3,7 +3,6 @@ from datetime import (
     datetime,
     timedelta,
 )
-from typing import Optional
 
 from reconcile.utils.ocm.base import (
     OCMClusterServiceLog,
@@ -17,7 +16,7 @@ CLUSTER_SERVICE_LOGS_CREATE_ENDPOINT = "/api/service_logs/v1/cluster_logs"
 
 
 def get_service_logs_for_cluster_uuid(
-    ocm_api: OCMBaseClient, cluster_uuid: str, filter: Optional[Filter] = None
+    ocm_api: OCMBaseClient, cluster_uuid: str, filter: Filter | None = None
 ) -> Generator[OCMClusterServiceLog, None, None]:
     """
     Returns a list of service logs for a cluster, matching the optional filter.
@@ -36,7 +35,7 @@ def get_service_logs_for_cluster_uuid(
 def create_service_log(
     ocm_api: OCMBaseClient,
     service_log: OCMClusterServiceLogCreateModel,
-    dedup_interval: Optional[timedelta] = None,
+    dedup_interval: timedelta | None = None,
 ) -> OCMClusterServiceLog:
     if dedup_interval:
         previous_log = next(

reconcile/utils/ocm/sre_capability_labels.py

@@ -1,8 +1,4 @@
-from typing import (
-    Any,
-    Optional,
-    Type,
-)
+from typing import Any
 
 from pydantic import Field
 from pydantic.fields import ModelField
@@ -15,7 +11,7 @@ from reconcile.utils.ocm.labels import build_container_for_prefix
 
 
 def sre_capability_label_key(
-    sre_capability: str, config_atom: Optional[str] = None
+    sre_capability: str, config_atom: str | None = None
 ) -> str:
     """
     Generates label keys compliant with the naming schema defined in
@@ -34,7 +30,7 @@ def labelset_groupfield(group_prefix: str) -> Any:
 
 
 def build_labelset(
-    labels: LabelContainer, dataclass: Type[LabelSetTypeVar]
+    labels: LabelContainer, dataclass: type[LabelSetTypeVar]
 ) -> LabelSetTypeVar:
     """
     Instantiates a dataclass from a set of labels.
@@ -46,7 +42,7 @@ def build_labelset(
     return dataclass(**raw_data)
 
 
-def _labelset_field_value(labels: LabelContainer, field: ModelField) -> Optional[Any]:
+def _labelset_field_value(labels: LabelContainer, field: ModelField) -> Any | None:
     key_prefix = field.field_info.extra.get("group_by_prefix")
     if key_prefix:
         return build_container_for_prefix(

reconcile/utils/ocm/subscriptions.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import ValidationError
 
 from reconcile.utils.ocm.base import (
@@ -38,7 +36,7 @@ def get_subscriptions(
 
 
 def build_subscription_filter(
-    states: Optional[set[str]] = None, managed: bool = True
+    states: set[str] | None = None, managed: bool = True
 ) -> Filter:
     """
     Helper function to create a subscription search filer for two very common

reconcile/utils/ocm/syncsets.py

@@ -1,8 +1,6 @@
+from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Mapping,
-)
+from typing import Any
 
 from reconcile.utils.ocm_base_client import OCMBaseClient
 

reconcile/utils/ocm/upgrades.py

@@ -1,8 +1,4 @@
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 
 from reconcile.utils.ocm.base import OCMVersionGate
 from reconcile.utils.ocm_base_client import OCMBaseClient
@@ -20,7 +16,7 @@ def build_cluster_url(cluster_id: str) -> str:
 
 
 def get_upgrade_policies(
-    ocm_api: OCMBaseClient, cluster_id: str, schedule_type: Optional[str] = None
+    ocm_api: OCMBaseClient, cluster_id: str, schedule_type: str | None = None
 ) -> list[dict[str, Any]]:
     """Returns a list of details of Upgrade Policies
 
@@ -48,7 +44,7 @@ def get_upgrade_policies(
 
 def get_upgrade_policy_state(
     ocm_api: OCMBaseClient, cluster_id: str, upgrade_policy_id: str
-) -> Optional[str]:
+) -> str | None:
     try:
         state_data = ocm_api.get(
             f"{build_cluster_url(cluster_id)}/upgrade_policies/{upgrade_policy_id}/state"
@@ -80,7 +76,7 @@ def delete_upgrade_policy(
 
 
 def get_control_plane_upgrade_policies(
-    ocm_api: OCMBaseClient, cluster_id: str, schedule_type: Optional[str] = None
+    ocm_api: OCMBaseClient, cluster_id: str, schedule_type: str | None = None
 ) -> list[dict[str, Any]]:
     """
     Returns a list of details of Upgrade Policies
@@ -160,7 +156,7 @@ def create_node_pool_upgrade_policy(
 
 def create_version_agreement(
     ocm_api: OCMBaseClient, gate_id: str, cluster_id: str
-) -> dict[str, Union[str, bool]]:
+) -> dict[str, str | bool]:
     return ocm_api.post(
         f"{build_cluster_url(cluster_id)}/gate_agreements",
         {"version_gate": {"id": gate_id}},

reconcile/utils/ocm_base_client.py

@@ -6,9 +6,7 @@ from collections.abc import (
 from types import TracebackType
 from typing import (
     Any,
-    Optional,
     Protocol,
-    Type,
 )
 
 from pydantic import BaseModel
@@ -40,7 +38,7 @@ class OCMBaseClient:
         access_token_client_secret: str,
         access_token_url: str,
         access_token_client_id: str,
-        session: Optional[Session] = None,
+        session: Session | None = None,
     ):
         self._access_token_client_secret = access_token_client_secret
         self._access_token_client_id = access_token_client_id
@@ -69,7 +67,7 @@ class OCMBaseClient:
             "accept": "application/json",
         })
 
-    def get(self, api_path: str, params: Optional[Mapping[str, str]] = None) -> Any:
+    def get(self, api_path: str, params: Mapping[str, str] | None = None) -> Any:
         ocm_request.labels(verb="GET", client_id=self._access_token_client_id).inc()
         r = self._session.get(
             f"{self._url}{api_path}",
@@ -82,9 +80,9 @@ class OCMBaseClient:
     def get_paginated(
         self,
         api_path: str,
-        params: Optional[dict[str, Any]] = None,
+        params: dict[str, Any] | None = None,
         max_page_size: int = 100,
-        max_pages: Optional[int] = None,
+        max_pages: int | None = None,
     ) -> Generator[dict[str, Any], None, None]:
         if not params:
             params_copy = {}
@@ -94,8 +92,7 @@ class OCMBaseClient:
 
         while True:
             rs = self.get(api_path, params=params_copy)
-            for item in rs.get("items", []):
-                yield item
+            yield from rs.get("items", [])
             current_page = rs.get("page", 0)
             records_on_page = rs.get("size", len(rs.get("items", [])))
             if records_on_page < max_page_size:
@@ -107,8 +104,8 @@ class OCMBaseClient:
     def post(
         self,
         api_path: str,
-        data: Optional[Mapping[str, Any]] = None,
-        params: Optional[Mapping[str, str]] = None,
+        data: Mapping[str, Any] | None = None,
+        params: Mapping[str, str] | None = None,
     ) -> Any:
         ocm_request.labels(verb="POST", client_id=self._access_token_client_id).inc()
         r = self._session.post(
@@ -130,7 +127,7 @@ class OCMBaseClient:
         self,
         api_path: str,
         data: Mapping[str, Any],
-        params: Optional[Mapping[str, str]] = None,
+        params: Mapping[str, str] | None = None,
     ):
         ocm_request.labels(verb="PATCH", client_id=self._access_token_client_id).inc()
         r = self._session.patch(
@@ -158,9 +155,9 @@ class OCMBaseClient:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         self.close()
 
@@ -184,7 +181,7 @@ class OCMAPIClientConfiguration(BaseModel, arbitrary_types_allowed=True):
 def init_ocm_base_client_for_org(
     org: AUSOCMOrganization,
     secret_reader: SecretReaderBase,
-    session: Optional[Session] = None,
+    session: Session | None = None,
 ) -> OCMBaseClient:
     if org.access_token_client_id:
         return init_ocm_base_client(
@@ -204,7 +201,7 @@ def init_ocm_base_client_for_org(
 def init_ocm_base_client(
     cfg: OCMAPIClientConfigurationProtocol,
     secret_reader: SecretReaderBase,
-    session: Optional[Session] = None,
+    session: Session | None = None,
 ) -> OCMBaseClient:
     """
     Initiate an API client towards an OCM instance.

reconcile/utils/openshift_resource.py

@@ -6,10 +6,6 @@ import json
 import re
 from collections.abc import Mapping
 from threading import Lock
-from typing import (
-    Optional,
-    Union,
-)
 
 import semver
 from pydantic import BaseModel
@@ -48,7 +44,7 @@ IGNORABLE_DATA_FIELDS = ["service-ca.crt"]
 # these labels existance and/or value is determined by a controller running
 # on the cluster. we need to ignore their existance in the current state,
 # otherwise we will deal with constant reconciliation
-CONTROLLER_MANAGED_LABELS: dict[str, set[Union[str, re.Pattern]]] = {
+CONTROLLER_MANAGED_LABELS: dict[str, set[str | re.Pattern]] = {
     "ManagedCluster": {
         "clusterID",
         "managed-by",
@@ -247,9 +243,7 @@ class OpenshiftResource:
             self.name  # pylint: disable=pointless-statement
             self.kind  # pylint: disable=pointless-statement
         except (KeyError, TypeError) as e:
-            msg = "resource invalid data ({}). details: {}".format(
-                e.__class__.__name__, self.error_details
-            )
+            msg = f"resource invalid data ({e.__class__.__name__}). details: {self.error_details}"
             raise ConstructResourceError(msg)
 
         if self.kind not in {
@@ -581,7 +575,7 @@ class ResourceInventory:
         cluster,
         namespace,
         resource_type,
-        managed_names: Optional[list[str]] = None,
+        managed_names: list[str] | None = None,
     ):
         self._clusters.setdefault(cluster, {})
         self._clusters[cluster].setdefault(namespace, {})
@@ -690,8 +684,8 @@ def build_secret(
     integration_version: str,
     unencoded_data: Mapping[str, str],
     error_details: str = "",
-    caller_name: Optional[str] = None,
-    annotations: Optional[Mapping[str, str]] = None,
+    caller_name: str | None = None,
+    annotations: Mapping[str, str] | None = None,
 ) -> OpenshiftResource:
     encoded_data = {
         k: base64_encode_secret_field_value(v) for k, v in unencoded_data.items()

reconcile/utils/output.py

@@ -3,17 +3,16 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import Optional, Union
 
 import yaml
 from tabulate import tabulate
 
 
 def print_output(
-    options: Mapping[str, Union[str, bool]],
+    options: Mapping[str, str | bool],
     content: list[dict],
     columns: Iterable[str] = (),
-) -> Optional[str]:
+) -> str | None:
     if options["sort"]:
         content.sort(key=lambda c: tuple(c.values()))
     if options.get("to_string"):

reconcile/utils/pagerduty_api.py

@@ -6,7 +6,6 @@ from collections.abc import (
 from datetime import datetime as dt
 from datetime import timedelta
 from typing import (
-    Optional,
     Protocol,
 )
 
@@ -45,7 +44,7 @@ class PagerDutyUser(Protocol):
     which must be implemented by a class to be compatible."""
 
     org_username: str
-    pagerduty_username: Optional[str]
+    pagerduty_username: str | None
 
 
 class PagerDutyTarget(Protocol):
@@ -54,8 +53,8 @@ class PagerDutyTarget(Protocol):
 
     name: str
     instance: PagerDutyInstance
-    escalation_policy_id: Optional[str]
-    schedule_id: Optional[str]
+    escalation_policy_id: str | None
+    schedule_id: str | None
 
 
 class PagerDutyConfig(BaseModel):
@@ -166,7 +165,7 @@ class PagerDutyMap:
 
 def get_pagerduty_map(
     secret_reader: SecretReader,
-    pagerduty_instances: Optional[Iterable[PagerDutyInstance]],
+    pagerduty_instances: Iterable[PagerDutyInstance] | None,
     init_users: bool = True,
     pager_duty_api_class: type[PagerDutyApi] = PagerDutyApi,
 ) -> PagerDutyMap: