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

reconcile/utils/internal_groups/client.py

@@ -46,7 +46,7 @@ class InternalGroupsApi:
             resp.raise_for_status()
         except requests.exceptions.HTTPError as e:
             if e.response is not None and e.response.status_code == 404:
-                raise NotFound
+                raise NotFound(e.response.text) from e
             raise
 
     def __enter__(self) -> Self:

reconcile/utils/jinja2/utils.py

@@ -175,9 +175,9 @@ def lookup_secret(
     except (SecretNotFound, SecretFieldNotFound) as e:
         if allow_not_found:
             return None
-        raise FetchSecretError(e)
+        raise FetchSecretError(e) from None
     except Exception as e:
-        raise FetchSecretError(e)
+        raise FetchSecretError(e) from e
 
 
 def process_jinja2_template(
@@ -221,12 +221,12 @@ def process_jinja2_template(
     })
     if "_template_mocks" in vars:
         for k, v in vars["_template_mocks"].items():
-            vars[k] = lambda *args, **kwargs: v
+            vars[k] = lambda *args, **kwargs: v  # noqa: B023
     try:
         template = compile_jinja2_template(body, extra_curly, template_render_options)
         r = template.render(vars)
     except Exception as e:
-        raise Jinja2TemplateError(e)
+        raise Jinja2TemplateError(e) from None
     return r
 
 

reconcile/utils/jobcontroller/models.py

@@ -160,7 +160,7 @@ class K8sJob(ABC):
                     )
                 ),
             )
-            for secret_key_name in self.secret_data().keys()
+            for secret_key_name in self.secret_data()
         ]
 
     def scripts_volume_mount(self, directory: str) -> V1VolumeMount:
@@ -189,7 +189,7 @@ class K8sJob(ABC):
                         key=script_name,
                         path=script_name,
                     )
-                    for script_name in self.scripts().keys()
+                    for script_name in self.scripts()
                 ],
             ),
         )

reconcile/utils/jump_host.py

@@ -90,7 +90,7 @@ class JumpHostSSH(JumpHostBase):
         try:
             known_hosts = self._gql_api.get_resource(known_hosts_path)
         except gql.GqlGetResourceError as e:
-            raise FetchResourceError(str(e))
+            raise FetchResourceError(str(e)) from None
         return known_hosts["content"]
 
     def _init_known_hosts_file(self) -> None:

reconcile/utils/ldap_client.py

@@ -33,7 +33,7 @@ class LdapClient:
         _, _, results, _ = self.connection.search(
             self.base_dn, f"(&(objectclass=person)(|{user_filter}))", attributes=["uid"]
         )
