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

reconcile/terraform_tgw_attachments.py

@@ -7,9 +7,7 @@ from collections.abc import (
 )
 from typing import (
     Any,
-    Optional,
     TypedDict,
-    Union,
     cast,
 )
 
@@ -69,7 +67,7 @@ class ValidationError(Exception):
 class AccountProviderInfo(BaseModel):
     name: str
     uid: str
-    assume_role: Optional[str]
+    assume_role: str | None
     assume_region: str
     assume_cidr: str
 
@@ -78,9 +76,9 @@ class Requester(BaseModel):
     tgw_id: str
     tgw_arn: str
     region: str
-    routes: Optional[list[dict]]
-    rules: Optional[list[dict]]
-    hostedzones: Optional[list[str]]
+    routes: list[dict] | None
+    rules: list[dict] | None
+    hostedzones: list[str] | None
     cidr_block: str
     account: AccountProviderInfo
 
@@ -88,11 +86,11 @@ class Requester(BaseModel):
 class Accepter(BaseModel):
     cidr_block: str
     region: str
-    vpc_id: Optional[str]
-    route_table_ids: Optional[list[str]]
-    subnets_id_az: Optional[list[dict]]
+    vpc_id: str | None
+    route_table_ids: list[str] | None
+    subnets_id_az: list[dict] | None
     account: AccountProviderInfo
-    api_security_group_id: Optional[str]
+    api_security_group_id: str | None
 
 
 class DesiredStateItem(BaseModel):
@@ -122,9 +120,9 @@ class RunnerParams(TypedDict):
 
 def _build_desired_state_tgw_attachments(
     clusters: Iterable[ClusterV1],
-    ocm_map: Optional[OCMMap],
+    ocm_map: OCMMap | None,
     awsapi: AWSApi,
-    account_name: Optional[str] = None,
+    account_name: str | None = None,
 ) -> tuple[list[DesiredStateItem], bool]:
     """
     Fetch state for TGW attachments between a cluster and all TGWs
@@ -143,10 +141,10 @@ def _build_desired_state_tgw_attachments(
 
 def _build_desired_state_items(
     clusters: Iterable[ClusterV1],
-    ocm_map: Optional[OCMMap],
+    ocm_map: OCMMap | None,
     awsapi: AWSApi,
-    account_name: Optional[str] = None,
-) -> Generator[Optional[DesiredStateItem], Any, None]:
+    account_name: str | None = None,
+) -> Generator[DesiredStateItem | None, Any, None]:
     for cluster_info in clusters:
         ocm = ocm_map.get(cluster_info.name) if ocm_map and cluster_info.ocm else None
         for peer_connection in cluster_info.peering.connections:  # type: ignore[union-attr]
@@ -162,9 +160,9 @@ def _build_desired_state_items(
 def _build_desired_state_tgw_connection(
     peer_connection: ClusterPeeringConnectionAccountTGWV1,
     cluster_info: ClusterV1,
-    ocm: Optional[OCM],
+    ocm: OCM | None,
     awsapi: AWSApi,
-) -> Generator[Optional[DesiredStateItem], Any, None]:
+) -> Generator[DesiredStateItem | None, Any, None]:
     cluster_name = cluster_info.name
     cluster_region = cluster_info.spec.region if cluster_info.spec is not None else ""
     cluster_cidr_block = (
@@ -226,7 +224,7 @@ def _build_account_with_assume_role(
     cluster: ClusterV1,
     region: str,
     cidr_block: str,
-    ocm: Optional[OCM],
+    ocm: OCM | None,
 ) -> AccountProviderInfo:
     account = peer_connection.account
     # assume_role is the role to assume to provision the
@@ -313,7 +311,7 @@ def _build_requester(
 def _build_ocm_map(
     clusters: Iterable[ClusterV1],
     vault_settings: AppInterfaceSettingsV1,
-) -> Optional[OCMMap]:
+) -> OCMMap | None:
     ocm_clusters = [c.dict(by_alias=True) for c in clusters if c.ocm]
     return (
         OCMMap(
@@ -338,7 +336,7 @@ def _validate_tgw_connection_names(desired_state: Iterable[DesiredStateItem]) ->
 def _populate_tgw_attachments_working_dirs(
     ts: Terrascript,
     desired_state: Iterable[DesiredStateItem],
-    print_to_file: Optional[str],
+    print_to_file: str | None,
 ) -> dict[str, str]:
     accounts_by_infra_account_name: dict[str, list[dict[str, Any]]] = {}
     for item in desired_state:
@@ -353,14 +351,12 @@ def _populate_tgw_attachments_working_dirs(
 
 
 def _is_tgw_peer_connection(
-    peer_connection: Union[
-        ClusterPeeringConnectionAccountTGWV1,
-        ClusterPeeringConnectionAccountV1,
-        ClusterPeeringConnectionAccountVPCMeshV1,
-        ClusterPeeringConnectionClusterRequesterV1,
-        ClusterPeeringConnectionV1,
-    ],
-    account_name: Optional[str],
+    peer_connection: ClusterPeeringConnectionAccountTGWV1
+    | ClusterPeeringConnectionAccountV1
+    | ClusterPeeringConnectionAccountVPCMeshV1
+    | ClusterPeeringConnectionClusterRequesterV1
+    | ClusterPeeringConnectionV1,
+    account_name: str | None,
 ) -> bool:
     if peer_connection.provider != TGW_CONNECTION_PROVIDER:
         return False
@@ -372,7 +368,7 @@ def _is_tgw_peer_connection(
 
 def _is_tgw_cluster(
     cluster: ClusterV1,
-    account_name: Optional[str] = None,
+    account_name: str | None = None,
 ) -> bool:
     return any(
         _is_tgw_peer_connection(pc, account_name)
@@ -382,7 +378,7 @@ def _is_tgw_cluster(
 
 def _filter_tgw_clusters(
     clusters: Iterable[ClusterV1],
-    account_name: Optional[str] = None,
+    account_name: str | None = None,
 ) -> list[ClusterV1]:
     return [c for c in clusters if _is_tgw_cluster(c, account_name)]
 
@@ -408,7 +404,7 @@ def _filter_tgw_accounts(
 
 
 def _fetch_desired_state_data_source(
-    account_name: Optional[str] = None,
+    account_name: str | None = None,
 ) -> DesiredStateDataSource:
     clusters = get_clusters_with_peering(gql.get_api())
     tgw_clusters = _filter_tgw_clusters(clusters, account_name)
@@ -420,11 +416,11 @@ def _fetch_desired_state_data_source(
 
 
 def setup(
-    account_name: Optional[str],
+    account_name: str | None,
     desired_state_data_source: DesiredStateDataSource,
     tgw_accounts: list[dict[str, Any]],
     thread_pool_size: int = 10,
-    print_to_file: Optional[str] = None,
+    print_to_file: str | None = None,
 ) -> tuple[SecretReaderBase, AWSApi, Terraform, Terrascript]:
     tgw_clusters = desired_state_data_source.clusters
     all_accounts = [a.dict(by_alias=True) for a in desired_state_data_source.accounts]
@@ -498,11 +494,11 @@ def runner(
 @defer
 def run(
     dry_run: bool,
-    print_to_file: Optional[str] = None,
+    print_to_file: str | None = None,
     enable_deletion: bool = False,
     thread_pool_size: int = 10,
-    account_name: Optional[str] = None,
-    defer: Optional[Callable] = None,
+    account_name: str | None = None,
+    defer: Callable | None = None,
     enable_extended_early_exit: bool = False,
     extended_early_exit_cache_ttl_seconds: int = 3600,
     log_cached_log_output: bool = False,

reconcile/terraform_users.py

@@ -2,7 +2,6 @@ import sys
 from textwrap import indent
 from typing import (
     Any,
-    Optional,
     cast,
 )
 
@@ -109,8 +108,8 @@ def setup(
     print_to_file,
     thread_pool_size: int,
     skip_reencrypt_accounts: list[str],
-    appsre_pgp_key: Optional[str] = None,
-    account_name: Optional[str] = None,
+    appsre_pgp_key: str | None = None,
+    account_name: str | None = None,
 ) -> tuple[list[dict[str, Any]], dict[str, str], bool, AWSApi]:
     accounts = [
         a
@@ -173,7 +172,7 @@ Encrypted password: {}
         if account not in skip_reencrypt_accounts:
             continue
         to = user_name
-        subject = "Invitation to join the {} AWS account".format(account)
+        subject = f"Invitation to join the {account} AWS account"
         body = msg_template.format(account, console_url, user_name, enc_password)
         mails.append((to, subject, body))
 
@@ -224,7 +223,7 @@ def get_reencrypt_settings():
         if reencrypt_settings.skip_aws_accounts:
             skip_accounts = [s.name for s in reencrypt_settings.skip_aws_accounts]
 
-    appsre_pgp_key: Optional[str] = None
+    appsre_pgp_key: str | None = None
     if reencrypt_settings is not None:
         appsre_pgp_key = reencrypt_settings.public_gpg_key
 
@@ -233,11 +232,11 @@ def get_reencrypt_settings():
 
 def run(
     dry_run: bool,
-    print_to_file: Optional[str] = None,
+    print_to_file: str | None = None,
     enable_deletion: bool = False,
     thread_pool_size: int = 10,
     send_mails: bool = True,
-    account_name: Optional[str] = None,
+    account_name: str | None = None,
 ):
     skip_accounts, appsre_pgp_key, reencrypt_settings = get_reencrypt_settings()
 

reconcile/terraform_vpc_resources/integration.py

@@ -1,7 +1,7 @@
 import logging
 import sys
-from collections.abc import Mapping, MutableMapping
-from typing import Any, Iterable, Optional
+from collections.abc import Iterable, Mapping, MutableMapping
+from typing import Any
 
 import jinja2
 
@@ -41,8 +41,8 @@ AWS_PROVIDER_VERSION = "5.7.1"
 
 
 class TerraformVpcResourcesParams(PydanticRunParams):
-    account_name: Optional[str]
-    print_to_file: Optional[str]
+    account_name: str | None
+    print_to_file: str | None
     thread_pool_size: int
     enable_deletion: bool = False
 
@@ -53,7 +53,7 @@ class TerraformVpcResources(QontractReconcileIntegration[TerraformVpcResourcesPa
         return QONTRACT_INTEGRATION.replace("_", "-")
 
     def _filter_accounts(
-        self, data: Iterable[VPCRequest], account_name: Optional[str]
+        self, data: Iterable[VPCRequest], account_name: str | None
     ) -> list[AWSAccountV1]:
         """Return a list of accounts extracted from the provided VPCRequests.
         If account_name is given returns the account object with that name."""

reconcile/test/conftest.py

@@ -6,10 +6,7 @@ from collections.abc import (
     MutableMapping,
 )
 from pathlib import Path
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 from unittest.mock import MagicMock, create_autospec
 
 import pytest
@@ -96,14 +93,14 @@ def vault_secret():
 @pytest.fixture
 def data_factory() -> (
     Callable[
-        [type[BaseModel], Optional[MutableMapping[str, Any]]],
+        [type[BaseModel], MutableMapping[str, Any] | None],
         MutableMapping[str, Any],
     ]
 ):
     """Set default values to None."""
 
     def _data_factory(
-        klass: type[BaseModel], data: Optional[MutableMapping[str, Any]] = None
+        klass: type[BaseModel], data: MutableMapping[str, Any] | None = None
     ) -> MutableMapping[str, Any]:
         return data_default_none(klass, data or {})
 
@@ -117,14 +114,14 @@ class GQLClassFactoryError(Exception):
 @pytest.fixture
 def gql_class_factory() -> (
     Callable[
-        [type[BaseModel], Optional[MutableMapping[str, Any]]],
+        [type[BaseModel], MutableMapping[str, Any] | None],
         BaseModel,
     ]
 ):
     """Create a GQL class from a fixture and set default values to None."""
 
     def _gql_class_factory(
-        klass: type[BaseModel], data: Optional[MutableMapping[str, Any]] = None
+        klass: type[BaseModel], data: MutableMapping[str, Any] | None = None
     ) -> BaseModel:
         try:
             return klass(**data_default_none(klass, data or {}))
@@ -137,8 +134,8 @@ def gql_class_factory() -> (
 
 
 @pytest.fixture
-def gql_api_builder() -> Callable[[Optional[Mapping]], GqlApi]:
-    def builder(data: Optional[Mapping] = None) -> GqlApi:
+def gql_api_builder() -> Callable[[Mapping | None], GqlApi]:
+    def builder(data: Mapping | None = None) -> GqlApi:
         gql_api = create_autospec(GqlApi)
         gql_api.query.return_value = data
         return gql_api

reconcile/test/fixtures.py

@@ -14,7 +14,7 @@ class Fixtures:
         )
 
     def get(self, fixture):
-        with open(self.path(fixture), "r", encoding="locale") as f:
+        with open(self.path(fixture), encoding="locale") as f:
             return f.read().strip()
 
     def get_anymarkup(self, fixture):

reconcile/test/saas_auto_promotions_manager/conftest.py

@@ -5,7 +5,7 @@ from collections.abc import (
     Mapping,
     MutableMapping,
 )
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any
 from unittest.mock import (
     MagicMock,
@@ -140,7 +140,7 @@ def subscriber_builder(
                     success=publisher_data.get("SUCCESSFUL_DEPLOYMENT", True),
                     target_config_hash=publisher_data.get("CONFIG_HASH", ""),
                     saas_file=publisher_name,
-                    check_in=publisher_data.get("CHECK_IN", datetime.now(timezone.utc)),
+                    check_in=publisher_data.get("CHECK_IN", datetime.now(UTC)),
                 )
                 channel.publishers.append(publisher)
             channels.append(channel)

reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/conftest.py

@@ -14,10 +14,10 @@ def file_contents() -> Callable[[str], tuple[str, str]]:
             "files",
         )
 
-        with open(f"{path}/{case}.yml", "r", encoding="locale") as f:
+        with open(f"{path}/{case}.yml", encoding="locale") as f:
             a = f.read().strip()
 
-        with open(f"{path}/{case}.result.yml", "r", encoding="locale") as f:
+        with open(f"{path}/{case}.result.yml", encoding="locale") as f:
             b = f.read().strip()
 
         return (a, b)

reconcile/test/test_database_access_manager.py

@@ -1,9 +1,6 @@
 from collections import defaultdict
-from typing import (
-    Any,
-    Callable,
-    Optional,
-)
+from collections.abc import Callable
+from typing import Any
 from unittest.mock import MagicMock
 
 import pytest
@@ -266,7 +263,7 @@ def test_generate_revoke_changed(
     db_connection_parameter: DatabaseConnectionParameters,
     db_admin_connection_parameter: DatabaseConnectionParameters,
     expected: str,
-    current: Optional[DatabaseAccessV1],
+    current: DatabaseAccessV1 | None,
 ):
     s = PSQLScriptGenerator(
         db_access=db_access_complete,

reconcile/test/test_gitlab_labeler.py

@@ -1,7 +1,4 @@
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 from unittest.mock import (
     create_autospec,
     patch,
@@ -50,7 +47,7 @@ class TestOnboardingGuesser:
         self.gql.return_value = gqlapi_mock
         gqlapi_mock.query.side_effect = self.mock_gql_query
 
-    def mock_gql_query(self, query: str) -> Optional[dict[str, Any]]:
+    def mock_gql_query(self, query: str) -> dict[str, Any] | None:
         """Mock for GqlApi.query using test_data set in setUp"""
         if query == APPS_QUERY:
             return {"apps": self.test_data.apps}

reconcile/test/test_jump_host.py

@@ -1,8 +1,5 @@
 import os
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 from unittest.mock import create_autospec
 
 import pytest
@@ -55,7 +52,7 @@ def test_base_jumphost(fs: Any, parameters: JumphostParameters, expected_port: i
     jumphost = JumpHostBase(parameters=parameters)
     assert os.path.exists(jumphost._identity_file)
 
-    with open(jumphost._identity_file, "r", encoding="locale") as f:
+    with open(jumphost._identity_file, encoding="locale") as f:
         assert f.read() == parameters.key
 
     assert jumphost._port == expected_port
@@ -99,8 +96,8 @@ def test_base_jumphost(fs: Any, parameters: JumphostParameters, expected_port: i
 def test_ssh_jumphost(
     fs: Any,
     parameters: JumphostParameters,
-    local_port: Optional[int],
-    remote_port: Optional[int],
+    local_port: int | None,
+    remote_port: int | None,
 ):
     gql_mock = create_autospec(spec=gql.GqlApi)
     gql_mock.get_resource.side_effect = [{"content": EXPECTED_KNOWN_HOSTS_CONTENT}]
@@ -113,5 +110,5 @@ def test_ssh_jumphost(
     if local_port:
         assert jumphost._local_port == local_port
 
-    with open(known_hosts_file, "r", encoding="locale") as f:
+    with open(known_hosts_file, encoding="locale") as f:
         assert f.read() == EXPECTED_KNOWN_HOSTS_CONTENT

reconcile/test/test_ocm_machine_pools.py

@@ -1,10 +1,7 @@
 from collections.abc import (
     Callable,
     Iterable,
-)
-from typing import (
     Mapping,
-    Optional,
 )
 from unittest.mock import create_autospec
 
@@ -49,7 +46,7 @@ class PoolStub(AbstractPool):
     def has_diff(self, pool: ClusterMachinePoolV1) -> bool:
         return True
 
-    def invalid_diff(self, pool: ClusterMachinePoolV1) -> Optional[str]:
+    def invalid_diff(self, pool: ClusterMachinePoolV1) -> str | None:
         return None
 
     def deletable(self) -> bool:

reconcile/test/test_openshift_base.py

@@ -1,9 +1,6 @@
 import logging
-from typing import (
-    Any,
-    Mapping,
-    Optional,
-)
+from collections.abc import Mapping
+from typing import Any
 from unittest.mock import patch
 
 import pytest
@@ -754,7 +751,7 @@ def build_openshift_resource(
     kind: str,
     api_version: str,
     name: str,
-    extra_body: Optional[dict[str, Any]],
+    extra_body: dict[str, Any] | None,
     integration: str = "",
     integration_version: str = "",
     error_details: str = "",

reconcile/test/test_openshift_cluster_bots.py

@@ -131,10 +131,10 @@ def test_oc(mocker: MockerFixture) -> None:
     assert ocb.oc(*args) is None
     run_mock.assert_called_once_with(run_args, **run_kwargs)
 
-    ret_mock.stdout = "{}".encode()
+    ret_mock.stdout = b"{}"
     assert ocb.oc(*args) == {}
 
-    ret_mock.stdout = "".encode()
+    ret_mock.stdout = b""
     assert ocb.oc(*args) is None
 
     run_mock.side_effect = CalledProcessError(returncode=4, cmd="oc")
@@ -152,7 +152,7 @@ def test_retrieve_token(mocker: MockerFixture) -> None:
         ocb.retrieve_token("kc", "ns", "sa")
     assert oc_mock.call_count == 3
 
-    oc_mock.return_value = {"data": {"token": base64.b64encode("Got It!".encode())}}
+    oc_mock.return_value = {"data": {"token": base64.b64encode(b"Got It!")}}
     assert ocb.retrieve_token("kc", "ns", "sa") == "Got It!"
 
 
@@ -220,7 +220,7 @@ def test_run_no_cluster_admin(
     mocker: MockerFixture, integ_params: dict[str, Any], cluster: Callable
 ) -> None:
     mocks = _setup_mocks(mocker, filtered_clusters=[cluster(server_url="https://api")])
-    mocks.oc.return_value = {"data": {"token": base64.b64encode("mytoken".encode())}}
+    mocks.oc.return_value = {"data": {"token": base64.b64encode(b"mytoken")}}
     ocb.run(**integ_params)
     assert mocks.oc.call_count == 3
     mocks.vault.assert_called_once()
@@ -233,7 +233,7 @@ def test_run_cluster_admin(
     mocks = _setup_mocks(
         mocker, filtered_clusters=[cluster(server_url="https://api", admin=True)]
     )
-    mocks.oc.return_value = {"data": {"token": base64.b64encode("mytoken".encode())}}
+    mocks.oc.return_value = {"data": {"token": base64.b64encode(b"mytoken")}}
     ocb.run(**integ_params)
     assert mocks.oc.call_count == 8
     mocks.vault.assert_called_once()

reconcile/test/test_openshift_namespace_labels.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 from unittest import TestCase
 from unittest.mock import (
     Mock,
@@ -37,8 +36,8 @@ class NS:
 
     cluster: str
     name: str
-    current: Optional[dict[str, str]]
-    managed: Optional[list[str]]
+    current: dict[str, str] | None
+    managed: list[str] | None
     desired: dict[str, str]
     exists: bool = True
 

reconcile/test/test_openshift_saas_deploy_trigger_cleaner.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any
 
 import pytest
@@ -15,7 +15,7 @@ fxt = Fixtures("openshift_saas_deploy_trigger_cleaner")
 
 @pytest.fixture
 def now() -> datetime:
-    return datetime(2024, 4, 4, 0, 0, 0, 0, tzinfo=timezone.utc)
+    return datetime(2024, 4, 4, 0, 0, 0, 0, tzinfo=UTC)
 
 
 # A fixture simulating the output of getting PipelineRuns from a namespace, simplified

reconcile/test/test_saasherder.py

@@ -3,11 +3,8 @@ from collections.abc import (
     Iterable,
     MutableMapping,
 )
-from datetime import datetime, timedelta, timezone
-from typing import (
-    Any,
-    Optional,
-)
+from datetime import UTC, datetime, timedelta
+from typing import Any
 from unittest import TestCase
 from unittest.mock import (
     MagicMock,
@@ -70,12 +67,12 @@ class MockSecretReader(SecretReaderBase):
     """
 
     def _read(
-        self, path: str, field: str, format: Optional[str], version: Optional[int]
+        self, path: str, field: str, format: str | None, version: int | None
     ) -> str:
         return "secret"
 
     def _read_all(
-        self, path: str, field: str, format: Optional[str], version: Optional[int]
+        self, path: str, field: str, format: str | None, version: int | None
     ) -> dict[str, str]:
         return {"param": "secret"}
 
