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

tools/cli_commands/erv2.py

@@ -3,13 +3,11 @@ from __future__ import annotations
 import json
 import os
 import sys
-from collections.abc import Iterator
 from contextlib import contextmanager, suppress
 from difflib import get_close_matches
 from enum import Enum
-from pathlib import Path
 from subprocess import CalledProcessError, run
-from typing import Any, Protocol
+from typing import TYPE_CHECKING, Any, Protocol
 
 from pydantic import BaseModel
 from rich import print as rich_print
@@ -37,7 +35,12 @@ from reconcile.typed_queries.external_resources import (
 )
 from reconcile.utils import gql
 from reconcile.utils.exceptions import FetchResourceError
-from reconcile.utils.secret_reader import SecretReaderBase
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+    from pathlib import Path
+
+    from reconcile.utils.secret_reader import SecretReaderBase
 
 UP = "\x1b[1A"
 CLEAR = "\x1b[2K"

tools/cli_commands/gpg_encrypt.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import json
-from collections.abc import Mapping
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 from reconcile import queries
 from reconcile.utils import (
@@ -12,6 +12,9 @@ from reconcile.utils import (
 from reconcile.utils.oc import OC_Map
 from reconcile.utils.secret_reader import SecretReader
 
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
 
 @dataclass
 class GPGEncryptCommandData:

tools/qontract_cli.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # ruff: noqa: PLC0415 - `import` should be at the top-level of a file
 
+from __future__ import annotations
+
 import base64
 import json
 import logging
@@ -10,7 +12,6 @@ import sys
 import tempfile
 import textwrap
 from collections import defaultdict
-from collections.abc import Callable, Iterable, Mapping
 from datetime import (
     UTC,
     datetime,
@@ -83,7 +84,6 @@ from reconcile.gql_definitions.common.app_interface_vault_settings import (
     AppInterfaceSettingsV1,
 )
 from reconcile.gql_definitions.common.clusters import ClusterSpecROSAV1
-from reconcile.gql_definitions.fragments.aus_organization import AUSOCMOrganization
 from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
     query as glitchtip_instance_query,
 )
@@ -129,7 +129,6 @@ from reconcile.utils.early_exit_cache import (
     EarlyExitCache,
 )
 from reconcile.utils.environ import environ
-from reconcile.utils.external_resource_spec import ExternalResourceSpec
 from reconcile.utils.external_resources import (
     PROVIDER_AWS,
     get_external_resource_specs,
@@ -141,9 +140,7 @@ from reconcile.utils.gitlab_api import (
     MRStatus,
 )
 from reconcile.utils.glitchtip.client import GlitchtipClient
-from reconcile.utils.glitchtip.models import Project, ProjectStatistics
 from reconcile.utils.gql import GqlApiSingleton
-from reconcile.utils.jjb_client import JJB
 from reconcile.utils.keycloak import (
     KeycloakAPI,
     SSOClient,
@@ -197,9 +194,14 @@ from tools.sre_checkpoints import (
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Iterable, Mapping
+
     from mypy_boto3_s3.type_defs import CopySourceTypeDef
-else:
-    CopySourceTypeDef = object
+
+    from reconcile.gql_definitions.fragments.aus_organization import AUSOCMOrganization
+    from reconcile.utils.external_resource_spec import ExternalResourceSpec
+    from reconcile.utils.glitchtip.models import Project, ProjectStatistics
+    from reconcile.utils.jjb_client import JJB
 
 
 def output(function: Callable) -> Callable:
@@ -1031,6 +1033,9 @@ def clusters_network(ctx: click.Context, name: str) -> None:
                 ocm_map.get(cluster_name),
                 provided_assume_role=None,
             )
+            assert account is not None, (
+                f"Failed to build assume role for cluster {cluster_name} in account {management_account['name']}"
+            )
             account["resourcesDefaultRegion"] = management_account[
                 "resourcesDefaultRegion"
             ]
@@ -1486,7 +1491,7 @@ def copy_tfstate(
         session = aws.get_session(account["name"])
         s3_client = aws.get_session_client(session, "s3", region)
         copy_source = cast(
-            CopySourceTypeDef,
+            "CopySourceTypeDef",
             {
                 "Bucket": source_bucket,
                 "Key": source_object_path,

tools/saas_metrics_exporter/commit_distance/channel.py

@@ -1,10 +1,13 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
-from reconcile.typed_queries.saas_files import SaasFile
-from reconcile.utils.secret_reader import HasSecret
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+    from reconcile.typed_queries.saas_files import SaasFile
+    from reconcile.utils.secret_reader import HasSecret
 
 
 @dataclass

tools/saas_metrics_exporter/main.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 import click
 
@@ -25,6 +25,9 @@ from tools.saas_metrics_exporter.commit_distance.commit_distance import (
     CommitDistanceFetcher,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 
 class SaasMetricsExporter:
     """

tools/saas_promotion_state/saas_promotion_state.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from reconcile.openshift_saas_deploy import (
     QONTRACT_INTEGRATION as OPENSHIFT_SAAS_DEPLOY,
@@ -13,6 +13,9 @@ from reconcile.utils.promotion_state import PromotionData, PromotionState
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.state import init_state
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class SaasPromotionStateError(Exception):
     pass