-        return set(r["attributes"]["uid"][0] for r in results)
+        return {r["attributes"]["uid"][0] for r in results}
 
     def get_group_members(self, groups_dns: set[str]) -> dict[str, set[str]]:
         """

reconcile/utils/merge_request_manager/merge_request_manager.py

@@ -43,10 +43,7 @@ class MergeRequestManagerBase(Generic[T]):
     ) -> OpenMergeRequest | None:
         for mr in self._open_mrs:
             mr_info_dict = mr.mr_info.dict()
-            if all(
-                mr_info_dict.get(k) == expected_data.get(k)
-                for k in expected_data.keys()
-            ):
+            if all(mr_info_dict.get(k) == expected_data.get(k) for k in expected_data):
                 return mr
 
         return None

reconcile/utils/models.py

@@ -94,10 +94,7 @@ class CSV(list[str]):
 
     @classmethod
     def validate(cls, value: str) -> list[str]:
-        if not value:
-            items = []
-        else:
-            items = value.split(",")
+        items = [] if not value else value.split(",")
         return items
 
     @classmethod
@@ -123,4 +120,4 @@ def cron_validator(value: str) -> str:
         croniter(value)
         return value
     except ValueError as e:
-        raise ValueError(f"Invalid cron expression: {e}")
+        raise ValueError(f"Invalid cron expression: {e}") from None

reconcile/utils/oc.py

@@ -231,14 +231,10 @@ def equal_spec_template(t1: dict, t2: dict) -> bool:
     """Compare two spec.templates."""
     t1_copy = copy.deepcopy(t1)
     t2_copy = copy.deepcopy(t2)
-    try:
+    with suppress(KeyError):
         del t1_copy["metadata"]["labels"]["pod-template-hash"]
-    except KeyError:
-        pass
-    try:
+    with suppress(KeyError):
         del t2_copy["metadata"]["labels"]["pod-template-hash"]
-    except KeyError:
-        pass
     return t1_copy == t2_copy
 
 
@@ -740,11 +736,11 @@ class OCCli:  # pylint: disable=too-many-public-methods
         cmd = ["logs", "--all-containers=true", "-n", namespace, f"job/{name}"]
         if follow:
             cmd.append("-f")
-        # pylint: disable=consider-using-with
+
         if isinstance(output, TextIOWrapper):
             output_file = output
         else:
-            output_file = open(os.path.join(output, name), "w", encoding="locale")
+            output_file = open(os.path.join(output, name), "w", encoding="locale")  # noqa: SIM115
 
         if wait_for_logs_process:
             subprocess.run(self.oc_base_cmd + cmd, stdout=output_file, check=False)
@@ -1138,7 +1134,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
         try:
             out_json = json.loads(out)
         except ValueError as e:
-            raise JSONParsingError(out + "\n" + str(e))
+            raise JSONParsingError(out + "\n" + str(e)) from e
 
         return out_json
 
@@ -1280,13 +1276,13 @@ class OCNative(OCCli):
 
     @retry(exceptions=(ServerTimeoutError, InternalServerError, ForbiddenError))
     def _get_client(self, server, token):
-        opts = dict(
-            api_key={"authorization": f"Bearer {token}"},
-            host=server,
-            verify_ssl=False,
+        opts = {
+            "api_key": {"authorization": f"Bearer {token}"},
+            "host": server,
+            "verify_ssl": False,
             # default timeout seems to be 1+ minutes
-            retries=5,
-        )
+            "retries": 5,
+        }
         if self.jump_host:
             # the ports could be parameterized, but at this point
             # we only have need of 1 tunnel for 1 service
@@ -1307,7 +1303,7 @@ class OCNative(OCCli):
         try:
             return DynamicClient(k8s_client, discoverer=OpenshiftLazyDiscoverer)
         except urllib3.exceptions.MaxRetryError as e:
-            raise StatusCodeError(f"[{self.server}]: {e}")
+            raise StatusCodeError(f"[{self.server}]: {e}") from None
 
     def _get_obj_client(self, kind, group_version):
         key = f"{kind}.{group_version}"
@@ -1380,7 +1376,7 @@ class OCNative(OCCli):
         except NotFoundError as e:
             if allow_not_found:
                 return {}
-            raise StatusCodeError(f"[{self.server}]: {e}")
+            raise StatusCodeError(f"[{self.server}]: {e}") from None
 
     def get_all(self, kind, all_namespaces=False):
         k, group_version = self._parse_kind(kind)
@@ -1388,7 +1384,7 @@ class OCNative(OCCli):
         try:
             return obj_client.get(_request_timeout=REQUEST_TIMEOUT).to_dict()
         except NotFoundError as e:
-            raise StatusCodeError(f"[{self.server}]: {e}")
+            raise StatusCodeError(f"[{self.server}]: {e}") from None
 
 
 OCClient = OCNative | OCCli
@@ -1640,10 +1636,7 @@ class OC_Map:
                 )
                 return
 
-            if self.use_jump_host:
-                jump_host = cluster_info.get("jumpHost")
-            else:
-                jump_host = None
+            jump_host = cluster_info.get("jumpHost") if self.use_jump_host else None
             if jump_host:
                 self.set_jh_ports(jump_host)
             try:
@@ -1846,17 +1839,14 @@ class OpenshiftLazyDiscoverer(LazyDiscoverer):
             ]
         # If there are multiple matches, prefer non-List kinds
         if len(results) > 1 and not all(  # pylint: disable=R1729
-            [isinstance(x, ResourceList) for x in results]
+            isinstance(x, ResourceList) for x in results
         ):
             results = [
                 result for result in results if not isinstance(result, ResourceList)
             ]
         # if multiple resources are found that share a GVK, prefer the one with the most supported verbs
-        if (
-            len(results) > 1
-            and len(set((x.group_version, x.kind) for x in results)) == 1
-        ):
-            if len(set(len(x.verbs) for x in results)) != 1:
+        if len(results) > 1 and len({(x.group_version, x.kind) for x in results}) == 1:
+            if len({len(x.verbs) for x in results}) != 1:
                 results = [max(results, key=lambda x: len(x.verbs))]
         if len(results) == 1:
             return results[0]

reconcile/utils/ocm/ocm.py

@@ -828,7 +828,9 @@ class OCM:  # pylint: disable=too-many-public-methods
             try:
                 re.compile(b)
             except re.error:
-                raise TypeError(f"blocked version is not a valid regex expression: {b}")
+                raise TypeError(
+                    f"blocked version is not a valid regex expression: {b}"
+                ) from None
 
     @retry(max_attempts=10)
     def _do_get_request(self, api: str, params: Mapping[str, str]) -> dict[str, Any]:

reconcile/utils/ocm/products.py

@@ -354,7 +354,7 @@ class OCMProductRosa(OCMProduct):
             e.cleanup()
             raise OCMValidationException(
                 f"last 10 lines from failed cluster creation job...\n\n{logs}"
-            )
+            ) from None
 
     def update_cluster(
         self,
@@ -629,7 +629,7 @@ class OCMProductHypershift(OCMProduct):
             e.cleanup()
             raise OCMValidationException(
                 f"last 10 lines from failed cluster creation job...\n\n{logs}"
-            )
+            ) from None
 
     def update_cluster(
         self,

reconcile/utils/ocm/search_filters.py

@@ -56,7 +56,7 @@ class ListCondition(ABC, FilterCondition):
             raise InvalidFilterError(f"Cannot merge {self} with {other}")
         return type(self)(
             key=self.key,
-            values=sorted(list(set(self.values + other.values))),
+            values=sorted(set(self.values + other.values)),
         )
 
 
@@ -72,9 +72,7 @@ class EqCondition(ListCondition):
     def render(self) -> str:
         if len(self.values) == 1:
             return f"{self.key}='{self._escape_value(self.values[0])}'"
-        quoted_values = ",".join(
-            map(lambda x: f"'{self._escape_value(x)}'", self.values)
-        )
+        quoted_values = ",".join(f"'{self._escape_value(x)}'" for x in self.values)
         return f"{self.key} in ({quoted_values})"
 
     def _escape_value(self, value: Any) -> str:
@@ -93,9 +91,7 @@ class LikeCondition(ListCondition):
     def render(self) -> str:
         if len(self.values) == 1:
             return f"{self.key} like '{self.values[0]}'"
-        quoted_values = " or ".join(
-            map(lambda x: f"{self.key} like '{x}'", self.values)
-        )
+        quoted_values = " or ".join(f"{self.key} like '{x}'" for x in self.values)
         if len(self.values) > 1:
             return f"({quoted_values})"
         return quoted_values
@@ -284,10 +280,7 @@ class Filter:
         are None or empty, the condition is not added.
         """
         if values:
