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

reconcile/dashdotdb_base.py

@@ -3,10 +3,7 @@ import os
 from base64 import b64encode
 from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 from urllib.parse import urljoin
 
 import requests
@@ -23,8 +20,8 @@ LOG = logging.getLogger(__name__)
 class DashdotDBSecret:
     path: str
     field: str
-    q_format: Optional[str]
-    version: Optional[int]
+    q_format: str | None
+    version: int | None
 
 
 DASHDOTDB_SECRET = DashdotDBSecret(
@@ -53,7 +50,7 @@ class DashdotdbBase:
         self.dashdotdb_pass = self.secret_content["password"]
         self.logmarker = marker
         self.scope = scope
-        self.dashdotdb_token = Optional[str]
+        self.dashdotdb_token: str | None
 
     def _get_token(self) -> None:
         if self.dry_run:
@@ -134,10 +131,10 @@ class DashdotdbBase:
     def _promget(
         self,
         url: str,
-        params: Optional[Mapping[Any, Any]],
-        token: Optional[str] = None,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
+        params: Mapping[Any, Any] | None,
+        token: str | None = None,
+        username: str | None = None,
+        password: str | None = None,
         ssl_verify: bool = True,
         uri: str = "api/v1/query",
     ) -> dict[Any, Any]:

reconcile/dashdotdb_cso.py

@@ -1,7 +1,4 @@
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import requests
 from sretoolbox.utils import threaded
@@ -44,7 +41,7 @@ class DashdotdbCSO(DashdotdbBase):
             secret_reader=secret_reader,
         )
 
-    def _post(self, manifest: dict[Any, Any]) -> Optional[requests.Response]:
+    def _post(self, manifest: dict[Any, Any]) -> requests.Response | None:
         if manifest is None:
             return None
 
@@ -70,7 +67,7 @@ class DashdotdbCSO(DashdotdbBase):
         return response
 
     @staticmethod
-    def _get_imagemanifestvuln(cluster: str, oc_map: OCMap) -> Optional[dict[str, Any]]:
+    def _get_imagemanifestvuln(cluster: str, oc_map: OCMap) -> dict[str, Any] | None:
         LOG.info("%s processing %s", LOGMARKER, cluster)
         oc = oc_map.get(cluster)
         if isinstance(oc, OCLogMsg):

reconcile/dashdotdb_dora.py

@@ -1,17 +1,15 @@
 import functools
 import os
 from collections import defaultdict
+from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
 from datetime import (
+    UTC,
     datetime,
     timedelta,
-    timezone,
 )
 from typing import (
     Any,
-    Iterable,
-    Mapping,
-    Optional,
     Self,
 )
 
@@ -44,8 +42,8 @@ QONTRACT_INTEGRATION = "dashdotdb-dora"
 class DeploymentDBSecret:
     path: str
     field: str
-    q_format: Optional[str]
-    version: Optional[int]
+    q_format: str | None
+    version: int | None
 
 
 @dataclass(eq=True, frozen=True)
@@ -76,9 +74,9 @@ class SaasTarget:
 
 @dataclass(eq=True, frozen=True)
 class RepoChanges:
-    repo_url: Optional[str]
-    ref_from: Optional[str]
-    ref_to: Optional[str]
+    repo_url: str | None
+    ref_from: str | None
+    ref_to: str | None
 
 
 @dataclass(eq=True, frozen=True)
@@ -162,12 +160,10 @@ class Commit:
         finish_timestamp_tzaware = finish_timestamp
 
         if commit_date_tzaware.tzinfo is None:
-            commit_date_tzaware = commit_date_tzaware.replace(tzinfo=timezone.utc)
+            commit_date_tzaware = commit_date_tzaware.replace(tzinfo=UTC)
 
         if finish_timestamp_tzaware.tzinfo is None:
-            finish_timestamp_tzaware = finish_timestamp_tzaware.replace(
-                tzinfo=timezone.utc
-            )
+            finish_timestamp_tzaware = finish_timestamp_tzaware.replace(tzinfo=UTC)
 
         return int((finish_timestamp_tzaware - commit_date_tzaware).total_seconds())
 
@@ -397,7 +393,7 @@ class DashdotdbDORA(DashdotdbBase):
 
     def get_repo_ref_for_sha(
         self, saastarget: SaasTarget, sha: str
-    ) -> tuple[Optional[str], Optional[str]]:
+    ) -> tuple[str | None, str | None]:
         try:
             saas_file_yaml = self.gl_app_interface_get_file(
                 saastarget.path, ref=sha

reconcile/dashdotdb_dvo.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Sequence,
 )
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import requests
 from requests import Response
@@ -67,7 +64,7 @@ class DashdotdbDVO(DashdotdbBase):
         for i in range(0, len(data), int(size)):
             yield data[i : i + int(size)]
 
-    def _post(self, deploymentvalidation: DVOPayload) -> Optional[Response]:
+    def _post(self, deploymentvalidation: DVOPayload) -> Response | None:
         if deploymentvalidation is None:
             return
         cluster_name = deploymentvalidation.cluster_name
@@ -130,7 +127,7 @@ class DashdotdbDVO(DashdotdbBase):
 
     def _get_deploymentvalidation(
         self, metrics: list[str], cluster: ClusterV1
-    ) -> Optional[DVOPayload]:
+    ) -> DVOPayload | None:
         prom_info = self._get_prometheus_info(cluster)
         if not prom_info:
             return None
@@ -162,8 +159,8 @@ class DashdotdbDVO(DashdotdbBase):
     # via startswith and return only those that match.
     # Returns a map of {cluster: cluster_name, data: [metric_names]}
     def _get_validation_names(
-        self, cluster: ClusterV1, filter: Optional[str] = None
-    ) -> Optional[ClusterValidationMetrics]:
+        self, cluster: ClusterV1, filter: str | None = None
+    ) -> ClusterValidationMetrics | None:
         prom_info = self._get_prometheus_info(cluster)
         if not prom_info:
             return None
@@ -202,7 +199,7 @@ class DashdotdbDVO(DashdotdbBase):
             metrics=deploymentvalidation["data"],
         )
 
-    def _get_prometheus_info(self, cluster: ClusterV1) -> Optional[PrometheusInfo]:
+    def _get_prometheus_info(self, cluster: ClusterV1) -> PrometheusInfo | None:
         if not cluster.automation_token:
             LOG.error(
                 "%s cluster %s does not have an automation token",
@@ -217,14 +214,14 @@ class DashdotdbDVO(DashdotdbBase):
         )
 
     @staticmethod
-    def _get_clusters(name: Optional[str] = None) -> list[ClusterV1]:
+    def _get_clusters(name: str | None = None) -> list[ClusterV1]:
         return [
             c for c in get_clusters_minimal(name=name) if c.ocm and c.prometheus_url
         ]
 
-    def run(self, cname: Optional[str] = None) -> None:
+    def run(self, cname: str | None = None) -> None:
         clusters = self._get_clusters(name=cname)
-        validation_list: list[Optional[ClusterValidationMetrics]] = threaded.run(
+        validation_list: list[ClusterValidationMetrics | None] = threaded.run(
             func=self._get_validation_names,
             iterable=clusters,
             thread_pool_size=self.thread_pool_size,
@@ -258,7 +255,7 @@ class DashdotdbDVO(DashdotdbBase):
 def run(
     dry_run: bool = False,
     thread_pool_size: int = 10,
-    cluster_name: Optional[str] = None,
+    cluster_name: str | None = None,
 ) -> None:
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)

reconcile/dashdotdb_slo.py

@@ -1,9 +1,6 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import jinja2
 import requests
@@ -72,7 +69,7 @@ class DashdotdbSLO(DashdotdbBase):
             secret_reader=secret_reader,
         )
 
-    def _post(self, service_slos: Iterable[ServiceSLO]) -> Optional[Response]:
+    def _post(self, service_slos: Iterable[ServiceSLO]) -> Response | None:
         for item in service_slos:
             LOG.debug(f"About to POST SLO JSON item to dashdotDB:\n{item}\n")
 
@@ -106,9 +103,9 @@ class DashdotdbSLO(DashdotdbBase):
                 continue
 
             ns = namespace_access.namespace
