qontract-reconcile 0.10.2.dev280__tar.gz → 0.10.2.dev281__tar.gz

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev280
+Version: 0.10.2.dev281
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/pyproject.toml

@@ -157,6 +157,9 @@ src = ["reconcile", "tools"]
 extend-exclude = ["reconcile/gql_definitions"]
 fix = true
 
+[tool.ruff.format]
+preview = true
+
 [tool.ruff.lint]
 preview = true
 
@@ -211,17 +214,16 @@ ignore = [
     "B017",    #`pytest.raises(Exception)` should be considered evil
     "RUF005",  # Consider "...."instead of concatenation
     "RUF012",  # Mutable class attributes should be annotated with "typing.ClassVar"
-    "TC001",   # Type-checking block
-    "TC002",   # Type-checking block
-    "TC003",   # Type-checking block
-    "TC004",   # Type-checking block
-    "TC006",   # quoted type expressions in `typing.cast()`
     # Review later
     "FURB101", # Replace `open` with `pathlib.Path`
     "FURB103", # Replace `open` with `pathlib.Path`
 ]
-[tool.ruff.format]
-preview = true
+
+[tool.ruff.lint.flake8-annotations]
+allow-star-arg-any = true
+
+[tool.ruff.lint.flake8-type-checking]
+runtime-evaluated-base-classes = ["pydantic.BaseModel"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["reconcile", "tools"]

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/reconcile/acs_policies.py

@@ -71,7 +71,7 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
                 [
                     Scope(cluster=cluster_name_to_id[cs.name], namespace="")
                     for cs in cast(
-                        gql_acs_policies.AcsPolicyScopeClusterV1,
+                        "gql_acs_policies.AcsPolicyScopeClusterV1",
                         gql_policy.scope,
                     ).clusters
                 ],
@@ -84,7 +84,7 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
                         cluster=cluster_name_to_id[ns.cluster.name], namespace=ns.name
                     )
                     for ns in cast(
-                        gql_acs_policies.AcsPolicyScopeNamespaceV1,
+                        "gql_acs_policies.AcsPolicyScopeNamespaceV1",
                         gql_policy.scope,
                     ).namespaces
                 ],
@@ -101,7 +101,7 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
         match condition.policy_field:
             case "cvss":
                 cvss_condition = cast(
-                    gql_acs_policies.AcsPolicyConditionsCvssV1, condition
+                    "gql_acs_policies.AcsPolicyConditionsCvssV1", condition
                 )
                 return PolicyCondition(
                     field_name=field_name,
@@ -112,7 +112,7 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
                 )
             case "severity":
                 severity_condition = cast(
-                    gql_acs_policies.AcsPolicyConditionsSeverityV1, condition
+                    "gql_acs_policies.AcsPolicyConditionsSeverityV1", condition
                 )
                 return PolicyCondition(
                     field_name=field_name,
@@ -123,7 +123,7 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
                 )
             case "cve":
                 cve_condition = cast(
-                    gql_acs_policies.AcsPolicyConditionsCveV1, condition
+                    "gql_acs_policies.AcsPolicyConditionsCveV1", condition
                 )
                 return PolicyCondition(
                     field_name=field_name,
@@ -132,7 +132,7 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
                 )
             case "image_tag":
                 image_tag_condition = cast(
-                    gql_acs_policies.AcsPolicyConditionsImageTagV1, condition
+                    "gql_acs_policies.AcsPolicyConditionsImageTagV1", condition
                 )
                 return PolicyCondition(
                     field_name=field_name,
@@ -143,7 +143,7 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
                 )
             case "image_age":
                 image_age_condition = cast(
-                    gql_acs_policies.AcsPolicyConditionsImageAgeV1, condition
+                    "gql_acs_policies.AcsPolicyConditionsImageAgeV1", condition
                 )
                 return PolicyCondition(
                     field_name=field_name,

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/reconcile/aus/base.py

@@ -573,7 +573,7 @@ def fetch_current_state(
     addon_service = init_addon_service(org_upgrade_spec.org.environment)
     for spec in org_upgrade_spec.specs:
         if addons and isinstance(spec, ClusterAddonUpgradeSpec):
-            addon_spec = cast(ClusterAddonUpgradeSpec, spec)
+            addon_spec = cast("ClusterAddonUpgradeSpec", spec)
             addon_upgrade_policies = addon_service.get_addon_upgrade_policies(
                 ocm_api, spec.cluster.id, addon_id=addon_spec.addon.addon.id
             )

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/reconcile/aus/models.py

@@ -2,11 +2,7 @@ from __future__ import annotations
 
 import logging
 import re
-from collections.abc import (
-    Iterable,
-    Mapping,
-    Sequence,
-)
+from typing import TYPE_CHECKING
 
 from pydantic import (
     BaseModel,
@@ -21,6 +17,9 @@ from reconcile.utils.ocm.addons import OCMAddonInstallation
 from reconcile.utils.ocm.clusters import OCMCluster
 from reconcile.utils.semver_helper import parse_semver
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping, Sequence
+
 
 class NodePoolSpec(BaseModel):
     id: str

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/reconcile/aus/version_gate_approver.py

@@ -1,5 +1,6 @@
 import logging
 from collections.abc import Callable, Iterable
+from typing import TYPE_CHECKING
 
 from reconcile.aus.advanced_upgrade_service import aus_label_key
 from reconcile.aus.base import gates_to_agree, get_orgs_for_environment
@@ -8,7 +9,6 @@ from reconcile.aus.version_gates import (
     ocp_gate_handler,
     sts_version_gate_handler,
 )
-from reconcile.aus.version_gates.handler import GateHandler
 from reconcile.gql_definitions.common.ocm_environments import (
     query as ocm_environment_query,
 )
@@ -41,6 +41,9 @@ from reconcile.utils.runtime.integration import (
 )
 from reconcile.utils.semver_helper import make_semver
 
+if TYPE_CHECKING:
+    from reconcile.aus.version_gates.handler import GateHandler
+
 QONTRACT_INTEGRATION = "version-gate-approver"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/reconcile/aws_account_manager/merge_request_manager.py

@@ -1,14 +1,16 @@
 import logging
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 from gitlab.exceptions import GitlabGetError
-from gitlab.v4.objects import ProjectMergeRequest
 
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.mr.base import MergeRequestBase
 from reconcile.utils.mr.labels import AUTO_MERGE
 from reconcile.utils.vcs import VCS
 
+if TYPE_CHECKING:
+    from gitlab.v4.objects import ProjectMergeRequest
+
 AWS_MGR = "aws-account-manager"
 
 
@@ -66,7 +68,7 @@ class MergeRequestManager:
         return any(
             aws_account_file_path == diff["new_path"]
             for mr in self._open_mrs
-            for diff in cast(dict, mr.changes())["changes"]
+            for diff in cast("dict", mr.changes())["changes"]
         )
 
     def fetch_open_merge_requests(self) -> None:

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/reconcile/aws_ami_cleanup/integration.py

@@ -1,16 +1,13 @@
+from __future__ import annotations
+
 import logging
 import re
 from collections import defaultdict
-from collections.abc import (
-    Callable,
-)
 from datetime import (
     datetime,
     timedelta,
 )
-from typing import (
-    TYPE_CHECKING,
-)
+from typing import TYPE_CHECKING
 
 from botocore.exceptions import ClientError
 from pydantic import (
@@ -34,9 +31,9 @@ from reconcile.utils.parse_dhms_duration import dhms_to_seconds
 from reconcile.utils.secret_reader import create_secret_reader
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from mypy_boto3_ec2 import EC2Client
-else:
-    EC2Client = object
 
 QONTRACT_INTEGRATION = "aws_ami_cleanup"
 MANAGED_TAG = {"Key": "managed_by_integration", "Value": QONTRACT_INTEGRATION}

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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"

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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:

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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:

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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:
     """

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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.

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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
 
 

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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)

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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)

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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)

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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"
 
 

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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"
 

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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"
 

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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"],

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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']}",

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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):

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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)

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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

{qontract_reconcile-0.10.2.dev280 → qontract_reconcile-0.10.2.dev281}/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