-            if isinstance(values, list):
-                value_list = values
-            else:
-                value_list = list(values)
+            value_list = values if isinstance(values, list) else list(values)
             value_list.sort()
             return self.add_condition(EqCondition(key, value_list))
         return self

reconcile/utils/ocm_base_client.py

@@ -84,10 +84,7 @@ class OCMBaseClient:
         max_page_size: int = 100,
         max_pages: int | None = None,
     ) -> Generator[dict[str, Any], None, None]:
-        if not params:
-            params_copy = {}
-        else:
-            params_copy = params.copy()
+        params_copy = {} if not params else params.copy()
         params_copy["size"] = max_page_size
 
         while True:

reconcile/utils/openshift_resource.py

@@ -1,4 +1,6 @@
+# ruff: noqa: SIM114
 import base64
+import contextlib
 import copy
 import datetime
 import hashlib
@@ -172,28 +174,22 @@ class OpenshiftResource:
             "uid",
             "fieldRef",
         ]
-        if val in ignorable_fields:
-            return True
-        return False
+        return val in ignorable_fields
 
     @staticmethod
     def ignorable_key_value_pair(key, val):
         ignorable_key_value_pair = {"annotations": None, "divisor": "0"}
-        if key in ignorable_key_value_pair and ignorable_key_value_pair[key] == val:
-            return True
-        return False
+        return bool(
+            key in ignorable_key_value_pair and ignorable_key_value_pair[key] == val
+        )
 
     @staticmethod
     def cpu_equal(val1, val2):
         # normalize both to string
