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

reconcile/utils/acs/policies.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -11,7 +11,7 @@ class Scope(BaseModel):
     """
 
     cluster: str
-    namespace: Optional[str]
+    namespace: str | None
 
 
 class PolicyCondition(BaseModel):
@@ -23,7 +23,7 @@ class PolicyCondition(BaseModel):
     """
 
     field_name: str
-    negate: Optional[bool]
+    negate: bool | None
     values: list[str]
 
 

reconcile/utils/aggregated_list.py

@@ -93,7 +93,7 @@ class AggregatedDiffRunner:
 
     def register(self, on, action, cond=None):
         if on not in self.diff.keys():
-            raise Exception("Unknown diff key for 'on': {}".format(on))
+            raise Exception(f"Unknown diff key for 'on': {on}")
         self.actions.append((on, action, cond))
 
     def run(self):

reconcile/utils/amtool.py

@@ -2,7 +2,6 @@ import re
 import tempfile
 from collections.abc import Mapping
 from subprocess import (
-    PIPE,
     CalledProcessError,
     run,
 )
@@ -62,7 +61,7 @@ def version() -> AmtoolResult:
 
 def _run_cmd(cmd: list[str]) -> AmtoolResult:
     try:
-        result = run(cmd, stdout=PIPE, stderr=PIPE, check=True)
+        result = run(cmd, capture_output=True, check=True)
     except CalledProcessError as e:
         msg = f'Error running amtool command [{" ".join(cmd)}]'
         if e.stdout:

reconcile/utils/aws_api.py

@@ -15,8 +15,6 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Literal,
-    Optional,
-    Union,
 )
 
 import botocore
@@ -83,7 +81,7 @@ class MissingARNError(Exception):
     pass
 
 
-KeyStatus = Union[Literal["Active"], Literal["Inactive"]]
+KeyStatus = Literal["Active"] | Literal["Inactive"]
 
 GOVCLOUD_PARTITION = "aws-us-gov"
 
@@ -191,7 +189,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         self,
         session: Session,
         service_name,
