qontract-reconcile 0.10.2.dev279__py3-none-any.whl → 0.10.2.dev281__py3-none-any.whl

reconcile/aws_cloudwatch_log_retention/integration.py

@@ -1,13 +1,12 @@
+from __future__ import annotations
+
 import logging
 import re
 import typing
 from collections import defaultdict
-from collections.abc import Iterable
 from datetime import UTC, datetime, timedelta
 from enum import Enum
-from typing import (
-    TYPE_CHECKING,
-)
+from typing import TYPE_CHECKING
 
 from botocore.exceptions import ClientError
 from pydantic import BaseModel
@@ -24,9 +23,10 @@ from reconcile.utils import gql
 from reconcile.utils.aws_api import AWSApi
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from mypy_boto3_logs.type_defs import LogGroupTypeDef
-else:
-    LogGroupTypeDef = object
+
 
 QONTRACT_INTEGRATION = "aws_cloudwatch_log_retention"
 MANAGED_BY_INTEGRATION_KEY = "managed_by_integration"

reconcile/database_access_manager.py

@@ -708,7 +708,7 @@ class DatabaseAccessManagerIntegration(QontractReconcileIntegration):
 
     def run(self, dry_run: bool) -> None:
         settings = queries.get_app_interface_settings()
-        vault_client = cast(_VaultClient, VaultClient())
+        vault_client = cast("_VaultClient", VaultClient())
 
         state = init_state(
             integration=QONTRACT_INTEGRATION, secret_reader=self.secret_reader

reconcile/deadmanssnitch.py

@@ -51,7 +51,7 @@ class DeadMansSnitchIntegration(QontractReconcileIntegration[NoParams]):
         super().__init__(NoParams())
         self.qontract_integration_version = make_semver(0, 1, 0)
         self.settings = get_deadmanssnitch_settings()
-        self.vault_client = cast(_VaultClient, VaultClient())
+        self.vault_client = cast("_VaultClient", VaultClient())
 
     @staticmethod
     def get_snitch_name(cluster: ClusterV1) -> str:

reconcile/dynatrace_token_provider/ocm.py

@@ -1,19 +1,13 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
-from datetime import timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel
 
-from reconcile.utils.ocm.base import (
-    OCMClusterServiceLogCreateModel,
-)
 from reconcile.utils.ocm.clusters import (
     ClusterDetails,
     discover_clusters_by_labels,
 )
-from reconcile.utils.ocm.labels import Filter
 from reconcile.utils.ocm.manifests import (
     create_manifest,
     get_manifest,
@@ -25,9 +19,14 @@ from reconcile.utils.ocm.syncsets import (
     get_syncset,
     patch_syncset,
 )
-from reconcile.utils.ocm_base_client import (
-    OCMBaseClient,
-)
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+    from datetime import timedelta
+
+    from reconcile.utils.ocm.base import OCMClusterServiceLogCreateModel
+    from reconcile.utils.ocm.labels import Filter
+    from reconcile.utils.ocm_base_client import OCMBaseClient
 
 """
 Thin abstractions of reconcile.ocm module to reduce coupling.
@@ -40,7 +39,7 @@ class OCMCluster(BaseModel):
     organization_id: str
     subscription_id: str
     is_hcp: bool
-    labels: Mapping[str, str]
+    labels: dict[str, str]
 
     @staticmethod
     def from_cluster_details(cluster: ClusterDetails) -> OCMCluster | None:

reconcile/external_resources/aws.py

@@ -189,7 +189,7 @@ class AWSRdsFactory(AWSDefaultResourceFactory):
         if "availability_zone" in data and "region" not in data:
             data["region"] = self._get_region_from_az(data["availability_zone"])
 
-        kms_key_id: str = data.get("kms_key_id", None)
+        kms_key_id: str | None = data.get("kms_key_id")
         if kms_key_id and not kms_key_id.startswith("arn:"):
             data["kms_key_id"] = self._get_kms_key_spec(
                 spec.provisioner_name, kms_key_id

reconcile/external_resources/model.py

@@ -186,8 +186,8 @@ class ExternalResourcesInventory(MutableMapping):
 
 
 class Action(StrEnum):
-    DESTROY: str = "Destroy"
-    APPLY: str = "Apply"
+    DESTROY = "Destroy"
+    APPLY = "Apply"
 
 
 class ExternalResourceModuleKey(BaseModel, frozen=True):
@@ -348,15 +348,15 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
 
 
 class ResourceStatus(StrEnum):
-    CREATED: str = "CREATED"
-    DELETED: str = "DELETED"
-    ABANDONED: str = "ABANDONED"
-    NOT_EXISTS: str = "NOT_EXISTS"
-    IN_PROGRESS: str = "IN_PROGRESS"
-    DELETE_IN_PROGRESS: str = "DELETE_IN_PROGRESS"
-    ERROR: str = "ERROR"
-    PENDING_SECRET_SYNC: str = "PENDING_SECRET_SYNC"
-    RECONCILIATION_REQUESTED: str = "RECONCILIATION_REQUESTED"
+    CREATED = "CREATED"
+    DELETED = "DELETED"
+    ABANDONED = "ABANDONED"
+    NOT_EXISTS = "NOT_EXISTS"
+    IN_PROGRESS = "IN_PROGRESS"
+    DELETE_IN_PROGRESS = "DELETE_IN_PROGRESS"
+    ERROR = "ERROR"
+    PENDING_SECRET_SYNC = "PENDING_SECRET_SYNC"
+    RECONCILIATION_REQUESTED = "RECONCILIATION_REQUESTED"
 
     @property
     def does_not_exist(self) -> bool:

reconcile/external_resources/state.py

@@ -25,10 +25,10 @@ class StateNotFoundError(Exception):
 
 
 class ReconcileStatus(StrEnum):
-    SUCCESS: str = "SUCCESS"
-    ERROR: str = "ERROR"
-    IN_PROGRESS: str = "IN_PROGRESS"
-    NOT_EXISTS: str = "NOT_EXISTS"
+    SUCCESS = "SUCCESS"
+    ERROR = "ERROR"
+    IN_PROGRESS = "IN_PROGRESS"
+    NOT_EXISTS = "NOT_EXISTS"
 
 
 class ExternalResourceState(BaseModel):

reconcile/fleet_labeler/dependencies.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
+from typing import TYPE_CHECKING
 
 from reconcile.fleet_labeler.metrics import FleetLabelerMetrics
 from reconcile.fleet_labeler.ocm import OCMClient, OCMClientConfig
 from reconcile.fleet_labeler.vcs import VCS
-from reconcile.gql_definitions.fleet_labeler.fleet_labels import FleetLabelsSpecV1
 from reconcile.typed_queries.app_interface_repo_url import get_app_interface_repo_url
 from reconcile.typed_queries.fleet_labels import get_fleet_label_specs
 from reconcile.typed_queries.github_orgs import get_github_orgs
@@ -13,9 +12,14 @@ from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
 from reconcile.utils.ocm_base_client import (
     init_ocm_base_client,
 )
-from reconcile.utils.secret_reader import SecretReaderBase
 from reconcile.utils.vcs import VCS as VCSBase
 
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+    from reconcile.gql_definitions.fleet_labeler.fleet_labels import FleetLabelsSpecV1
+    from reconcile.utils.secret_reader import SecretReaderBase
+
 
 class Dependencies:
     """

reconcile/fleet_labeler/ocm.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
+from typing import TYPE_CHECKING
 
 from pydantic import BaseModel
 
@@ -15,9 +15,11 @@ from reconcile.utils.ocm.labels import (
     update_label,
 )
 from reconcile.utils.ocm.search_filters import Filter, FilterMode
-from reconcile.utils.ocm_base_client import (
-    OCMBaseClient,
-)
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+    from reconcile.utils.ocm_base_client import OCMBaseClient
 
 """
 Thin abstractions of reconcile.ocm module to reduce coupling.

reconcile/gitlab_housekeeping.py

@@ -343,14 +343,14 @@ def is_good_to_merge(labels: Iterable[str]) -> bool:
 def is_rebased(mr: ProjectMergeRequest, gl: GitLabApi) -> bool:
     target_branch = mr.target_branch
     head = cast(
-        list[ProjectCommit],
+        "list[ProjectCommit]",
         gl.project.commits.list(
             ref_name=target_branch,
             per_page=1,
             page=1,
         ),
     )[0].id
-    result = cast(dict, gl.project.repository_compare(mr.sha, head))
+    result = cast("dict", gl.project.repository_compare(mr.sha, head))
     return len(result["commits"]) == 0
 
 

reconcile/gitlab_permissions.py

@@ -56,7 +56,7 @@ class GroupPermissionHandler:
         # get all projects shared with group
         shared_projects = self.group.shared_projects.list(iterator=True)
         current_state = {
-            project.web_url: self.extract_group_spec(cast(SharedProject, project))
+            project.web_url: self.extract_group_spec(cast("SharedProject", project))
             for project in shared_projects
         }
         self.reconcile(desired_state, current_state)

reconcile/jenkins_webhooks.py

@@ -1,15 +1,19 @@
+from __future__ import annotations
+
 import copy
 import logging
-from collections.abc import Callable, MutableMapping
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from reconcile import queries
 from reconcile.jenkins_job_builder import init_jjb
 from reconcile.utils.defer import defer
 from reconcile.utils.gitlab_api import GitLabApi
-from reconcile.utils.jjb_client import JJB
 from reconcile.utils.secret_reader import SecretReader
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, MutableMapping
+
+
 QONTRACT_INTEGRATION = "jenkins-webhooks"
 
 
@@ -50,7 +54,7 @@ def get_hooks_to_add(
 @defer
 def run(dry_run: bool, defer: Callable | None = None) -> None:
     secret_reader = SecretReader(queries.get_secret_reader_settings())
-    jjb: JJB = init_jjb(secret_reader)
+    jjb = init_jjb(secret_reader)
     gl = get_gitlab_api(secret_reader)
     if defer:
         defer(gl.cleanup)

reconcile/jenkins_worker_fleets.py

@@ -20,8 +20,8 @@ QONTRACT_INTEGRATION = "jenkins-worker-fleets"
 def get_current_state(jenkins: JenkinsApi) -> list[JenkinsWorkerFleet]:
     current_state = []
 
-    jenkins_config = cast(dict[str, Any], jenkins.get_jcasc_config().get("jenkins"))
-    clouds = cast(list[dict[str, Any]], jenkins_config.get("clouds", []))
+    jenkins_config = cast("dict[str, Any]", jenkins.get_jcasc_config().get("jenkins"))
+    clouds = cast("list[dict[str, Any]]", jenkins_config.get("clouds", []))
     for c in clouds:
         # eC2Fleet is defined by jcasc schema
         fleet = c.get("eC2Fleet", None)

reconcile/ocm_internal_notifications/integration.py

@@ -1,15 +1,12 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import (
-    Callable,
-)
 from functools import lru_cache
+from typing import TYPE_CHECKING
 
 from reconcile.gql_definitions.common.ocm_environments import (
     query as ocm_environment_query,
 )
-from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.slack_base import slackapi_from_queries
 from reconcile.typed_queries.app_interface_custom_messages import (
     get_app_interface_custom_message,
@@ -25,6 +22,11 @@ from reconcile.utils.runtime.integration import (
 )
 from reconcile.utils.slack_api import UserNotFoundError
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
+
 QONTRACT_INTEGRATION = "ocm-internal-notifications"
 
 

reconcile/ocm_labels/integration.py

@@ -1,11 +1,7 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import (
-    Callable,
-    Iterable,
-)
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from deepdiff import DeepHash
 from pydantic import validator
@@ -17,7 +13,6 @@ from reconcile.aus.aus_label_source import (
 from reconcile.gql_definitions.common.ocm_environments import (
     query as ocm_environment_query,
 )
-from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.gql_definitions.ocm_labels.clusters import ClusterV1
 from reconcile.gql_definitions.ocm_labels.clusters import query as cluster_query
 from reconcile.gql_definitions.ocm_labels.organizations import OpenShiftClusterManagerV1
@@ -53,7 +48,12 @@ from reconcile.utils.runtime.integration import (
     PydanticRunParams,
     QontractReconcileIntegration,
 )
-from reconcile.utils.secret_reader import SecretReaderBase
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Iterable
+
+    from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
+    from reconcile.utils.secret_reader import SecretReaderBase
 
 QONTRACT_INTEGRATION = "ocm-labels"
 

reconcile/ocm_upgrade_scheduler_org_updater.py

@@ -10,11 +10,9 @@ from reconcile import (
     mr_client_gateway,
     queries,
 )
+from reconcile.ocm.types import OCMSpec
 from reconcile.utils.jinja2.utils import process_jinja2_template
-from reconcile.utils.ocm import (
-    OCMMap,
-    OCMSpec,
-)
+from reconcile.utils.ocm import OCMMap
 
 QONTRACT_INTEGRATION = "ocm-upgrade-scheduler-org-updater"
 

reconcile/openshift_cluster_bots.py

@@ -238,7 +238,7 @@ def create_cluster_bots(
 def update_vault(
     cluster: ClusterV1, config: Config, token: str, admin_token: str | None
 ) -> None:
-    vault = cast(_VaultClient, VaultClient())
+    vault = cast("_VaultClient", VaultClient())
     vault.write(
         {
             "path": vault_secret(cluster, config, cluster_admin=False)["path"],

reconcile/resource_scraper.py

@@ -63,7 +63,7 @@ def run(
             results.append(item)
 
     if not dry_run:
-        vault_client = cast(_VaultClient, VaultClient())
+        vault_client = cast("_VaultClient", VaultClient())
         for item in results:
             secret = {
                 "path": f"{vault_output_path}/{QONTRACT_INTEGRATION}/{item['cluster']}/{namespace_name}/{item['name']}",

reconcile/run_integration.py

@@ -120,7 +120,7 @@ def build_entry_point_args(
     # we add it right before the extra_args
     if (
         integration_name
-        and isinstance(command, click.MultiCommand)
+        and isinstance(command, click.Group)
         and command.get_command(None, integration_name)  # type: ignore
     ):
         args.append(integration_name)

reconcile/saas_auto_promotions_manager/integration.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 from sretoolbox.utils import threaded
 
@@ -16,15 +16,19 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
     Renderer,
 )
 from reconcile.saas_auto_promotions_manager.meta import QONTRACT_INTEGRATION
-from reconcile.saas_auto_promotions_manager.publisher import Publisher
 from reconcile.saas_auto_promotions_manager.s3_exporter import S3Exporter
-from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
 from reconcile.utils.defer import defer
 from reconcile.utils.runtime.integration import (
     PydanticRunParams,
     QontractReconcileIntegration,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from reconcile.saas_auto_promotions_manager.publisher import Publisher
+    from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
+
 
 class SaasAutoPromotionsManagerParams(PydanticRunParams):
     thread_pool_size: int

reconcile/saas_auto_promotions_manager/s3_exporter.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
 from dataclasses import dataclass
 from enum import Enum
+from typing import TYPE_CHECKING
 
-from reconcile.saas_auto_promotions_manager.publisher import Publisher
-from reconcile.utils.state import State
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+    from reconcile.saas_auto_promotions_manager.publisher import Publisher
+    from reconcile.utils.state import State
 
 
 class DeploymentState(Enum):

reconcile/saas_file_validator.py

@@ -14,7 +14,6 @@ from reconcile.typed_queries.saas_files import (
     get_saasherder_settings,
 )
 from reconcile.utils.defer import defer
-from reconcile.utils.jjb_client import JJB
 from reconcile.utils.saasherder import SaasHerder
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
@@ -61,7 +60,7 @@ def run(dry_run: bool, defer: Callable | None = None) -> None:
     ]
     for p in missing_image_patterns:
         logging.error(f"image pattern is missing from quayOrgs: {p}")
-    jjb: JJB = init_jjb(secret_reader)
+    jjb = init_jjb(secret_reader)
     saasherder.validate_upstream_jobs(jjb)
     if not saasherder.valid or missing_repos or missing_image_patterns:
         sys.exit(ExitCodes.ERROR)

reconcile/skupper_network/models.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 
 import hashlib
 import logging
-from collections.abc import Iterable
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel
 
@@ -14,6 +13,9 @@ from reconcile.gql_definitions.skupper_network.skupper_networks import (
     NamespaceV1,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class SkupperCluster(BaseModel):
     name: str

reconcile/statuspage/page.py

@@ -164,7 +164,7 @@ class StatusMaintenance(BaseModel):
 
         statuspage_announcements = [
             StatusMaintenanceAnnouncement.init_from_announcement(
-                cast(MaintenanceStatuspageAnnouncementV1, m)
+                cast("MaintenanceStatuspageAnnouncementV1", m)
             )
             for m in maintenance.announcements or []
             if m.provider == PROVIDER_NAME

reconcile/terraform_cloudflare_resources.py

@@ -272,7 +272,7 @@ def _write_external_resource_secrets_to_vault(
     separate module if we have additional needs for a similar function.
     """
     integration_name = integration_name.replace("_", "-")
-    vault_client = cast(_VaultClient, VaultClient())
+    vault_client = cast("_VaultClient", VaultClient())
     for spec in resource_specs.values():
         # A secret can be empty if the terraform-* integrations are not enabled on the cluster
         # the resource is defined on - lets skip vault writes for those right now and

reconcile/terraform_resources.py

@@ -314,7 +314,7 @@ def write_outputs_to_vault(
     vault_path: str, resource_specs: ExternalResourceSpecInventory
 ) -> None:
     integration_name = QONTRACT_INTEGRATION.replace("_", "-")
-    vault_client = cast(_VaultClient, VaultClient())
+    vault_client = cast("_VaultClient", VaultClient())
     for spec in resource_specs.values():
         # a secret can be empty if the terraform-integration is not enabled on the cluster
         # the resource is defined on - lets skip vault writes for those right now and

reconcile/terraform_tgw_attachments.py

@@ -155,7 +155,7 @@ def _build_desired_state_items(
         for peer_connection in cluster_info.peering.connections:  # type: ignore[union-attr]
             if _is_tgw_peer_connection(peer_connection, account_name):
                 yield from _build_desired_state_tgw_connection(
-                    cast(ClusterPeeringConnectionAccountTGWV1, peer_connection),
+                    cast("ClusterPeeringConnectionAccountTGWV1", peer_connection),
                     cluster_info,
                     ocm,
                     awsapi,
@@ -367,7 +367,7 @@ def _is_tgw_peer_connection(
         return False
     if account_name is None:
         return True
-    tgw_peer_connection = cast(ClusterPeeringConnectionAccountTGWV1, peer_connection)
+    tgw_peer_connection = cast("ClusterPeeringConnectionAccountTGWV1", peer_connection)
     return tgw_peer_connection.account.name == account_name
 
 
@@ -397,7 +397,7 @@ def _filter_tgw_accounts(
         for peer_connection in cluster.peering.connections:  # type: ignore[union-attr]
             if peer_connection.provider == TGW_CONNECTION_PROVIDER:
                 tgw_peer_connection = cast(
-                    ClusterPeeringConnectionAccountTGWV1, peer_connection
+                    "ClusterPeeringConnectionAccountTGWV1", peer_connection
                 )
                 tgw_account_names.add(tgw_peer_connection.account.name)
     return [

reconcile/terraform_users.py

@@ -295,7 +295,7 @@ def run(
     new_users = tf.get_new_users()
 
     if reencrypt_settings:
-        vc = cast(_VaultClient, VaultClient())
+        vc = cast("_VaultClient", VaultClient())
         write_user_to_vault(
             vc, reencrypt_settings.reencrypt_vault_path, new_users, skip_accounts
         )

reconcile/utils/aws_api.py

@@ -1,13 +1,9 @@
+from __future__ import annotations
+
 import logging
 import operator
 import os
 import re
-from collections.abc import (
-    Iterable,
-    Iterator,
-    Mapping,
-    Sequence,
-)
 from functools import lru_cache
 from threading import Lock
 from typing import (
@@ -20,7 +16,6 @@ from typing import (
 )
 
 from boto3 import Session
-from botocore.client import BaseClient
 from botocore.config import Config
 from pydantic import BaseModel
 from sretoolbox.utils import threaded
@@ -30,6 +25,14 @@ import reconcile.utils.lean_terraform_client as terraform
 from reconcile.utils.secret_reader import SecretReader, SecretReaderBase
 
 if TYPE_CHECKING:
+    from collections.abc import (
+        Iterable,
+        Iterator,
+        Mapping,
+        Sequence,
+    )
+
+    from botocore.client import BaseClient
     from mypy_boto3_dynamodb import DynamoDBClient, DynamoDBServiceResource
     from mypy_boto3_ec2 import (
         EC2Client,
@@ -77,27 +80,6 @@ if TYPE_CHECKING:
     from mypy_boto3_support import SupportClient
     from mypy_boto3_support.type_defs import CaseDetailsTypeDef
 
-else:
-    AccessKeyMetadataTypeDef = CaseDetailsTypeDef = CloudWatchLogsClient = (
-        DBInstanceMessageTypeDef
-    ) = DBRecommendationsMessageTypeDef = DynamoDBClient = DynamoDBServiceResource = (
-        EC2Client
-    ) = EC2ServiceResource = ECRClient = ElasticLoadBalancingClient = FilterTypeDef = (
-        HostedZoneTypeDef
-    ) = IAMClient = IAMServiceResource = ImageTypeDef = (
-        LaunchPermissionModificationsTypeDef
-    ) = LogGroupTypeDef = OrganizationsClient = RDSClient = ResourceRecordSetTypeDef = (
-        ResourceRecordTypeDef
-    ) = Route53Client = RouteTableTypeDef = S3Client = S3ServiceResource = SQSClient = (
-        SQSServiceResource
-    ) = STSClient = SubnetTypeDef = SupportClient = TagTypeDef = (
-        TransitGatewayTypeDef
-    ) = TransitGatewayVpcAttachmentTypeDef = UpgradeTargetTypeDef = (
-        VpcEndpointTypeDef
-    ) = VpcTypeDef = NetworkInterfaceTypeDef = LoadBalancerDescriptionTypeDef = (
-        TagDescriptionTypeDef
-    ) = object
-
 
 class InvalidResourceTypeError(Exception):
     pass
@@ -461,7 +443,7 @@ class AWSApi:
         self, account_name: str, region_name: str | None = None
     ) -> S3Client:
         session = self.get_session(account_name)
-        return cast(S3Client, self.get_session_client(session, "s3", region_name))
+        return cast("S3Client", self.get_session_client(session, "s3", region_name))
 
     def init_users(self) -> None:
         self.users = {}
@@ -1452,7 +1434,7 @@ class AWSApi:
     @staticmethod
     def _get_vpc_endpoints(
         filters: Sequence[FilterTypeDef], ec2: EC2Client
-    ) -> list["VpcEndpointTypeDef"]:
+    ) -> list[VpcEndpointTypeDef]:
         atts = ec2.describe_vpc_endpoints(Filters=filters)
         return atts.get("VpcEndpoints", [])
 

reconcile/utils/aws_api_typed/account.py

@@ -1,14 +1,14 @@
+from __future__ import annotations
+
 import logging
 from enum import StrEnum
 from typing import TYPE_CHECKING
 
+from pydantic import BaseModel
+
 if TYPE_CHECKING:
     from mypy_boto3_account import AccountClient
     from mypy_boto3_account.type_defs import AlternateContactTypeDef
-else:
-    AccountClient = AlternateContactTypeDef = object
-
-from pydantic import BaseModel
 
 
 class OptStatus(StrEnum):