qontract-reconcile 0.10.1rc976__py3-none-any.whl → 0.10.1rc977__py3-none-any.whl

reconcile/utils/terrascript_aws_client.py

@@ -1058,7 +1058,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                         except KeyError:
                             msg = f"Key '{rec['key']}' was not found in the contents of secret '{rec['path']}'"
                             logging.error(msg)
-                            raise KeyError(msg)
+                            raise KeyError(msg) from None
                     vault_values.append(value)
                 record["records"] = vault_values
 
@@ -1918,10 +1918,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         if name not in self.configs:
             return False
 
-        if self.configs[name]["supportedDeploymentRegions"] is not None:
-            return True
-
-        return False
+        return self.configs[name]["supportedDeploymentRegions"] is not None
 
     def _find_resource_spec(
         self, account: str, source: str, provider: str
@@ -1949,12 +1946,10 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
 
     @staticmethod
     def _db_needs_auth(config):
-        if (
+        return bool(
             "replicate_source_db" not in config
             and config.get("replica_source", None) is None
-        ):
-            return True
-        return False
+        )
 
     @staticmethod
     def validate_db_name(name):
@@ -2808,10 +2803,8 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         )
 
         # iam policy for queue
-        policy_index = 0
-        for all_queues in all_queues_per_spec:
+        for policy_index, all_queues in enumerate(all_queues_per_spec):
             policy_identifier = f"{identifier}-{policy_index}"
-            policy_index += 1
             if len(all_queues_per_spec) == 1:
                 policy_identifier = identifier
             values = {}
@@ -2864,10 +2857,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
 
         values = {}
         fifo_topic = common_values.get("fifo_topic", False)
-        if fifo_topic:
-            topic_name = identifier + (".fifo")
-        else:
-            topic_name = identifier
+        topic_name = identifier + ".fifo" if fifo_topic else identifier
 
         values["name"] = topic_name
         values["policy"] = policy
@@ -2878,7 +2868,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         tf_resource = aws_sns_topic(identifier, **values)
         tf_resources.append(tf_resource)
 
-        if "subscriptions" in common_values.keys():
+        if "subscriptions" in common_values:
             subscriptions = common_values.get("subscriptions")
             for index, sub in enumerate(subscriptions):
                 sub_values = {}
@@ -3151,7 +3141,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
 
         values = common_values.get("distribution_config", {})
         # aws_s3_bucket_acl
-        if "logging_config" in values.keys():
+        if "logging_config" in values:
             # we could set this at a global level with a standard name like "cloudfront"
             # but we need all aws accounts upgraded to aws provider >3.60 first
             tf_resources.append(
@@ -4242,7 +4232,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         try:
             raw_values = gqlapi.get_resource(path)
         except gql.GqlGetResourceError as e:
-            raise FetchResourceError(str(e))
+            raise FetchResourceError(str(e)) from e
         return raw_values
 
     def get_values(self, path: str) -> dict[str, Any]:
@@ -4252,7 +4242,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             values.pop("$schema", None)
         except anymarkup.AnyMarkupError:
             e_msg = "Could not parse data. Skipping resource: {}"
-            raise FetchResourceError(e_msg.format(path))
+            raise FetchResourceError(e_msg.format(path)) from None
         return values
 
     @staticmethod
@@ -4734,7 +4724,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         )
         tf_resources.append(Output(output_name, value=output_value))
         # add master user creds to output and secretsmanager if internal_user_database_enabled
-        security_options = es_values.get("advanced_security_options", None)
+        security_options = es_values.get("advanced_security_options")
         if security_options and security_options.get(
             "internal_user_database_enabled", False
         ):
@@ -4985,7 +4975,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
     def _get_alb_rule_condition_value(condition):
         condition_type = condition["type"]
         condition_type_key = SUPPORTED_ALB_LISTENER_RULE_CONDITION_TYPE_MAPPING.get(
-            condition_type, None
+            condition_type
         )
         if condition_type_key is None:
             raise KeyError(f"unknown alb rule condition type {condition_type}")
@@ -5713,7 +5703,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             except ClientError as details:
                 raise StateInaccessibleException(
                     f"Bucket {bucket_name} is not accessible - {str(details)}"
-                )
+                ) from None
 
             # todo: probably remove 'RedHat' from the object/variable/filepath
             # names to keep the code RedHat-agnostic?

reconcile/utils/three_way_diff_strategy.py

