qontract-reconcile 0.10.2.dev280__py3-none-any.whl → 0.10.2.dev282__py3-none-any.whl

reconcile/utils/aws_api_typed/service_quotas.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 from pydantic import BaseModel, Field
@@ -6,7 +8,8 @@ if TYPE_CHECKING:
     from mypy_boto3_service_quotas import ServiceQuotasClient
     from mypy_boto3_service_quotas.literals import RequestStatusType
 else:
-    ServiceQuotasClient = RequestStatusType = object
+    # pydantic needs these types to be defined during runtime
+    RequestStatusType = str
 
 
 class AWSRequestedServiceQuotaChange(BaseModel):

reconcile/utils/aws_api_typed/sts.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import datetime
 from typing import TYPE_CHECKING
 
@@ -5,8 +7,6 @@ from pydantic import BaseModel, Field
 
 if TYPE_CHECKING:
     from mypy_boto3_sts import STSClient
-else:
-    STSClient = object
 
 
 class AWSCredentials(BaseModel):

reconcile/utils/aws_api_typed/support.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import TYPE_CHECKING, Literal
 
@@ -5,8 +7,6 @@ from pydantic import BaseModel, Field
 
 if TYPE_CHECKING:
     from mypy_boto3_support import SupportClient
-else:
-    SupportClient = object
 
 
 class AWSCase(BaseModel):

reconcile/utils/dynatrace/client.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from dynatrace import Dynatrace
 from dynatrace.environment_v2.tokens_api import ApiTokenUpdate
 from pydantic import BaseModel
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class DynatraceTokenCreationError(Exception):
     pass

reconcile/utils/expiration.py

@@ -41,4 +41,4 @@ def filter(roles: DictsOrRoles | None) -> DictsOrRoles:
                 f"{key} field is not formatted as YYYY-MM-DD, currently set as {expiration_date}"
             ) from None
 
-    return cast(DictsOrRoles, filtered)
+    return cast("DictsOrRoles", filtered)

reconcile/utils/external_resource_spec.py

@@ -60,7 +60,7 @@ class GenericSecretOutputFormatConfig(OutputFormatProcessor):
             rendered_data = process_jinja2_template(self.data, dict(vars))
             parsed_data = yaml.safe_load(rendered_data)
             self.validate_k8s_secret_data(parsed_data)
-            return cast(dict[str, str], parsed_data)
+            return cast("dict[str, str]", parsed_data)
         return dict(vars)
 
 
@@ -176,7 +176,9 @@ class ExternalResourceSpec:
 
     def _output_format(self) -> OutputFormat:
         if self.resource.get("output_format") is not None:
-            return OutputFormat(**cast(dict[str, Any], self.resource["output_format"]))
+            return OutputFormat(
+                **cast("dict[str, Any]", self.resource["output_format"])
+            )
         return OutputFormat(provider="generic-secret")
 
 

reconcile/utils/gitlab_api.py

@@ -425,7 +425,7 @@ class GitLabApi:
         merge_request: ProjectMergeRequest,
     ) -> list[str]:
         result = merge_request.changes()
-        changes = cast(dict, result)["changes"]
+        changes = cast("dict", result)["changes"]
         changed_paths = set()
         for change in changes:
             old_path = change["old_path"]
@@ -562,9 +562,9 @@ class GitLabApi:
         manager: ProjectMergeRequestManager | ProjectIssueManager
         match item:
             case ProjectMergeRequest():
-                manager = cast(ProjectMergeRequestManager, item.manager)
+                manager = cast("ProjectMergeRequestManager", item.manager)
             case ProjectIssue():
-                manager = cast(ProjectIssueManager, item.manager)
+                manager = cast("ProjectIssueManager", item.manager)
             case _:
                 raise ValueError("item must be a ProjectMergeRequest or ProjectIssue")
         item_id = item.get_id()
@@ -668,7 +668,7 @@ class GitLabApi:
         :return: list of tree objects
         """
         return cast(
-            list[dict],
+            "list[dict]",
             self.project.repository_tree(
                 ref=ref,
                 recursive=recursive,

reconcile/utils/glitchtip/models.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
 import re
-from collections.abc import MutableMapping
 from datetime import datetime
 from enum import Enum
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from pydantic import (
     BaseModel,
@@ -13,6 +12,9 @@ from pydantic import (
     validator,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import MutableMapping
+
 
 def slugify(value: str) -> str:
     """Convert value into a slug.