@@ -88,7 +85,7 @@ def inject_gql_class_factory(
     def _gql_class_factory(
         self: Any,
         klass: type[BaseModel],
-        data: Optional[MutableMapping[str, Any]] = None,
+        data: MutableMapping[str, Any] | None = None,
     ) -> BaseModel:
         return gql_class_factory(klass, data)
 
@@ -1230,14 +1227,14 @@ class TestSoakDays(TestCase):
                 "saas_file": self.saas_file.name,
                 "target_config_hash": "ed2af38cf21f268c",
                 # the deployment happened 1 hour ago
-                "check_in": str(datetime.now(timezone.utc) - timedelta(hours=1)),
+                "check_in": str(datetime.now(UTC) - timedelta(hours=1)),
             },
             {
                 "success": True,
                 "saas_file": self.saas_file.name,
                 "target_config_hash": "ed2af38cf21f268c",
                 # the deployment happened 47 hours ago
-                "check_in": str(datetime.now(timezone.utc) - timedelta(hours=47)),
+                "check_in": str(datetime.now(UTC) - timedelta(hours=47)),
             },
         ]
         self.state_mock.get.side_effect = publisher_states
@@ -1254,14 +1251,14 @@ class TestSoakDays(TestCase):
                 "saas_file": self.saas_file.name,
                 "target_config_hash": "ed2af38cf21f268c",
                 # the deployment happened 12 hours ago