-        try:
+        with contextlib.suppress(Exception):
             val1 = f"{int(float(val1) * 1000)}m"
-        except Exception:
-            pass
-        try:
+        with contextlib.suppress(Exception):
             val2 = f"{int(float(val2) * 1000)}m"
-        except Exception:
-            pass
         return val1 == val2
 
     @staticmethod
@@ -240,11 +236,11 @@ class OpenshiftResource:
 
     def verify_valid_k8s_object(self):
         try:
-            self.name  # pylint: disable=pointless-statement
-            self.kind  # pylint: disable=pointless-statement
+            assert self.name
+            assert self.kind
         except (KeyError, TypeError) as e:
             msg = f"resource invalid data ({e.__class__.__name__}). details: {self.error_details}"
-            raise ConstructResourceError(msg)
+            raise ConstructResourceError(msg) from None
 
         if self.kind not in {
             "Role",
@@ -348,10 +344,7 @@ class OpenshiftResource:
             openshift_resource: new OpenshiftResource object with
                 annotations.
         """
-        if canonicalize:
-            body = self.canonicalize(self.body)
-        else:
-            body = self.body
+        body = self.canonicalize(self.body) if canonicalize else self.body
 
         sha256sum = self.calculate_sha256sum(self.serialize(body))
 

reconcile/utils/quay_api.py

@@ -57,9 +57,7 @@ class QuayApi:
     def user_exists(self, user):
         url = f"{self.api_url}/users/{user}"
         r = requests.get(url, headers=self.auth_header, timeout=self._timeout)
-        if not r.ok:
-            return False
-        return True
+        return r.ok
 
     def remove_user_from_team(self, user, team):
         """Deletes an user from a team.

reconcile/utils/repo_owners.py

@@ -194,15 +194,9 @@ class RepoOwners:
     @staticmethod
     def _set_to_sorted_list(owners):
         approvers = owners["approvers"]
-        if approvers:
-            sorted_approvers = sorted(approvers)
-        else:
-            sorted_approvers = []
+        sorted_approvers = sorted(approvers) if approvers else []
 
         reviewers = owners["reviewers"]
-        if reviewers:
-            sorted_reviewers = sorted(reviewers)
-        else:
-            sorted_reviewers = []
+        sorted_reviewers = sorted(reviewers) if reviewers else []
 
         return {"approvers": sorted_approvers, "reviewers": sorted_reviewers}

reconcile/utils/runtime/runner.py

@@ -213,7 +213,7 @@ def _integration_dry_run(
             return_exceptions=True,
         )
 
-        for shard, result in zip(affected_shard_list, results):
+        for shard, result in zip(affected_shard_list, results, strict=False):
             if _is_task_result_an_error(result):
                 logging.error(f"Failed to run integration shard {shard}: {result}")
         failed_shards_count = sum(1 for _ in filter(_is_task_result_an_error, results))

reconcile/utils/saasherder/saasherder.py

@@ -698,11 +698,11 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         return namespaces
 
     def _collect_repo_urls(self) -> set[str]:
-        return set(
+        return {
             rt.url
             for saas_file in self.saas_files
             for rt in saas_file.resource_templates
-        )
+        }
 
     @staticmethod
     def _get_file_contents_github(repo: Repository, path: str, commit_sha: str) -> str:
@@ -1189,8 +1189,8 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         creds = self.secret_reader.read_all_secret(saas_file.authentication.image)
         required_docker_config_keys = [".dockerconfigjson"]
         required_keys_basic_auth = ["user", "token"]
-        ok = all(k in creds.keys() for k in required_keys_basic_auth) or all(
-            k in creds.keys() for k in required_docker_config_keys
+        ok = all(k in creds for k in required_keys_basic_auth) or all(
+            k in creds for k in required_docker_config_keys
         )
         if not ok:
             logging.warning(

reconcile/utils/secret_reader.py

@@ -164,7 +164,7 @@ class VaultSecretReader(SecretReaderBase):
         except Forbidden:
             raise VaultForbidden(
                 f"permission denied reading vault secret " f"at {path}"
-            )
+            ) from None
         except vault.SecretNotFound as e:
             raise SecretNotFound(*e.args) from e
         return data
@@ -316,7 +316,7 @@ class SecretReader(SecretReaderBase):
             except Forbidden:
                 raise VaultForbidden(
                     f"permission denied reading vault secret " f"at {path}"
-                )
+                ) from None
             except vault.SecretNotFound as e:
                 raise SecretNotFound(*e.args) from e
         else:

reconcile/utils/slack_api.py

@@ -398,7 +398,7 @@ class SlackApi:
             result = self._sc.users_lookupByEmail(email=f"{user_name}@{mail_address}")
         except SlackApiError as e:
             if e.response["error"] == "users_not_found":
-                raise UserNotFoundException(e.response["error"])
+                raise UserNotFoundException(e.response["error"]) from None
             raise
 
         return result["user"]["id"]

reconcile/utils/sqs_gateway.py

@@ -13,7 +13,7 @@ class SQSGateway:
     """Wrapper around SQS AWS SDK"""
 
     def __init__(self, accounts, secret_reader: SecretReader):
-        queue_url = os.environ.get("gitlab_pr_submitter_queue_url")
+        queue_url = os.environ.get("gitlab_pr_submitter_queue_url")  # noqa: SIM112
         if not queue_url:
             raise SQSGatewayInitError(
                 "when /app-interface/app-interface-settings-1.yml#mergeRequestGateway "

reconcile/utils/state.py

@@ -251,7 +251,7 @@ class State:
         except ClientError as details:
             raise StateInaccessibleException(
                 f"Bucket {self.bucket} is not accessible - {str(details)}"
-            )
+            ) from None
 
     def __enter__(self) -> Self:
         return self
@@ -302,7 +302,7 @@ class State:
             raise StateInaccessibleException(
                 f"Can not access state key {key_path} "
                 f"in bucket {self.bucket} - {str(details)}"
-            )
+            ) from None
 
     def ls(self) -> list[str]:
         """
@@ -407,10 +407,10 @@ class State:
             return json.loads(response["Body"].read())
         except ClientError as details:
             if details.response["Error"]["Code"] == "NoSuchKey":
-                raise KeyError(item)
+                raise KeyError(item) from None
             raise
         except json.decoder.JSONDecodeError:
-            raise KeyError(item)
+            raise KeyError(item) from None
 
     def __setitem__(self, key: str, value: Any) -> None:
         self._set(key, value)

reconcile/utils/terraform/config_client.py

@@ -84,7 +84,7 @@ class TerraformConfigClientCollection:
             except KeyError:
                 raise ClientNotRegisteredError(
                     f"There aren't any clients registered with the account name: {spec.provisioner_name}"
-                )
+                ) from None
             self.resource_spec_inventory[spec.id_object()] = spec
 
     def populate_resources(self) -> None:

reconcile/utils/terraform_client.py

@@ -407,7 +407,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                     f"[{account_name}] expiration not does not match "
                     f"date format {DATE_FORMAT}. details: "
                     f"type: {da['type']}, name: {da['name']}"
-                )
+                ) from None
             if (
                 resource_type == da["type"]
                 and resource_name == da["name"]
@@ -585,7 +585,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                         secret_copy["db.password"] = replica_src_password
 
             # clean metadata
-            for key in secret.keys():
+            for key in secret:
                 if integration_prefix in key:
                     secret_copy.pop(key)