reconcile/utils/jira_client.py

@@ -2,11 +2,8 @@ from __future__ import annotations
 
 import functools
 import logging
-from collections.abc import (
-    Iterable,
-    Mapping,
-)
 from typing import (
+    TYPE_CHECKING,
     Any,
     Protocol,
 )
@@ -22,6 +19,9 @@ from pydantic import BaseModel
 
 from reconcile.utils.secret_reader import SecretReader
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
+
 
 class JiraWatcherSettings(Protocol):
     read_timeout: int

reconcile/utils/mr/base.py

@@ -225,7 +225,7 @@ class MergeRequestBase(ABC):
 
     def diffs(self, gitlab_cli: GitLabApi) -> Any:
         return cast(
-            dict,
+            "dict",
             gitlab_cli.project.repository_compare(
                 from_=gitlab_cli.main_branch, to=self.branch
             ),

reconcile/utils/oc_connection_parameters.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import Iterable
 from dataclasses import dataclass
 from typing import (
+    TYPE_CHECKING,
     Protocol,
     runtime_checkable,
 )
@@ -16,6 +16,9 @@ from reconcile.utils.secret_reader import (
     SecretReaderBase,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class OCConnectionError(Exception):
     pass

reconcile/utils/ocm/base.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
 from datetime import datetime
 from enum import Enum, StrEnum
 from typing import (
+    TYPE_CHECKING,
     TypeVar,
 )
 
@@ -15,6 +15,9 @@ from pydantic import (
 from reconcile.utils.aws_helper import get_account_uid_from_arn, get_role_name_from_arn
 from reconcile.utils.semver_helper import parse_semver
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 LabelSetTypeVar = TypeVar("LabelSetTypeVar", bound=BaseModel)
 ACTIVE_SUBSCRIPTION_STATES = {"Active", "Reserved"}
 CAPABILITY_MANAGE_CLUSTER_ADMIN = "capability.cluster.manage_cluster_admin"

reconcile/utils/ocm/ocm.py

@@ -1,16 +1,12 @@
 from __future__ import annotations
 
 import functools
-from collections.abc import Mapping
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from sretoolbox.utils import retry
 
 import reconcile.utils.aws_helper as awsh
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
-from reconcile.ocm.types import (
-    OCMSpec,
-)
 from reconcile.utils.ocm.clusters import get_node_pools
 from reconcile.utils.ocm.products import (
     OCMProduct,
@@ -24,6 +20,11 @@ from reconcile.utils.ocm_base_client import (
 )
 from reconcile.utils.secret_reader import SecretReader
 
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+    from reconcile.ocm.types import OCMSpec
+
 STATUS_READY = "ready"
 STATUS_FAILED = "failed"
 STATUS_DELETING = "deleting"

reconcile/utils/ocm/products.py

@@ -4,8 +4,7 @@ import logging
 import random
 import string
 from abc import abstractmethod
-from collections.abc import Mapping
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel
 
@@ -22,9 +21,13 @@ from reconcile.ocm.types import (
 )
 from reconcile.utils.exceptions import ParameterError
 from reconcile.utils.ocm.clusters import get_provisioning_shard_id
-from reconcile.utils.ocm_base_client import OCMBaseClient
 from reconcile.utils.rosa.rosa_cli import RosaCliError
-from reconcile.utils.rosa.session import RosaSessionBuilder
+
+if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+    from reconcile.utils.ocm_base_client import OCMBaseClient
+    from reconcile.utils.rosa.session import RosaSessionBuilder
 
 CS_API_BASE = "/api/clusters_mgmt"
 

reconcile/utils/saasherder/interfaces.py

@@ -3,14 +3,17 @@ from __future__ import annotations
 
 from collections.abc import Mapping, Sequence, Set
 from typing import (
+    TYPE_CHECKING,
     Any,
     Protocol,
     runtime_checkable,
 )
 
-from reconcile.gql_definitions.fragments.saas_slo_document import SLODocument
 from reconcile.utils import oc_connection_parameters
-from reconcile.utils.secret_reader import HasSecret
+
+if TYPE_CHECKING:
+    from reconcile.gql_definitions.fragments.saas_slo_document import SLODocument
+    from reconcile.utils.secret_reader import HasSecret
 
 
 @runtime_checkable

reconcile/utils/slack_api.py

@@ -2,12 +2,8 @@ from __future__ import annotations
 
 import json
 import logging
-from collections.abc import (
-    Iterable,
-    Mapping,
-    Sequence,
-)
 from typing import (
+    TYPE_CHECKING,
     Any,
     Protocol,
 )
@@ -24,6 +20,9 @@ from slack_sdk.http_retry import (
 
 from reconcile.utils.metrics import slack_request
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping, Sequence
+
 MAX_RETRIES = 5
 TIMEOUT = 30
 

reconcile/utils/state.py

@@ -1,9 +1,10 @@
+from __future__ import annotations
+
 import contextlib
 import json
 import logging
 import os
 from abc import abstractmethod
-from collections.abc import Callable, Generator, Mapping
 from dataclasses import dataclass, field
 from typing import (
     TYPE_CHECKING,
@@ -13,12 +14,6 @@ from typing import (
 
 import boto3
 from botocore.errorfactory import ClientError
-
-if TYPE_CHECKING:
-    from mypy_boto3_s3 import S3Client
-else:
-    S3Client = object
-
 from pydantic import BaseModel
 
 from reconcile.gql_definitions.common.app_interface_state_settings import (
@@ -38,6 +33,11 @@ from reconcile.utils.secret_reader import (
     create_secret_reader,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Generator, Mapping
+
+    from mypy_boto3_s3 import S3Client
+
 
 class StateInaccessibleError(Exception):
     pass
@@ -46,7 +46,7 @@ class StateInaccessibleError(Exception):
 def init_state(
     integration: str,
     secret_reader: SecretReaderBase | None = None,
-) -> "State":
+) -> State:
     if not secret_reader:
         vault_settings = get_app_interface_vault_settings()
         secret_reader = create_secret_reader(use_vault=vault_settings.vault)
@@ -418,7 +418,7 @@ class State:
     @contextlib.contextmanager
     def transaction(
         self, key: str, value: Any = None
-    ) -> Generator["TransactionStateObj", None, None]:
+    ) -> Generator[TransactionStateObj, None, None]:
         """Get a context manager to set the key in the state if no exception occurs.
 
         You can set the value either via the value parameter or by setting the value attribute of the returned object.

reconcile/utils/terraform_client.py

@@ -744,7 +744,7 @@ class TerraformClient:
                 value = allowed_modifications.get(argument)
                 if (
                     value in pending_modified_values
-                    and cast(dict[str, str], pending_modified_values)[value]
+                    and cast("dict[str, str]", pending_modified_values)[value]
                     == after[argument]
                 ):
                     changed_values.append(argument)

reconcile/utils/terrascript_aws_client.py

@@ -1092,7 +1092,7 @@ class TerrascriptClient:
             )
             if records_from_vault:
                 allowed_vault_secret_paths = (
-                    cast(set[str], zone.get("allowed_vault_secret_paths")) or set()
+                    cast("set[str]", zone.get("allowed_vault_secret_paths")) or set()
                 )
                 vault_values: list[str] = []
                 for rec in records_from_vault:
@@ -5754,7 +5754,7 @@ class TerrascriptClient:
             tags.update(json.loads(extra_tags))
         # common_values is untyped, so casting is necessary
         region = cast(
-            str, common_values.get("region") or self.default_regions.get(account)
+            "str", common_values.get("region") or self.default_regions.get(account)
         )
 
         template_values = {
@@ -5770,7 +5770,7 @@ class TerrascriptClient:
         }
 
         # common_values is untyped, so casting is necessary
-        image = cast(list[dict[str, Any]], common_values.get("image"))
+        image = cast("list[dict[str, Any]]", common_values.get("image"))
         image_id = self.get_asg_image_id(filters=image, account=account, region=region)
         if not image_id:
             if self._use_previous_image_id(image):

reconcile/utils/vaultsecretref.py

@@ -27,7 +27,7 @@ class VaultSecretRef:
         return secret_content.get(self.field, default)
 
     def _resolve_secret(self) -> dict[str, str]:
-        vault_client = cast(_VaultClient, VaultClient())
+        vault_client = cast("_VaultClient", VaultClient())
         if self.field == VaultSecretRef._ALL_FIELDS:
             return vault_client.read_all(self.__dict__)
         field_value = vault_client.read(self.__dict__)

reconcile/utils/vcs.py

@@ -2,28 +2,32 @@ from __future__ import annotations
 
 import logging
 import re
-from collections.abc import Iterable
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
-from typing import Literal
+from typing import TYPE_CHECKING, Literal
 from urllib.parse import urlparse
 
 from gitlab.const import PipelineStatus
-from gitlab.v4.objects import ProjectMergeRequest
 
-from reconcile.typed_queries.github_orgs import GithubOrgV1
-from reconcile.typed_queries.gitlab_instances import GitlabInstanceV1
 from reconcile.utils.github_api import GithubRepositoryApi
 from reconcile.utils.gitlab_api import (
     GitLabApi,
     MRState,
 )
-from reconcile.utils.mr.base import MergeRequestBase
-from reconcile.utils.secret_reader import (
-    HasSecret,
-    SecretReaderBase,
-)
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+    from gitlab.v4.objects import ProjectMergeRequest
+
+    from reconcile.typed_queries.github_orgs import GithubOrgV1
+    from reconcile.typed_queries.gitlab_instances import GitlabInstanceV1
+    from reconcile.utils.mr.base import MergeRequestBase
+    from reconcile.utils.secret_reader import (
+        HasSecret,
+        SecretReaderBase,
+    )
 
 GITHUB_BASE_URL = "https://github.com/"
 

reconcile/vault_replication.py

@@ -294,7 +294,7 @@ def get_vault_credentials(
     """Returns a dictionary with the credentials used to authenticate with Vault,
     retrieved from the values present on AppInterface and comming from Vault itself."""
     vault_creds = {}
-    vault = cast(_VaultClient, VaultClient())
+    vault = cast("_VaultClient", VaultClient())
 
     if not isinstance(
         vault_auth,

reconcile/vpc_peerings_validator.py

@@ -112,8 +112,7 @@ def validate_no_internal_to_public_peerings(
             }:
                 continue
             connection = cast(
-                ClusterPeeringConnectionClusterAccepterV1
-                | ClusterPeeringConnectionClusterRequesterV1,
+                "ClusterPeeringConnectionClusterAccepterV1 | ClusterPeeringConnectionClusterRequesterV1",
                 connection,
             )
             peer = connection.cluster
@@ -153,8 +152,7 @@ def validate_no_public_to_public_peerings(
             }:
                 continue
             connection = cast(
-                ClusterPeeringConnectionClusterAccepterV1
-                | ClusterPeeringConnectionClusterRequesterV1,
+                "ClusterPeeringConnectionClusterAccepterV1 | ClusterPeeringConnectionClusterRequesterV1",
                 connection,
             )
             peer = connection.cluster

tools/app_interface_reporter.py

@@ -29,7 +29,6 @@ from reconcile.cli import (
 )
 from reconcile.jenkins_job_builder import init_jjb
 from reconcile.utils.constants import DEFAULT_THREAD_POOL_SIZE
-from reconcile.utils.jjb_client import JJB
 from reconcile.utils.mr import CreateAppInterfaceReporter
 from reconcile.utils.runtime.environment import init_env
 from reconcile.utils.secret_reader import SecretReader
@@ -188,7 +187,7 @@ def get_apps_data(
     secret_reader = SecretReader(settings)
 
     apps = queries.get_apps()
-    jjb: JJB = init_jjb(secret_reader)
+    jjb = init_jjb(secret_reader)
     jenkins_map = jenkins_base.get_jenkins_map()
     time_limit = date - relativedelta(months=month_delta)
     timestamp_limit = int(time_limit.replace(tzinfo=UTC).timestamp())

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:
@@ -1489,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:
     """