-                "check_in": str(datetime.now(timezone.utc) - timedelta(hours=12)),
+                "check_in": str(datetime.now(UTC) - timedelta(hours=12)),
             },
             {
                 "success": True,
                 "saas_file": self.saas_file.name,
                 "target_config_hash": "ed2af38cf21f268c",
                 # the deployment happened 1 hour ago
-                "check_in": str(datetime.now(timezone.utc) - timedelta(hours=1)),
+                "check_in": str(datetime.now(UTC) - timedelta(hours=1)),
             },
         ]
         self.state_mock.get.side_effect = publisher_states

reconcile/test/test_slack_base.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import pytest
 from pydantic import (
     BaseModel,
@@ -157,8 +155,8 @@ def test_permissions_workspace(
 
 
 class ClientGlobalConfig(BaseModel):
-    max_retries: Optional[int]
-    timeout: Optional[int]
+    max_retries: int | None
+    timeout: int | None
 
 
 class ClientMethodConfig(BaseModel):
@@ -167,8 +165,8 @@ class ClientMethodConfig(BaseModel):
 
 
 class ClientConfig(BaseModel):
-    q_global: Optional[ClientGlobalConfig]
-    methods: Optional[list[ClientMethodConfig]]
+    q_global: ClientGlobalConfig | None
+    methods: list[ClientMethodConfig] | None
 
 
 def test_get_slackapi():