@@ -95,14 +95,11 @@ def is_empty_env_value(current: OR, desired: OR, patch: Mapping[str, Any]) -> bo
     :return: True if the change is not needed, False otherwise
     """
     pointer = patch["path"]
-    if (
+    return bool(
         patch["op"] == "add"
         and not patch["value"]
         and re.match(EMPTY_ENV_VALUE, pointer)
-    ):
-        return True
-
-    return False
+    )
 
 
 def is_valid_change(current: OR, desired: OR, patch: Mapping[str, Any]) -> bool:
@@ -116,10 +113,7 @@ def is_valid_change(current: OR, desired: OR, patch: Mapping[str, Any]) -> bool:
         return False
 
     # Other cases
-    if is_empty_env_value(current, desired, patch):
-        return False
-
-    return True
+    return not is_empty_env_value(current, desired, patch)
 
 
 def three_way_diff_using_hash(c_item: OR, d_item: OR) -> bool:

reconcile/utils/unleash/client.py

@@ -43,7 +43,7 @@ class DisableClusterStrategy(ClusterStrategy):
     def apply(self, context: dict | None = None) -> bool:
         enable = True
 
-        if context and "cluster_name" in context.keys():
+        if context and "cluster_name" in context:
             # if cluster in context is in clusters sent from server, disable
             enable = context["cluster_name"] not in self.parsed_provisioning
 
@@ -54,7 +54,7 @@ class EnableClusterStrategy(ClusterStrategy):
     def apply(self, context: dict | None = None) -> bool:
         enable = False
 
-        if context and "cluster_name" in context.keys():
+        if context and "cluster_name" in context:
             # if cluster in context is in clusters sent from server, enable
             enable = context["cluster_name"] in self.parsed_provisioning
 

reconcile/utils/vault.py

@@ -234,10 +234,10 @@ class _VaultClient:
             )
         except InvalidPath:
             msg = f"version '{version}' not found " f"for secret with path '{path}'."
-            raise SecretVersionNotFound(msg)
+            raise SecretVersionNotFound(msg) from None
         except hvac.exceptions.Forbidden:
             msg = f"permission denied accessing secret '{path}'"
-            raise SecretAccessForbidden(msg)
+            raise SecretAccessForbidden(msg) from None
         if secret is None or "data" not in secret or "data" not in secret["data"]:
             raise SecretNotFound(path)
 
@@ -250,7 +250,7 @@ class _VaultClient:
             secret = self._client.read(path)
         except hvac.exceptions.Forbidden:
             msg = f"permission denied accessing secret '{path}'"
-            raise SecretAccessForbidden(msg)
+            raise SecretAccessForbidden(msg) from None
 
         if secret is None or "data" not in secret:
             raise SecretNotFound(path)
@@ -295,7 +295,7 @@ class _VaultClient:
         try:
             secret_field = data[field]
         except KeyError:
-            raise SecretFieldNotFound(f"{path}/{field} ({version})")
+            raise SecretFieldNotFound(f"{path}/{field} ({version})") from None
         return secret_field
 
     def _read_v1(self, path, field):
@@ -303,7 +303,7 @@ class _VaultClient:
         try:
             secret_field = data[field]
         except KeyError:
-            raise SecretFieldNotFound(f"{path}/{field}")
+            raise SecretFieldNotFound(f"{path}/{field}") from None
         return secret_field
 
     @retry()
@@ -355,14 +355,14 @@ class _VaultClient:
             self._read_all_v2.cache_clear()
         except hvac.exceptions.Forbidden:
             msg = f"permission denied accessing secret '{path}'"
-            raise SecretAccessForbidden(msg)
+            raise SecretAccessForbidden(msg) from None
 
     def _write_v1(self, path, data):
         try:
             self._client.write(path, **data)
         except hvac.exceptions.Forbidden:
             msg = f"permission denied accessing secret '{path}'"
-            raise SecretAccessForbidden(msg)
+            raise SecretAccessForbidden(msg) from None
 
     def _list_kv2(self, path: str) -> dict:
         try:
@@ -373,22 +373,19 @@ class _VaultClient:
             return response
         except hvac.exceptions.Forbidden:
             msg = f"permission denied accessing path '{path}'"
-            raise PathAccessForbidden(msg)
+            raise PathAccessForbidden(msg) from None
 
     def _list(self, path: str) -> dict:
         try:
             return self._client.list(path)
         except hvac.exceptions.Forbidden:
             msg = f"permission denied accessing path '{path}'"
-            raise PathAccessForbidden(msg)
+            raise PathAccessForbidden(msg) from None
 
     def list(self, path: str) -> list[str]:
         """Returns a list of secrets in a given path."""
         kv_version = self._get_mount_version_by_secret_path(path)
-        if kv_version == 2:
-            path_list = self._list_kv2(path)
-        else:
-            path_list = self._list(path)
+        path_list = self._list_kv2(path) if kv_version == 2 else self._list(path)
 
         if not path_list:
             # path list can be None if the path does not exist
@@ -420,7 +417,7 @@ class _VaultClient:
             self._client.delete(path)
         except hvac.exceptions.Forbidden:
             msg = f"permission denied accessing secret '{path}'"
-            raise SecretAccessForbidden(msg)
+            raise SecretAccessForbidden(msg) from None
 
 
 class VaultClient:

reconcile/utils/vcs.py

@@ -70,7 +70,7 @@ class VCS:
         self._allow_opening_mrs = allow_opening_mrs
         self._secret_reader = secret_reader
         self._gh_per_repo_url: dict[str, GithubRepositoryApi] = (
-            {} if not github_api_per_repo_url else github_api_per_repo_url
+            github_api_per_repo_url if github_api_per_repo_url else {}
         )
         self._default_gh_token = (
             default_gh_token

reconcile/vault_replication.py

@@ -121,7 +121,7 @@ def copy_vault_secret(
     except SecretAccessForbidden:
         # Raise exception if we can't read the secret from the source vault.
         # This is likely to be related to the approle permissions.
-        raise SecretAccessForbidden("Cannot read secret from source vault")
+        raise SecretAccessForbidden("Cannot read secret from source vault") from None
     except SecretNotFound:
         # If the secret is present in vault, but there are no versions of it
         # we want to be aware of it, but not cause a failure of the complete

tools/app_interface_reporter.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 import os
 import textwrap
@@ -438,10 +439,8 @@ def main(
         if reports_path:
             report_file = os.path.join(reports_path, report["file_path"])
 
-            try:
+            with contextlib.suppress(FileExistsError):
                 os.makedirs(os.path.dirname(report_file))
-            except FileExistsError:
-                pass
 
             with open(report_file, "w", encoding="locale") as f:
                 f.write(report["content"])

tools/qontract_cli.py

@@ -2799,7 +2799,7 @@ def jenkins_jobs(ctx):
 
             for pj in project["jobs"]:
                 for job in pj.values():
-                    node = job["node"] if "node" in job else root_node
+                    node = job.get("node", root_node)
                     if node in {"rhel8", "rhel8-app-interface"}:
                         apps[app_name]["rhel8"] += 1
                         totals["rhel8"] += 1