qontract-reconcile 0.10.2.dev57__py3-none-any.whl → 0.10.2.dev58__py3-none-any.whl

reconcile/utils/aws_helper.py

@@ -1,4 +1,4 @@
-from collections.abc import Iterable
+from collections.abc import Iterable, Mapping
 from typing import Any, Protocol
 
 from reconcile.utils.disabled_integrations import (
@@ -12,15 +12,15 @@ class AccountNotFoundError(Exception):
     pass
 
 
-Account = dict[str, Any]
+Account = Mapping[str, Any]
 
 
-def get_id_from_arn(arn):
+def get_id_from_arn(arn: str) -> str:
     # arn:aws:iam::12345:<arntype>/id --> id
     return arn.split("/")[1]
 
 
-def get_account_uid_from_arn(arn):
+def get_account_uid_from_arn(arn: str) -> str:
     # arn:aws:iam::12345:role/role-1 --> 12345
     return arn.split(":")[4]
 
@@ -36,7 +36,7 @@ def is_aws_managed_resource(arn: str) -> bool:
     return get_account_uid_from_arn(arn) == "aws"
 
 
-def get_details_from_role_link(role_link):
+def get_details_from_role_link(role_link: str) -> tuple[str, str]:
     # https://signin.aws.amazon.com/switchrole?
     # account=<uid>&roleName=<role_name> -->
     # 12345, role-1
@@ -46,7 +46,7 @@ def get_details_from_role_link(role_link):
     return uid, role_name
 
 
-def get_role_arn_from_role_link(role_link):
+def get_role_arn_from_role_link(role_link: str) -> str:
     # https://signin.aws.amazon.com/switchrole?
     # account=<uid>&roleName=<role_name> -->
     # arn:aws:iam::12345:role/role-1
@@ -54,7 +54,7 @@ def get_role_arn_from_role_link(role_link):
     return f"arn:aws:iam::{uid}:role/{role_name}"
 
 
-def get_account_uid_from_role_link(role_link):
+def get_account_uid_from_role_link(role_link: str) -> str:
     uid, _ = get_details_from_role_link(role_link)
     return uid
 

reconcile/utils/binary.py

@@ -1,17 +1,19 @@
 import re
 import shutil
 import subprocess
+from collections.abc import Callable, Iterable
 from functools import wraps
+from typing import Any
 
 
-def binary(binaries=None):
+def binary(binaries: Iterable[str] | None = None) -> Callable:
     """Check that a binary exists before execution."""
     if binaries is None:
         binaries = []
 
-    def deco_binary(f):
+    def deco_binary(f: Callable) -> Callable:
         @wraps(f)
-        def f_binary(*args, **kwargs):
+        def f_binary(*args: Any, **kwargs: Any) -> None:
             for b in binaries:
                 if not shutil.which(b):
                     raise Exception(
@@ -25,12 +27,17 @@ def binary(binaries=None):
     return deco_binary
 
 
-def binary_version(binary, version_args, search_regex, expected_versions):
+def binary_version(
+    binary: str,
+    version_args: Iterable[str],
+    search_regex: str,
+    expected_versions: Iterable[str],
+) -> Callable:
     """Check that a binary exists and is a desired version"""
 
-    def deco_binary_version(f):
+    def deco_binary_version(f: Callable) -> Callable:
         @wraps(f)
-        def f_binary_version(*args, **kwargs):
+        def f_binary_version(*args: Any, **kwargs: Any) -> None:
             regex = re.compile(search_regex)
 
             cmd = [binary]
@@ -51,7 +58,7 @@ def binary_version(binary, version_args, search_regex, expected_versions):
                     found = True
                     break
 
-            if not found:
+            if not found or not match:
                 raise Exception(
                     f"Could not find version for binary '{binary}' via regex "
                     f"for binary version check: "

reconcile/utils/config.py

@@ -1,6 +1,9 @@
+from collections.abc import Mapping
+from typing import Any
+
 import toml
 
-_config = None
+_config: dict = {}
 
 
 class ConfigNotFound(Exception):
@@ -11,21 +14,21 @@ class SecretNotFound(Exception):
     pass
 
 
-def get_config():
+def get_config() -> dict:
     return _config
 
 
-def init(config):
+def init(config: dict) -> dict:
     global _config  # noqa: PLW0603
     _config = config
     return _config
 
 
-def init_from_toml(configfile):
+def init_from_toml(configfile: str) -> dict:
     return init(toml.load(configfile))
 
 
-def read(secret):
+def read(secret: Mapping[str, Any]) -> str:
     path = secret["path"]
     field = secret["field"]
     try:
@@ -38,7 +41,7 @@ def read(secret):
         raise SecretNotFound(f"key not found in config file {path}: {e!s}") from None
 
 
-def read_all(secret):
+def read_all(secret: Mapping[str, Any]) -> dict:
     path = secret["path"]
     try:
         path_tokens = path.split("/")

reconcile/utils/defer.py

@@ -1,14 +1,16 @@
+from collections.abc import Callable
 from contextlib import ExitStack
 from functools import wraps
+from typing import Any
 
 
-def defer(func):
+def defer(func: Callable) -> Callable:
     """Defer code execution until the surrounding function returns.
     Useful for registering cleanup work.
     """
 
     @wraps(func)
-    def func_wrapper(*args, **kwargs):
+    def func_wrapper(*args: Any, **kwargs: Any) -> Any:
         with ExitStack() as stack:
             return func(*args, defer=stack.callback, **kwargs)
 

reconcile/utils/elasticsearch_exceptions.py

@@ -1,18 +1,21 @@
+from typing import Any
+
+
 class ElasticSearchResourceNameInvalidError(Exception):
-    def __init__(self, msg):
+    def __init__(self, msg: Any) -> None:
         super().__init__(str(msg))
 
 
 class ElasticSearchResourceMissingSubnetIdError(Exception):
-    def __init__(self, msg):
+    def __init__(self, msg: Any) -> None:
         super().__init__(str(msg))
 
 
 class ElasticSearchResourceZoneAwareSubnetInvalidError(Exception):
-    def __init__(self, msg):
+    def __init__(self, msg: Any) -> None:
         super().__init__(str(msg))
 
 
 class ElasticSearchResourceColdStorageError(Exception):
-    def __init__(self, msg):
+    def __init__(self, msg: Any) -> None:
         super().__init__(str(msg))

reconcile/utils/environ.py

@@ -1,15 +1,17 @@
 import os
+from collections.abc import Callable, Iterable
 from functools import wraps
+from typing import Any
 
 
-def environ(variables=None):
+def environ(variables: Iterable[str] | None = None) -> Callable:
     """Check that environment variables are set before execution."""
     if variables is None:
         variables = []
 
-    def deco_environ(f):
+    def deco_environ(f: Callable) -> Callable:
         @wraps(f)
-        def f_environ(*args, **kwargs):
+        def f_environ(*args: Any, **kwargs: Any) -> None:
             for e in variables:
                 if not os.environ.get(e):
                     raise KeyError(f"Could not find environment variable: {e}")

reconcile/utils/exceptions.py

@@ -1,10 +1,13 @@
+from typing import Any
+
+
 class FetchResourceError(Exception):
-    def __init__(self, msg):
+    def __init__(self, msg: Any) -> None:
         super().__init__("error fetching resource: " + str(msg))
 
 
 class PrintToFileInGitRepositoryError(Exception):
-    def __init__(self, msg):
+    def __init__(self, msg: Any) -> None:
         super().__init__("can not print to a git repository: " + str(msg))
 
 

reconcile/utils/git.py

@@ -6,7 +6,9 @@ class GitError(Exception):
     pass
 
 
-def clone(repo_url, wd, depth=None, verify=True):
+def clone(
+    repo_url: str, wd: str, depth: int | None = None, verify: bool | None = True
+) -> None:
     cmd = ["git"]
     if not verify:
         cmd += ["-c", "http.sslVerify=false"]
@@ -35,7 +37,7 @@ def fetch(
     remote: str = "origin",
     depth: int | None = None,
     verify: bool = True,
-):
+) -> None:
     cmd = ["git"]
     if not verify:
         cmd += ["-c", "http.sslVerify=false"]
@@ -51,7 +53,7 @@ def checkout(
     ref: str,
     wd: str,
     verify: bool = True,
-):
+) -> None:
     if not is_current_ref(ref, wd):
         fetch(ref, wd, depth=1, verify=verify)
     cmd = ["git", "checkout", ref]
@@ -60,7 +62,7 @@ def checkout(
         raise GitError(f"git checkout failed for {ref}: {result.stderr}")
 
 
-def is_file_in_git_repo(file_path):
+def is_file_in_git_repo(file_path: str) -> bool:
     real_path = os.path.realpath(file_path)
     dir_path = os.path.dirname(real_path)
     cmd = ["git", "rev-parse", "--is-inside-work-tree"]