-            promtoken: Optional[str] = None
-            username: Optional[str] = None
-            password: Optional[str] = None
+            promtoken: str | None = None
+            username: str | None = None
+            password: str | None = None
             if namespace_access.prometheus_access:
                 promurl = namespace_access.prometheus_access.url
                 username = self.secret_reader.read_secret(

reconcile/database_access_manager.py

@@ -1,5 +1,6 @@
 import base64
 import logging
+from collections.abc import Callable
 from random import choices
 from string import (
     ascii_letters,
@@ -7,8 +8,6 @@ from string import (
 )
 from typing import (
     Any,
-    Callable,
-    Optional,
     TypedDict,
     cast,
 )
@@ -57,7 +56,7 @@ JOB_PSQL_ENGINE_VERSION = "15.4-alpine"
 
 
 def get_database_access_namespaces(
-    query_func: Optional[Callable] = None,
+    query_func: Callable | None = None,
 ) -> list[NamespaceV1]:
     if not query_func:
         query_func = gql.get_api().query
@@ -74,7 +73,7 @@ class DatabaseConnectionParameters(BaseModel):
 
 class PSQLScriptGenerator(BaseModel):
     db_access: DatabaseAccessV1
-    current_db_access: Optional[DatabaseAccessV1]
+    current_db_access: DatabaseAccessV1 | None
     connection_parameter: DatabaseConnectionParameters
     admin_connection_parameter: DatabaseConnectionParameters
     engine: str
@@ -426,7 +425,7 @@ def _populate_resources(
     settings: dict[Any, Any],
     user_connection: DatabaseConnectionParameters,
     admin_connection: DatabaseConnectionParameters,
-    current_db_access: Optional[DatabaseAccessV1] = None,
+    current_db_access: DatabaseAccessV1 | None = None,
 ) -> list[DBAMResource]:
     if user_connection.database == admin_connection.database:
         raise ValueError(f"Can not use default database {admin_connection.database}")
@@ -594,7 +593,7 @@ def _process_db_access(
     if not _db_access_acccess_is_valid(db_access):
         raise ValueError("Duplicate schema in access list.")
 
-    current_db_access: Optional[DatabaseAccessV1] = None
+    current_db_access: DatabaseAccessV1 | None = None
     if state.exists(db_access.name):
         current_state = state.get(db_access.name)
         if current_state == db_access.dict(by_alias=True):

reconcile/dynatrace_token_provider/integration.py

@@ -1,12 +1,9 @@
 import base64
 import logging
 import sys
-from collections.abc import Iterable
+from collections.abc import Iterable, Mapping
 from datetime import timedelta
-from typing import (
-    Any,
-    Mapping,
-)
+from typing import Any
 
 from dynatrace import Dynatrace
 from dynatrace.environment_v2.tokens_api import ApiTokenCreated

reconcile/external_resources/integration.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Callable
+from collections.abc import Callable
 
 from reconcile.external_resources.manager import (
     ExternalResourcesInventory,

reconcile/external_resources/manager.py

@@ -1,8 +1,8 @@
 import json
 import logging
 from collections.abc import Iterable
-from datetime import datetime, timezone
-from enum import Enum
+from datetime import UTC, datetime
+from enum import StrEnum
 
 from sretoolbox.utils import threaded
 
@@ -73,7 +73,7 @@ def setup_factories(
     return of
 
 
-class ReconcileAction(str, Enum):
+class ReconcileAction(StrEnum):
     NOOP = "NOOP"
     APPLY_NOT_EXISTS = "Resource does not exist"
     APPLY_ERROR = "Resource status in ERROR state"
@@ -260,7 +260,7 @@ class ExternalResourcesManager:
         return need_secret_sync
 
     def _update_state(self, r: Reconciliation, state: ExternalResourceState) -> None:
-        state.ts = datetime.now(timezone.utc)
+        state.ts = datetime.now(UTC)
         if r.action == Action.APPLY:
             state.resource_status = ResourceStatus.IN_PROGRESS
         elif r.action == Action.DESTROY:

reconcile/external_resources/model.py

@@ -9,7 +9,7 @@ from collections.abc import (
     Iterator,
     MutableMapping,
 )
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from pydantic import BaseModel
@@ -82,7 +82,7 @@ class ExternalResourcesInventory(MutableMapping):
             for (p, ns) in desired_providers
             for r in p.resources
             if isinstance(
-                r, (NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceRoleV1)
+                r, NamespaceTerraformResourceRDSV1 | NamespaceTerraformResourceRoleV1
             )
             and r.managed_by_erv2
         ]
@@ -123,7 +123,7 @@ class ExternalResourcesInventory(MutableMapping):
             raise FetchResourceError(msg)
 
 
-class Action(str, Enum):
+class Action(StrEnum):
     DESTROY: str = "Destroy"
     APPLY: str = "Apply"
 

reconcile/external_resources/secrets_sync.py

@@ -3,9 +3,9 @@ import json
 import logging
 from abc import abstractmethod
 from collections.abc import Iterable, Mapping
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from hashlib import shake_128
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel
 from sretoolbox.utils import threaded
@@ -45,8 +45,8 @@ class VaultSecret(BaseModel):
 
     path: str
     field: str
-    version: Optional[int]
-    q_format: Optional[str]
+    version: int | None
+    q_format: str | None
 
 
 class SecretHelper:
@@ -324,7 +324,7 @@ class InClusterSecretsReconciler(SecretsReconciler):
                 else:
                     data[k] = decoded
 
-            spec.metadata[SECRET_UPDATED_AT] = datetime.now(timezone.utc).strftime(
+            spec.metadata[SECRET_UPDATED_AT] = datetime.now(UTC).strftime(
                 SECRET_UPDATED_AT_TIMEFORMAT
             )
             spec.secret = data

reconcile/external_resources/state.py

@@ -1,7 +1,7 @@
 import logging
 from collections.abc import Mapping
-from datetime import datetime, timezone
-from enum import Enum
+from datetime import UTC, datetime
+from enum import StrEnum
 from typing import Any
 
 from pydantic import BaseModel
@@ -20,14 +20,14 @@ class StateNotFoundError(Exception):
     pass
 
 
-class ReconcileStatus(str, Enum):
+class ReconcileStatus(StrEnum):
     SUCCESS: str = "SUCCESS"
     ERROR: str = "ERROR"
     IN_PROGRESS: str = "IN_PROGRESS"
     NOT_EXISTS: str = "NOT_EXISTS"
 
 
-class ResourceStatus(str, Enum):
+class ResourceStatus(StrEnum):
     CREATED: str = "CREATED"
     DELETED: str = "DELETED"
     ABANDONED: str = "ABANDONED"
@@ -198,7 +198,7 @@ class ExternalResourcesStateDynamoDB:
         else:
             return ExternalResourceState(
                 key=key,
-                ts=datetime.now(timezone.utc),
+                ts=datetime.now(UTC),
                 resource_status=ResourceStatus.NOT_EXISTS,
                 reconciliation=Reconciliation(key=key),
                 reconciliation_errors=0,

reconcile/gabi_authorized_users.py

@@ -10,10 +10,7 @@ from datetime import (
     date,
     datetime,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import reconcile.openshift_base as ob
 from reconcile import queries
@@ -114,9 +111,9 @@ def fetch_desired_state(
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
     gabi_instances = queries.get_gabi_instances()
     if not gabi_instances:

reconcile/gcr_mirror.py

@@ -241,7 +241,7 @@ class QuayMirror:
         control_file_name = "qontract-reconcile-gcr-mirror.timestamp"
         control_file_path = os.path.join(tempfile.gettempdir(), control_file_name)
         try:
-            with open(control_file_path, "r", encoding="locale") as file_obj:
+            with open(control_file_path, encoding="locale") as file_obj:
                 last_deep_sync = float(file_obj.read())
         except FileNotFoundError:
             self._record_timestamp(control_file_path)

reconcile/github_org.py

@@ -438,9 +438,7 @@ def run(dry_run):
 
     assert (
         current_orgs == desired_orgs
-    ), "Current orgs ({}) don't match desired orgs ({})".format(
-        current_orgs, desired_orgs
-    )
+    ), f"Current orgs ({current_orgs}) don't match desired orgs ({desired_orgs})"
 
     # Calculate diff
     diff = current_state.diff(desired_state)

reconcile/github_repo_invites.py

@@ -5,10 +5,7 @@ from collections.abc import (
     Mapping,
 )
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils import (
@@ -27,7 +24,7 @@ class CodeComponents:
 
 
 def _parse_code_components(
-    raw: Optional[Iterable[Mapping[str, Any]]],
+    raw: Iterable[Mapping[str, Any]] | None,
 ) -> CodeComponents:
     urls = set()
     known_orgs = set()

reconcile/gitlab_housekeeping.py

@@ -9,11 +9,7 @@ from datetime import (
     timedelta,
 )
 from operator import itemgetter
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from typing import Any
 
 import gitlab
 from gitlab.v4.objects import (
@@ -178,7 +174,7 @@ def close_item(
     gl: GitLabApi,
     enable_closing: bool,
     item_type: str,
-    item: Union[ProjectIssue, ProjectMergeRequest],
+    item: ProjectIssue | ProjectMergeRequest,
 ):
     if enable_closing:
         logging.info([
@@ -239,7 +235,7 @@ def handle_stale_items(
             cancel_notes = [
                 n
                 for n in item.notes.list()
-                if n.attributes.get("body") == "/{} cancel".format(LABEL)
+                if n.attributes.get("body") == f"/{LABEL} cancel"
             ]
             if not cancel_notes:
                 continue
@@ -280,7 +276,7 @@ def is_rebased(mr, gl: GitLabApi) -> bool:
 def get_merge_requests(
     dry_run: bool,
     gl: GitLabApi,
-    users_allowed_to_label: Optional[Iterable[str]] = None,
+    users_allowed_to_label: Iterable[str] | None = None,
 ) -> list[dict[str, Any]]:
     mrs = gl.get_merge_requests(state=MRState.OPENED)
     return preprocess_merge_requests(
@@ -295,7 +291,7 @@ def preprocess_merge_requests(
     dry_run: bool,
     gl: GitLabApi,
     project_merge_requests: list[ProjectMergeRequest],
-    users_allowed_to_label: Optional[Iterable[str]] = None,
+    users_allowed_to_label: Iterable[str] | None = None,
 ) -> list[dict[str, Any]]:
     results = []
     for mr in project_merge_requests:
@@ -434,7 +430,7 @@ def rebase_merge_requests(
                     rebases += 1
                     rebased_merge_requests.labels(mr.target_project_id).inc()
             except gitlab.exceptions.GitlabMRRebaseError as e:
-                logging.error("unable to rebase {}: {}".format(mr.iid, e))
+                logging.error(f"unable to rebase {mr.iid}: {e}")
         else:
             logging.info([
                 "rebase",
@@ -538,7 +534,7 @@ def merge_merge_requests(
                     return
                 merges += 1
             except gitlab.exceptions.GitlabMRClosedError as e:
-                logging.error("unable to merge {}: {}".format(mr.iid, e))
+                logging.error(f"unable to merge {mr.iid}: {e}")
 
 
 def get_app_sre_usernames(gl: GitLabApi) -> set[str]:

reconcile/gitlab_labeler.py

@@ -4,7 +4,6 @@ from collections.abc import (
     Iterable,
     Set,
 )
-from typing import Optional
 
 from reconcile import queries
 from reconcile.gitlab_housekeeping import (
@@ -48,7 +47,7 @@ def get_parents_list() -> set[str]:
 
 def guess_onboarding_status(
     changed_paths: Iterable[str], apps: dict[str, dict], parent_apps: set[str]
-) -> Optional[str]:
+) -> str | None:
     """
     Guess the service name of a given MR from the changed paths of the
     MR. This will allow to add the onboarding status to the MR's as label

reconcile/gitlab_members.py

@@ -1,10 +1,7 @@
 import enum
 import logging
 from collections.abc import Callable
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -203,7 +200,7 @@ def get_gitlab_instance(query_func: Callable) -> GitlabInstanceV1:
 @defer
 def run(
     dry_run: bool,
-    defer: Optional[Callable] = None,
+    defer: Callable | None = None,
 ) -> None:
     gqlapi = gql.get_api()
     # queries

reconcile/gitlab_permissions.py

@@ -21,9 +21,7 @@ def get_members_to_add(repo, gl, app_sre):
     if maintainers is None:
         return []
     if gl.user.username not in maintainers:
-        logging.error(
-            "'{}' is not shared with {} as 'Maintainer'".format(repo, gl.user.username)
-        )
+        logging.error(f"'{repo}' is not shared with {gl.user.username} as 'Maintainer'")
         return []
     members_to_add = [
         {"user": u, "repo": repo} for u in app_sre if u.username not in maintainers

reconcile/glitchtip/integration.py

@@ -3,10 +3,7 @@ from collections.abc import (
     Iterable,
     Sequence,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from reconcile.glitchtip.reconciler import GlitchtipReconciler
 from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
@@ -172,7 +169,7 @@ def get_internal_groups_client(
 
 @defer
 def run(
-    dry_run: bool, instance: Optional[str] = None, defer: Optional[Callable] = None
+    dry_run: bool, instance: str | None = None, defer: Callable | None = None
 ) -> None:
     gqlapi = gql.get_api()
     vault_settings = get_app_interface_vault_settings()