-        region_name: Optional[str] = None,
+        region_name: str | None = None,
     ):
         region = region_name if region_name else session.region_name
         client = session.client(
@@ -205,49 +203,49 @@ class AWSApi:  # pylint: disable=too-many-public-methods
     @staticmethod
     # pylint: disable=method-hidden
     def _get_session_resource(
-        session: Session, service_name, region_name: Optional[str] = None
+        session: Session, service_name, region_name: str | None = None
     ):
         region = region_name if region_name else session.region_name
         return session.resource(service_name, region_name=region)
 
     def _account_ec2_client(
-        self, account_name: str, region_name: Optional[str] = None
+        self, account_name: str, region_name: str | None = None
     ) -> EC2Client:
         session = self.get_session(account_name)
         return self.get_session_client(session, "ec2", region_name)
 
     def _account_ec2_resource(
-        self, account_name: str, region_name: Optional[str] = None
+        self, account_name: str, region_name: str | None = None
     ) -> EC2ServiceResource:
         session = self.get_session(account_name)
         return self._get_session_resource(session, "ec2", region_name)
 
     def _account_route53_client(
-        self, account_name: str, region_name: Optional[str] = None
+        self, account_name: str, region_name: str | None = None
     ) -> Route53Client:
         session = self.get_session(account_name)
         return self.get_session_client(session, "route53", region_name)
 
     def _account_rds_client(
-        self, account_name: str, region_name: Optional[str] = None
+        self, account_name: str, region_name: str | None = None
     ) -> RDSClient:
         session = self.get_session(account_name)
         return self.get_session_client(session, "rds", region_name)
 
     def _account_cloudwatch_client(
-        self, account_name: str, region_name: Optional[str] = None
+        self, account_name: str, region_name: str | None = None
     ):
         session = self.get_session(account_name)
         return self.get_session_client(session, "logs", region_name)
 
     def _account_organizations_client(
-        self, account_name: str, region_name: Optional[str] = None
+        self, account_name: str, region_name: str | None = None
     ) -> OrganizationsClient:
         session = self.get_session(account_name)
         return self.get_session_client(session, "organizations", region_name)
 
     def _account_s3_client(
-        self, account_name: str, region_name: Optional[str] = None
+        self, account_name: str, region_name: str | None = None
     ) -> S3Client:
         session = self.get_session(account_name)
         return self.get_session_client(session, "s3", region_name)
@@ -493,7 +491,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
 
     @staticmethod
     def resource_has_special_name(account, type, resource):
-        skip_msg = "[{}] skipping {} ".format(account, type) + "({} related) {}"
+        skip_msg = f"[{account}] skipping {type} " + "({} related) {}"
 
         ignore_names = {
             "production": ["prod"],
@@ -510,7 +508,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         return False
 
     def resource_has_special_tags(self, account, type, resource, tags):
-        skip_msg = "[{}] skipping {} ".format(account, type) + "({}={}) {}"
+        skip_msg = f"[{account}] skipping {type} " + "({}={}) {}"
 
         ignore_tags = {
             "ENV": ["prod", "stage", "staging"],
@@ -616,8 +614,8 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         if managed_by_integration_tag[0] == "terraform_resources":
             return "service_account"
 
-        huh = "unrecognized managed_by_integration tag: {}".format(
-            managed_by_integration_tag[0]
+        huh = (
+            f"unrecognized managed_by_integration tag: {managed_by_integration_tag[0]}"
         )
         raise InvalidResourceTypeError(huh)
 
@@ -813,7 +811,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
     @staticmethod
     def _get_account_assume_data(
         account: awsh.Account,
-    ) -> tuple[str, Optional[str], str]:
+    ) -> tuple[str, str | None, str]:
         """
         returns mandatory data to be able to assume a role with this account:
         (account_name, assume_role, assume_region)
@@ -823,7 +821,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         ok = all(elem in account.keys() for elem in required_keys)
         if not ok:
             account_name = account.get("name")
-            raise KeyError("[{}] account is missing required keys".format(account_name))
+            raise KeyError(f"[{account_name}] account is missing required keys")
         return (account["name"], account.get("assume_role"), account["assume_region"])
 
     @staticmethod
@@ -863,7 +861,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
     def _get_assumed_role_client(
         self,
         account_name: str,
-        assume_role: Optional[str],
+        assume_role: str | None,
         assume_region: str,
         client_type="ec2",
     ) -> EC2Client:
@@ -893,7 +891,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
     # filters a list of aws resources according to tags
     @staticmethod
     def filter_on_tags(
-        items: Iterable[Any], tags: Optional[Mapping[str, str]] = None
+        items: Iterable[Any], tags: Mapping[str, str] | None = None
     ) -> list[Any]:
         if tags is None:
             tags = {}
@@ -1054,7 +1052,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         account: Mapping[str, Any],
         owner_account: Mapping[str, Any],
         regex: str,
-        region: Optional[str] = None,
+        region: str | None = None,
     ) -> list[dict[str, Any]]:
         ec2 = self._account_ec2_client(account["name"], region_name=region)
         images = self.get_account_amis(ec2, owner=owner_account["uid"])
@@ -1065,7 +1063,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         account: Mapping[str, Any],
         share_account_uid: str,
         image_id: str,
-        region: Optional[str] = None,
+        region: str | None = None,
     ):
         ec2 = self._account_ec2_resource(account["name"], region)
         image = ec2.Image(image_id)
@@ -1100,8 +1098,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         client = self._account_cloudwatch_client(account_name, region_name=region_name)
         paginator = client.get_paginator("describe_log_groups")
         for page in paginator.paginate():
-            for log_group in page["logGroups"]:
-                yield log_group
+            yield from page["logGroups"]
 
     def get_cloudwatch_log_group_tags(
         self,
@@ -1175,7 +1172,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
 
     @staticmethod
     # pylint: disable=method-hidden
-    def get_vpc_default_sg_id(vpc_id: str, ec2: EC2Client) -> Optional[str]:
+    def get_vpc_default_sg_id(vpc_id: str, ec2: EC2Client) -> str | None:
         vpc_security_groups = ec2.describe_security_groups(
             Filters=[
                 {"Name": "vpc-id", "Values": [vpc_id]},
@@ -1196,7 +1193,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
 
     def get_tgw_default_route_table_id(
         self, ec2: EC2Client, tgw_id: str, tags: Mapping[str, str]
-    ) -> Optional[str]:
+    ) -> str | None:
         tgws = self.get_transit_gateways(ec2)
         tgws = self.filter_on_tags(tgws, tags)
         # we know the party TGW exists, so we can be
@@ -1555,7 +1552,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
 
     def get_image_id(
         self, account_name: str, region_name: str, tags: Iterable[AmiTag]
-    ) -> Optional[str]:
+    ) -> str | None:
         """
         Get AMI ID matching the specified criteria.
 
@@ -1584,7 +1581,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         self,
         account_name: str,
         db_instance_name: str,
-        region_name: Optional[str] = None,
+        region_name: str | None = None,
     ) -> DBInstanceMessageTypeDef:
         """
         Describe a single RDS instance.
@@ -1606,7 +1603,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         account_name: str,
         engine: str,
         engine_version: str,
-        region_name: Optional[str] = None,
+        region_name: str | None = None,
     ) -> list[UpgradeTargetTypeDef]:
         """
         Get a list version of the database engine that a DB instance can be upgraded to.
@@ -1640,7 +1637,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         account_name: str,
         bucket_name: str,
         path: str,
-        region_name: Optional[str] = None,
+        region_name: str | None = None,
     ) -> str:
         s3 = self._account_s3_client(account_name, region_name=region_name)
         return (
@@ -1648,7 +1645,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         )
 
 
-def aws_config_file_path() -> Optional[str]:
+def aws_config_file_path() -> str | None:
     config_file_path = os.path.expanduser(
         os.environ.get("AWS_CONFIG_FILE", "~/.aws/config")
     )

reconcile/utils/binary.py

@@ -36,9 +36,7 @@ def binary_version(binary, version_args, search_regex, expected_versions):
             cmd = [binary]
             cmd.extend(version_args)
             try:
-                result = subprocess.run(
-                    cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True
-                )
+                result = subprocess.run(cmd, capture_output=True, check=True)
             except subprocess.CalledProcessError as e:
                 msg = (
                     f"Could not execute binary '{binary}' "

reconcile/utils/clusterhealth/providerbase.py

@@ -1,12 +1,11 @@
 from abc import ABC, abstractmethod
-from typing import Optional
 
 from pydantic import BaseModel
 
 
 class ClusterHealth(BaseModel):
     source: str
-    errors: Optional[set[str]] = None
+    errors: set[str] | None = None
 
     def has_health_errors(self) -> bool:
         return bool(self.errors)

reconcile/utils/clusterhealth/telemeter.py

@@ -1,4 +1,4 @@
-from functools import lru_cache
+from functools import cache
 
 from reconcile.utils.clusterhealth.providerbase import (
     ClusterHealth,
@@ -14,7 +14,7 @@ class TelemeterClusterHealthProvider(ClusterHealthProvider):
     def __init__(self, querier: PrometheusQuerier):
         self.querier = querier
 
-    @lru_cache(maxsize=None)
+    @cache
     def cluster_health_for_org(self, org_id: str) -> dict[str, ClusterHealth]:
         vectors_by_cluster = group_by(
             self.querier.instant_vector_query(telemeter_alert_query(org_id)),

reconcile/utils/deadmanssnitch_api.py

@@ -1,7 +1,6 @@
 import logging
 from typing import (
     Any,
-    Optional,
     Self,
 )
 
@@ -27,7 +26,7 @@ class Snitch(BaseModel):
     interval: str
     alert_type: str
     alert_email: list[str]
-    vault_data: Optional[str]
+    vault_data: str | None
 
     def needs_vault_update(self) -> bool:
         return self.vault_data is not None and self.check_in_url != self.vault_data

reconcile/utils/disabled_integrations.py

@@ -1,26 +1,24 @@
 from collections.abc import Mapping
 from typing import (
     Any,
-    Optional,
     Protocol,
-    Union,
     runtime_checkable,
 )
 
 
 class HasIntegrations(Protocol):
-    integrations: Optional[list[str]]
+    integrations: list[str] | None
 
 
 @runtime_checkable
 class HasDisableIntegrations(Protocol):
     @property
-    def disable(self) -> Optional[HasIntegrations]:
+    def disable(self) -> HasIntegrations | None:
         pass
 
 
 def disabled_integrations(
-    disable_obj: Optional[Union[Mapping[str, Any], HasDisableIntegrations]],
+    disable_obj: Mapping[str, Any] | HasDisableIntegrations | None,
 ) -> list[str]:
     """Returns all disabled integrations"""
     if not disable_obj:
@@ -38,7 +36,7 @@ def disabled_integrations(
 
 def integration_is_enabled(
     integration: str,
-    disable_obj: Optional[Union[Mapping[str, Any], HasDisableIntegrations]],
+    disable_obj: Mapping[str, Any] | HasDisableIntegrations | None,
 ) -> bool:
     """A convenient method to check whether an integration is enabled or not."""
     return integration not in disabled_integrations(disable_obj)

reconcile/utils/environ.py

@@ -12,7 +12,7 @@ def environ(variables=None):
         def f_environ(*args, **kwargs):
             for e in variables:
                 if not os.environ.get(e):
-                    raise KeyError("Could not find environment variable: {}".format(e))
+                    raise KeyError(f"Could not find environment variable: {e}")
             f(*args, **kwargs)
 
         return f_environ

reconcile/utils/expiration.py

@@ -1,10 +1,8 @@
 import datetime
 from collections.abc import Iterable
 from typing import (
-    Optional,
     Protocol,
     TypeVar,
-    Union,
     cast,
 )
 
@@ -12,12 +10,10 @@ DATE_FORMAT = "%Y-%m-%d"
 
 
 class FilterableRole(Protocol):
-    expiration_date: Optional[str]
+    expiration_date: str | None
 
 
-DictsOrRoles = TypeVar(
-    "DictsOrRoles", bound=Union[Iterable[FilterableRole], Iterable[dict]]
-)
+DictsOrRoles = TypeVar("DictsOrRoles", bound=Iterable[FilterableRole] | Iterable[dict])
 
 
 def date_expired(date: str) -> bool:
@@ -26,7 +22,7 @@ def date_expired(date: str) -> bool:
     return current_date >= exp_date
 
 
-def filter(roles: Optional[DictsOrRoles]) -> DictsOrRoles:
+def filter(roles: DictsOrRoles | None) -> DictsOrRoles:
     """Filters roles and returns the ones which are not yet expired."""
     filtered = []
     for r in roles or []:

reconcile/utils/external_resource_spec.py

@@ -7,7 +7,6 @@ from collections.abc import (
 from dataclasses import field
 from typing import (
     Any,
-    Optional,
     cast,
 )
 
@@ -52,7 +51,7 @@ class OutputFormatProcessor:
 
 @dataclass
 class GenericSecretOutputFormatConfig(OutputFormatProcessor):
-    data: Optional[str] = None
+    data: str | None = None
 
     def render(self, vars: Mapping[str, str]) -> dict[str, str]:
         if self.data:
@@ -68,7 +67,7 @@ class GenericSecretOutputFormatConfig(OutputFormatProcessor):
 @dataclass
 class OutputFormat:
     provider: str
-    data: Optional[str] = None
+    data: str | None = None
 
     @property
     def _formatter(self) -> OutputFormatProcessor:
@@ -144,7 +143,7 @@ class ExternalResourceSpec:
             "app": self.namespace["app"]["name"],
         }
 
-    def get_secret_field(self, field: str) -> Optional[str]:
+    def get_secret_field(self, field: str) -> str | None:
         return self.secret.get(field)
 
     def id_object(self) -> "ExternalResourceUniqueKey":

reconcile/utils/external_resources.py

@@ -4,10 +4,7 @@ from collections.abc import (
     Mapping,
     MutableMapping,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import anymarkup
 
@@ -27,7 +24,7 @@ PROVIDER_CLOUDFLARE = "cloudflare"
 
 
 def get_external_resource_specs(
-    namespace_info: Mapping[str, Any], provision_provider: Optional[str] = None
+    namespace_info: Mapping[str, Any], provision_provider: str | None = None
 ) -> list[ExternalResourceSpec]:
     specs: list[ExternalResourceSpec] = []
     if not managed_external_resources(namespace_info):
@@ -121,7 +118,7 @@ class ResourceValueResolver:
     def __init__(
         self,
         spec: ExternalResourceSpec,
-        integration_tag: Optional[str] = None,
+        integration_tag: str | None = None,
         identifier_as_value: bool = False,
     ):
         """
@@ -207,7 +204,7 @@ class ResourceValueResolver:
 
     @staticmethod
     def _override_values(
-        values: MutableMapping[str, Any], overrides: Optional[str]
+        values: MutableMapping[str, Any], overrides: str | None
     ) -> None:
         if overrides is None:
             return

reconcile/utils/filtering.py

@@ -1,5 +1,4 @@
 from typing import (
-    Optional,
     TypeVar,
 )
 
@@ -8,7 +7,7 @@ ValueType = TypeVar("ValueType")
 
 
 def remove_none_values_from_dict(
-    a_dict: dict[KeyType, Optional[ValueType]],
+    a_dict: dict[KeyType, ValueType | None],
 ) -> dict[KeyType, ValueType]:
     """
     Creates a new dictionary based on the input dictionary but skips items

reconcile/utils/git.py

@@ -14,18 +14,14 @@ def clone(repo_url, wd, depth=None, verify=True):
     if depth:
         cmd += ["--depth", str(depth)]
     cmd += [repo_url, wd]
-    result = subprocess.run(
-        cmd, cwd=wd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False
-    )
+    result = subprocess.run(cmd, cwd=wd, capture_output=True, check=False)
     if result.returncode != 0:
         raise GitError(f"git clone failed: {repo_url}")
 
 
 def checkout(commit, wd):
     cmd = ["git", "checkout", commit]
-    result = subprocess.run(
-        cmd, cwd=wd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False
-    )
+    result = subprocess.run(cmd, cwd=wd, capture_output=True, check=False)
     if result.returncode != 0:
         raise GitError(f"git checkout failed: {commit}")
 
@@ -34,9 +30,7 @@ def is_file_in_git_repo(file_path):
     real_path = os.path.realpath(file_path)
     dir_path = os.path.dirname(real_path)
     cmd = ["git", "rev-parse", "--is-inside-work-tree"]
-    result = subprocess.run(
-        cmd, cwd=dir_path, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False
-    )
+    result = subprocess.run(cmd, cwd=dir_path, capture_output=True, check=False)
     return result.returncode == 0
 
 

reconcile/utils/git_secrets.py

@@ -11,9 +11,9 @@ from reconcile.utils import git
 
 @retry()
 def scan_history(repo_url, existing_keys):
-    logging.info("scanning {}".format(repo_url))
+    logging.info(f"scanning {repo_url}")
     if requests.get(repo_url, timeout=60).status_code == 404:
-        logging.info("not found {}".format(repo_url))
+        logging.info(f"not found {repo_url}")
         return []
 
     with tempfile.TemporaryDirectory() as wd:
@@ -27,11 +27,11 @@ def scan_history(repo_url, existing_keys):
         )
         if result.returncode == 0:
             return []
-        logging.info("found suspects in {}".format(repo_url))
+        logging.info(f"found suspects in {repo_url}")
         suspected_files = get_suspected_files(result.stderr.decode("utf-8"))
         leaked_keys = get_leaked_keys(wd, suspected_files, existing_keys)
         if leaked_keys:
-            logging.info("found suspected leaked keys: {}".format(leaked_keys))
+            logging.info(f"found suspected leaked keys: {leaked_keys}")
         return leaked_keys
 
 
@@ -55,7 +55,7 @@ def get_leaked_keys(repo_wd, suspected_files, existing_keys):
         commit, file_relative_path = s[0], s[1]
         git.checkout(commit, repo_wd)
         file_path = os.path.join(repo_wd, file_relative_path)
-        with open(file_path, "r", encoding="locale") as f:
+        with open(file_path, encoding="locale") as f:
             content = f.read()
         leaked_keys = [key for key in existing_keys if key in content]
         all_leaked_keys.extend(leaked_keys)

reconcile/utils/github_api.py

@@ -1,10 +1,6 @@
 import os
 from pathlib import Path
 from types import TracebackType
-from typing import (
-    Optional,
-    Type,
-)
 from urllib.parse import urlparse
 
 from github import (
@@ -33,7 +29,7 @@ class GithubRepositoryApi:
         repo_url: str,
         token: str,
         timeout: int = 30,
-        github: Optional[Github] = None,
+        github: Github | None = None,
     ):
         parsed_repo_url = urlparse(repo_url)
         repo = parsed_repo_url.path.strip("/")
@@ -48,9 +44,9 @@ class GithubRepositoryApi:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         self.cleanup()
 
@@ -67,7 +63,7 @@ class GithubRepositoryApi:
         return tree_items
 
     @retry()
-    def get_file(self, path: str, ref: str = "master") -> Optional[bytes]:
+    def get_file(self, path: str, ref: str = "master") -> bytes | None:
         try:
             content = self._repo.get_contents(path=path, ref=ref)
             if isinstance(content, list):

reconcile/utils/gitlab_api.py

@@ -12,7 +12,6 @@ from operator import (
 )
 from typing import (
     Any,
-    Optional,
     TypedDict,
 )
 from urllib.parse import urlparse
@@ -798,7 +797,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         author, assignee = last_assignment[0], last_assignment[1]
         return author in team_usernames and mr.assignee["username"] == assignee
 
-    def last_assignment(self, mr: ProjectMergeRequest) -> Optional[tuple[str, str]]:
+    def last_assignment(self, mr: ProjectMergeRequest) -> tuple[str, str] | None:
         body_format = "assigned to @"
         notes = self.get_items(mr.notes.list)
 
@@ -817,7 +816,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
 
     def last_comment(
         self, mr: ProjectMergeRequest, exclude_bot=True
-    ) -> Optional[dict[str, Any]]:
+    ) -> dict[str, Any] | None:
         comments = self.get_merge_request_comments(mr)
         comments.sort(key=itemgetter("created_at"), reverse=True)
         for comment in comments: