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

reconcile/test/test_status_board.py

@@ -1,7 +1,4 @@
-from typing import (
-    Callable,
-    Optional,
-)
+from collections.abc import Callable
 from unittest.mock import call
 
 import pytest
@@ -19,9 +16,9 @@ from reconcile.utils.ocm_base_client import OCMBaseClient
 
 
 class StatusBoardStub(AbstractStatusBoard):
-    created: Optional[bool] = False
-    deleted: Optional[bool] = False
-    summarized: Optional[bool] = False
+    created: bool | None = False
+    deleted: bool | None = False
+    summarized: bool | None = False
 
     def create(self, ocm: OCMBaseClient) -> None:
         self.created = True

reconcile/test/test_terraform_tgw_attachments.py

@@ -3,10 +3,6 @@ from collections.abc import (
     Iterable,
     Mapping,
 )
-from typing import (
-    Optional,
-    Union,
-)
 from unittest.mock import create_autospec
 
 import pytest
@@ -162,10 +158,10 @@ def peering_connection_builder(
         name: str,
         provider: str,
         manage_routes: bool = False,
-        account: Optional[ClusterPeeringConnectionAccountTGWV1_AWSAccountV1] = None,
-        assume_role: Optional[str] = None,
-        cidr_block: Optional[str] = None,
-        delete: Optional[bool] = None,
+        account: ClusterPeeringConnectionAccountTGWV1_AWSAccountV1 | None = None,
+        assume_role: str | None = None,
+        cidr_block: str | None = None,
+        delete: bool | None = None,
     ) -> ClusterPeeringConnectionAccountTGWV1:
         return gql_class_factory(
             ClusterPeeringConnectionAccountTGWV1,
@@ -260,13 +256,11 @@ def peering_builder(
 ) -> Callable[..., ClusterPeeringV1]:
     def builder(
         connections: list[
-            Union[
-                ClusterPeeringConnectionAccountTGWV1,
-                ClusterPeeringConnectionAccountV1,
-                ClusterPeeringConnectionAccountVPCMeshV1,
-                ClusterPeeringConnectionClusterRequesterV1,
-                ClusterPeeringConnectionV1,
-            ]
+            ClusterPeeringConnectionAccountTGWV1
+            | ClusterPeeringConnectionAccountV1
+            | ClusterPeeringConnectionAccountVPCMeshV1
+            | ClusterPeeringConnectionClusterRequesterV1
+            | ClusterPeeringConnectionV1
         ],
     ) -> ClusterPeeringV1:
         return gql_class_factory(
@@ -504,11 +498,11 @@ def build_expected_desired_state_item(
 def _setup_mocks(
     mocker: MockerFixture,
     vault_settings: AppInterfaceSettingsV1,
-    clusters: Optional[Iterable[ClusterV1]] = None,
-    accounts: Optional[Iterable[AWSAccountV1]] = None,
-    vpc_details: Optional[Mapping] = None,
-    tgws: Optional[Iterable] = None,
-    assume_role: Optional[str] = None,
+    clusters: Iterable[ClusterV1] | None = None,
+    accounts: Iterable[AWSAccountV1] | None = None,
+    vpc_details: Mapping | None = None,
+    tgws: Iterable | None = None,
+    assume_role: str | None = None,
     feature_toggle_state: bool = True,
 ) -> dict:
     mocked_gql_api = create_autospec(GqlApi)

reconcile/typed_queries/alerting_services_settings.py

@@ -1,12 +1,11 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.common.alerting_services_settings import query
 from reconcile.utils import gql
 from reconcile.utils.exceptions import AppInterfaceSettingsError
 
 
-def get_alerting_services(query_func: Optional[Callable] = None) -> set[str]:
+def get_alerting_services(query_func: Callable | None = None) -> set[str]:
     """Get alertingServices from app-interface settings"""
 
     if not query_func:

reconcile/typed_queries/app_interface_custom_messages.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.common.app_interface_custom_messages import (
     query,
@@ -9,8 +8,8 @@ from reconcile.utils import gql
 
 def get_app_interface_custom_message(
     desired_id: str,
-    query_func: Optional[Callable] = None,
-) -> Optional[str]:
+    query_func: Callable | None = None,
+) -> str | None:
     """Returns App Interface Custom Message by ID or None if not found"""
     if not query_func:
         query_func = gql.get_api().query

reconcile/typed_queries/app_interface_deadmanssnitch_settings.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.app_interface_dms_settings import (
     DeadMansSnitchSettingsV1,
     query,
@@ -10,7 +8,7 @@ from reconcile.utils.gql import GqlApi
 
 
 def get_deadmanssnitch_settings(
-    gql_api: Optional[GqlApi] = None,
+    gql_api: GqlApi | None = None,
 ) -> DeadMansSnitchSettingsV1:
     api = gql_api if gql_api else gql.get_api()
     data = query(query_func=api.query)

reconcile/typed_queries/app_interface_repo_url.py

@@ -1,12 +1,11 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.common.app_interface_repo_settings import query
 from reconcile.utils import gql
 from reconcile.utils.exceptions import AppInterfaceSettingsError
 
 
-def get_app_interface_repo_url(query_func: Optional[Callable] = None) -> str:
+def get_app_interface_repo_url(query_func: Callable | None = None) -> str:
     if not query_func:
         gqlapi = gql.get_api()
         query_func = gqlapi.query

reconcile/typed_queries/app_interface_state_settings.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.app_interface_state_settings import (
     AppInterfaceStateConfigurationV1,
     query,
@@ -7,7 +5,7 @@ from reconcile.gql_definitions.common.app_interface_state_settings import (
 from reconcile.utils import gql
 
 
-def get_app_interface_state_settings() -> Optional[AppInterfaceStateConfigurationV1]:
+def get_app_interface_state_settings() -> AppInterfaceStateConfigurationV1 | None:
     """Returns App Interface Settings"""
     gqlapi = gql.get_api()
     data = query(gqlapi.query)

reconcile/typed_queries/app_interface_vault_settings.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.common.app_interface_vault_settings import (
     AppInterfaceSettingsV1,
@@ -10,7 +9,7 @@ from reconcile.utils.exceptions import AppInterfaceSettingsError
 
 
 def get_app_interface_vault_settings(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> AppInterfaceSettingsV1:
     """Returns App Interface Settings and raises err if none are found"""
     if not query_func:

reconcile/typed_queries/aws_vpc_requests.py

@@ -1,11 +1,9 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.aws_vpc_requests import VPCRequest, query
 from reconcile.utils import gql
 from reconcile.utils.gql import GqlApi
 
 
-def get_aws_vpc_requests(gql_api: Optional[GqlApi] = None) -> list[VPCRequest]:
+def get_aws_vpc_requests(gql_api: GqlApi | None = None) -> list[VPCRequest]:
     api = gql_api if gql_api else gql.get_api()
     data = query(query_func=api.query)
     return list(data.vpc_requests or [])

reconcile/typed_queries/aws_vpcs.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.aws_vpcs import (
     AWSVPC,
     query,
@@ -8,7 +6,7 @@ from reconcile.utils import gql
 from reconcile.utils.gql import GqlApi
 
 
-def get_aws_vpcs(gql_api: Optional[GqlApi] = None) -> list[AWSVPC]:
+def get_aws_vpcs(gql_api: GqlApi | None = None) -> list[AWSVPC]:
     api = gql_api if gql_api else gql.get_api()
     data = query(query_func=api.query)
     return list(data.vpcs or [])

reconcile/typed_queries/clusters.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.clusters import (
     ClusterV1,
     query,
@@ -9,8 +7,8 @@ from reconcile.utils.gql import GqlApi
 
 
 def get_clusters(
-    gql_api: Optional[GqlApi] = None,
-    name: Optional[str] = None,
+    gql_api: GqlApi | None = None,
+    name: str | None = None,
 ) -> list[ClusterV1]:
     variables = {}
     if name:

reconcile/typed_queries/clusters_minimal.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.clusters_minimal import (
     ClusterV1,
     query,
@@ -9,7 +7,7 @@ from reconcile.utils.gql import GqlApi
 
 
 def get_clusters_minimal(
-    gql_api: Optional[GqlApi] = None, name: Optional[str] = None
+    gql_api: GqlApi | None = None, name: str | None = None
 ) -> list[ClusterV1]:
     variables = {}
     if name:

reconcile/typed_queries/clusters_with_dms.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.clusters_with_dms import (
     ClusterV1,
     query,
@@ -9,7 +7,7 @@ from reconcile.utils.gql import GqlApi
 
 
 def get_clusters_with_dms(
-    gql_api: Optional[GqlApi] = None,
+    gql_api: GqlApi | None = None,
 ) -> list[ClusterV1]:
     # get the clusters containing the filed enableDeadMansSnitch
     variable = {"filter": {"enableDeadMansSnitch": {"ne": None}}}

reconcile/typed_queries/external_resources.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.external_resources.external_resources_modules import (
     ExternalResourcesModuleV1,
@@ -22,7 +21,7 @@ from reconcile.gql_definitions.external_resources.external_resources_settings im
 from reconcile.utils import gql
 
 
-def get_namespaces(query_func: Optional[Callable] = None) -> list[NamespaceV1]:
+def get_namespaces(query_func: Callable | None = None) -> list[NamespaceV1]:
     if not query_func:
         query_func = gql.get_api().query
     data = query_namespaces(query_func=query_func)
@@ -30,7 +29,7 @@ def get_namespaces(query_func: Optional[Callable] = None) -> list[NamespaceV1]:
 
 
 def get_settings(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[ExternalResourcesSettingsV1]:
     if not query_func:
         query_func = gql.get_api().query
@@ -39,7 +38,7 @@ def get_settings(
 
 
 def get_modules(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[ExternalResourcesModuleV1]:
     if not query_func:
         query_func = gql.get_api().query

reconcile/typed_queries/pagerduty_instances.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.common.pagerduty_instances import (
     PagerDutyInstanceV1,
@@ -9,7 +8,7 @@ from reconcile.utils import gql
 
 
 def get_pagerduty_instances(
-    query_func: Optional[Callable],
+    query_func: Callable | None,
 ) -> list[PagerDutyInstanceV1]:
     """Return all pagerduty instances from app-interface."""
     if not query_func:

reconcile/typed_queries/repos.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.common.app_code_component_repos import (
     AppCodeComponentsV1,
@@ -10,7 +9,7 @@ from reconcile.utils import gql
 
 def get_code_components(
     server: str = "",
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[AppCodeComponentsV1]:
     if not query_func:
         query_func = gql.get_api().query
@@ -24,7 +23,7 @@ def get_code_components(
 
 def get_repos(
     server: str = "",
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[str]:
     code_components = get_code_components(server=server, query_func=query_func)
     return [c.url for c in code_components]

reconcile/typed_queries/reserved_networks.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.common.reserved_networks import (
     NetworkV1,
     query,
@@ -8,7 +6,7 @@ from reconcile.utils import gql
 from reconcile.utils.gql import GqlApi
 
 
-def get_networks(gql_api: Optional[GqlApi] = None) -> list[NetworkV1]:
+def get_networks(gql_api: GqlApi | None = None) -> list[NetworkV1]:
     api = gql_api if gql_api else gql.get_api()
     data = query(query_func=api.query)
     return list(data.networks or [])

reconcile/typed_queries/saas_files.py

@@ -2,11 +2,7 @@ import hashlib
 import json
 from collections.abc import Callable
 from threading import Lock
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 
 from jsonpath_ng.exceptions import JsonPathParserError
 from pydantic import (
@@ -55,24 +51,22 @@ from reconcile.utils.jsonpath import parse_jsonpath
 
 
 class SaasResourceTemplateTarget(ConfiguredBaseModel):
-    path: Optional[str] = Field(..., alias="path")
-    name: Optional[str] = Field(..., alias="name")
+    path: str | None = Field(..., alias="path")
+    name: str | None = Field(..., alias="name")
     # the namespace must be required to fulfill the saas file schema (utils.saasherder.interface.SaasFile)
     namespace: SaasTargetNamespace = Field(..., alias="namespace")
     ref: str = Field(..., alias="ref")
-    promotion: Optional[SaasResourceTemplateTargetPromotionV1] = Field(
+    promotion: SaasResourceTemplateTargetPromotionV1 | None = Field(
         ..., alias="promotion"
     )
-    parameters: Optional[Json] = Field(..., alias="parameters")
-    secret_parameters: Optional[
-        list[SaasResourceTemplateTargetV2_SaasSecretParametersV1]
-    ] = Field(..., alias="secretParameters")
-    upstream: Optional[SaasResourceTemplateTargetUpstreamV1] = Field(
-        ..., alias="upstream"
-    )
-    image: Optional[SaasResourceTemplateTargetImageV1] = Field(..., alias="image")
-    disable: Optional[bool] = Field(..., alias="disable")
-    delete: Optional[bool] = Field(..., alias="delete")
+    parameters: Json | None = Field(..., alias="parameters")
+    secret_parameters: (
+        list[SaasResourceTemplateTargetV2_SaasSecretParametersV1] | None
+    ) = Field(..., alias="secretParameters")
+    upstream: SaasResourceTemplateTargetUpstreamV1 | None = Field(..., alias="upstream")
+    image: SaasResourceTemplateTargetImageV1 | None = Field(..., alias="image")
+    disable: bool | None = Field(..., alias="disable")
+    delete: bool | None = Field(..., alias="delete")
 
     def uid(
         self, parent_saas_file_name: str, parent_resource_template_name: str
@@ -92,10 +86,10 @@ class SaasResourceTemplate(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     url: str = Field(..., alias="url")
     path: str = Field(..., alias="path")
-    provider: Optional[str] = Field(..., alias="provider")
-    hash_length: Optional[int] = Field(..., alias="hash_length")
-    parameters: Optional[Json] = Field(..., alias="parameters")
-    secret_parameters: Optional[list[SaasResourceTemplateV2_SaasSecretParametersV1]] = (
+    provider: str | None = Field(..., alias="provider")
+    hash_length: int | None = Field(..., alias="hash_length")
+    parameters: Json | None = Field(..., alias="parameters")
+    secret_parameters: list[SaasResourceTemplateV2_SaasSecretParametersV1] | None = (
         Field(..., alias="secretParameters")
     )
     targets: list[SaasResourceTemplateTarget] = Field(..., alias="targets")
@@ -104,53 +98,49 @@ class SaasResourceTemplate(ConfiguredBaseModel):
 class SaasFile(ConfiguredBaseModel):
     path: str = Field(..., alias="path")
     name: str = Field(..., alias="name")
-    labels: Optional[Json] = Field(..., alias="labels")
+    labels: Json | None = Field(..., alias="labels")
     app: AppV1 = Field(..., alias="app")
-    pipelines_provider: Union[PipelinesProviderTektonV1, PipelinesProviderV1] = Field(
+    pipelines_provider: PipelinesProviderTektonV1 | PipelinesProviderV1 = Field(
         ..., alias="pipelinesProvider"
     )
-    deploy_resources: Optional[DeployResourcesV1] = Field(..., alias="deployResources")
-    slack: Optional[SlackOutputV1] = Field(..., alias="slack")
+    deploy_resources: DeployResourcesV1 | None = Field(..., alias="deployResources")
+    slack: SlackOutputV1 | None = Field(..., alias="slack")
     managed_resource_types: list[str] = Field(..., alias="managedResourceTypes")
-    takeover: Optional[bool] = Field(..., alias="takeover")
-    deprecated: Optional[bool] = Field(..., alias="deprecated")
-    compare: Optional[bool] = Field(..., alias="compare")
-    timeout: Optional[str] = Field(..., alias="timeout")
-    skip_successful_deploy_notifications: Optional[bool] = Field(
+    takeover: bool | None = Field(..., alias="takeover")
+    deprecated: bool | None = Field(..., alias="deprecated")
+    compare: bool | None = Field(..., alias="compare")
+    timeout: str | None = Field(..., alias="timeout")
+    skip_successful_deploy_notifications: bool | None = Field(
         ..., alias="skipSuccessfulDeployNotifications"
     )
-    publish_job_logs: Optional[bool] = Field(..., alias="publishJobLogs")
-    cluster_admin: Optional[bool] = Field(..., alias="clusterAdmin")
+    publish_job_logs: bool | None = Field(..., alias="publishJobLogs")
+    cluster_admin: bool | None = Field(..., alias="clusterAdmin")
     image_patterns: list[str] = Field(..., alias="imagePatterns")
-    allowed_secret_parameter_paths: Optional[list[str]] = Field(
+    allowed_secret_parameter_paths: list[str] | None = Field(
         ..., alias="allowedSecretParameterPaths"
     )
-    use_channel_in_image_tag: Optional[bool] = Field(
-        ..., alias="use_channel_in_image_tag"
-    )
-    authentication: Optional[SaasFileAuthenticationV1] = Field(
-        ..., alias="authentication"
-    )
-    parameters: Optional[Json] = Field(..., alias="parameters")
-    secret_parameters: Optional[list[SaasSecretParametersV1]] = Field(
+    use_channel_in_image_tag: bool | None = Field(..., alias="use_channel_in_image_tag")
+    authentication: SaasFileAuthenticationV1 | None = Field(..., alias="authentication")
+    parameters: Json | None = Field(..., alias="parameters")
+    secret_parameters: list[SaasSecretParametersV1] | None = Field(
         ..., alias="secretParameters"
     )
-    validate_targets_in_app: Optional[bool] = Field(..., alias="validateTargetsInApp")
-    managed_resource_names: Optional[list[ManagedResourceNamesV1]] = Field(
+    validate_targets_in_app: bool | None = Field(..., alias="validateTargetsInApp")
+    managed_resource_names: list[ManagedResourceNamesV1] | None = Field(
         ..., alias="managedResourceNames"
     )
     resource_templates: list[SaasResourceTemplate] = Field(
         ..., alias="resourceTemplates"
     )
-    self_service_roles: Optional[list[RoleV1]] = Field(..., alias="selfServiceRoles")
+    self_service_roles: list[RoleV1] | None = Field(..., alias="selfServiceRoles")
 
 
 class SaasFileList:
     def __init__(
         self,
-        name: Optional[str] = None,
-        query_func: Optional[Callable] = None,
-        namespaces: Optional[list[SaasTargetNamespace]] = None,
+        name: str | None = None,
+        query_func: Callable | None = None,
+        namespaces: list[SaasTargetNamespace] | None = None,
     ) -> None:
         # query_func and namespaces are optional args mostly used in tests
         if not query_func:
@@ -170,7 +160,7 @@ class SaasFileList:
         self.saas_files = self._resolve_namespace_selectors()
 
     def _init_caches(self) -> None:
-        self._namespaces_as_dict_cache: Optional[dict[str, list[Any]]] = None
+        self._namespaces_as_dict_cache: dict[str, list[Any]] | None = None
         self._namespaces_as_dict_lock = Lock()
         self._matching_namespaces_cache: dict[str, Any] = {}
         self._matching_namespaces_lock = Lock()
@@ -272,9 +262,9 @@ class SaasFileList:
 
     def where(
         self,
-        name: Optional[str] = None,
-        env_name: Optional[str] = None,
-        app_name: Optional[str] = None,
+        name: str | None = None,
+        env_name: str | None = None,
+        app_name: str | None = None,
     ) -> list[SaasFile]:
         if name is None and env_name is None and app_name is None:
             return self.saas_files
@@ -325,12 +315,12 @@ def export_model(model: BaseModel) -> dict[str, Any]:
 
 
 def get_saas_files(
-    name: Optional[str] = None,
-    env_name: Optional[str] = None,
-    app_name: Optional[str] = None,
-    query_func: Optional[Callable] = None,
-    namespaces: Optional[list[SaasTargetNamespace]] = None,
-    saas_file_list: Optional[SaasFileList] = None,
+    name: str | None = None,
+    env_name: str | None = None,
+    app_name: str | None = None,
+    query_func: Callable | None = None,
+    namespaces: list[SaasTargetNamespace] | None = None,
+    saas_file_list: SaasFileList | None = None,
 ) -> list[SaasFile]:
     if not saas_file_list:
         saas_file_list = SaasFileList(
@@ -340,7 +330,7 @@ def get_saas_files(
 
 
 def get_saasherder_settings(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> AppInterfaceSettingsV1:
     if not query_func:
         query_func = gql.get_api().query

reconcile/typed_queries/slo_documents.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.slo_documents.slo_documents import (
     SLODocumentV1,
     query,
@@ -8,7 +6,7 @@ from reconcile.utils import gql
 from reconcile.utils.gql import GqlApi
 
 
-def get_slo_documents(gql_api: Optional[GqlApi] = None) -> list[SLODocumentV1]:
+def get_slo_documents(gql_api: GqlApi | None = None) -> list[SLODocumentV1]:
     api = gql_api if gql_api else gql.get_api()
     data = query(query_func=api.query)
     return data.slo_document_v1 or []

reconcile/typed_queries/status_board.py

@@ -1,9 +1,5 @@
-from typing import (
-    Any,
-    Callable,
-    Iterable,
-    Optional,
-)
+from collections.abc import Callable, Iterable
+from typing import Any
 
 from jsonpath_ng.ext import parser
 
@@ -16,7 +12,7 @@ from reconcile.utils import gql
 
 
 def get_status_board(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[StatusBoardV1]:
     if not query_func:
         query_func = gql.get_api().query

reconcile/typed_queries/tekton_pipeline_providers.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.common.pipeline_providers import (
     PipelinesProviderTektonV1,
@@ -9,7 +8,7 @@ from reconcile.utils import gql
 
 
 def get_tekton_pipeline_providers(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[PipelinesProviderTektonV1]:
     if not query_func:
         query_func = gql.get_api().query

reconcile/typed_queries/terraform_namespaces.py

@@ -1,5 +1,4 @@
 from collections.abc import Callable
-from typing import Optional
 
 from reconcile.gql_definitions.terraform_resources.terraform_resources_namespaces import (
     NamespaceV1,
@@ -8,7 +7,7 @@ from reconcile.gql_definitions.terraform_resources.terraform_resources_namespace
 from reconcile.utils import gql
 
 
-def get_namespaces(query_func: Optional[Callable] = None) -> list[NamespaceV1]:
+def get_namespaces(query_func: Callable | None = None) -> list[NamespaceV1]:
     if not query_func:
         query_func = gql.get_api().query
     data = query(query_func=query_func)

reconcile/typed_queries/terraform_tgw_attachments/aws_accounts.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from reconcile.gql_definitions.terraform_tgw_attachments.aws_accounts import (
     AWSAccountV1,
     query,
@@ -9,7 +7,7 @@ from reconcile.utils.gql import GqlApi
 
 def get_aws_accounts(
     gql_api: GqlApi,
-    name: Optional[str] = None,
+    name: str | None = None,
 ) -> list[AWSAccountV1]:
     variables = {
         "name": name,

reconcile/utils/acs/base.py

@@ -2,7 +2,6 @@ import logging
 from collections.abc import Callable
 from typing import (
     Any,
-    Optional,
     Self,
 )
 
@@ -55,7 +54,7 @@ class AcsBaseApi(BaseModel):
                 )
 
     def generic_request(
-        self, path: str, verb: str, json: Optional[Any] = None
+        self, path: str, verb: str, json: Any | None = None
     ) -> requests.Response:
         url = f"{self.url}{path}"
         headers = {
@@ -77,6 +76,6 @@ class AcsBaseApi(BaseModel):
         return response
 
     def generic_request_json(
-        self, path: str, verb: str, json: Optional[Any] = None
+        self, path: str, verb: str, json: Any | None = None
     ) -> Any:
         return self.generic_request(path, verb, json=json).json()

reconcile/utils/acs/notifiers.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -35,9 +35,9 @@ class JiraNotifier(BaseModel):
     name: str
     board: str
     url: str
-    issue_type: Optional[str]
+    issue_type: str | None
     severity_priority_mappings: list[SeverityPriorityMapping]
-    custom_fields: Optional[dict[str, Any]]
+    custom_fields: dict[str, Any] | None
 
     @staticmethod
     def from_api(notifier: dict[str, Any]) -> "JiraNotifier":