qontract-reconcile 0.10.2.dev255__py3-none-any.whl → 0.10.2.dev257__py3-none-any.whl

reconcile/utils/ocm/products.py

@@ -23,7 +23,7 @@ from reconcile.ocm.types import (
 from reconcile.utils.exceptions import ParameterError
 from reconcile.utils.ocm.clusters import get_provisioning_shard_id
 from reconcile.utils.ocm_base_client import OCMBaseClient
-from reconcile.utils.rosa.rosa_cli import RosaCliException
+from reconcile.utils.rosa.rosa_cli import RosaCliError
 from reconcile.utils.rosa.session import RosaSessionBuilder
 
 CS_API_BASE = "/api/clusters_mgmt"
@@ -61,7 +61,7 @@ OCM_PRODUCT_ROSA = "rosa"
 OCM_PRODUCT_HYPERSHIFT = "hypershift"
 
 
-class OCMValidationException(Exception):
+class OCMValidationError(Exception):
     pass
 
 
@@ -216,7 +216,7 @@ class OCMProductOsd(OCMProduct):
             None,
         )
         if default_machine_pool is None:
-            raise OCMValidationException(
+            raise OCMValidationError(
                 f"No default machine pool found, id: {DEFAULT_OCM_MACHINE_POOL_ID}"
             )
 
@@ -350,10 +350,10 @@ class OCMProductRosa(OCMProduct):
             )
             logging.info("cluster creation kicked off...")
             result.write_logs_to_logger(logging.info)
-        except RosaCliException as e:
+        except RosaCliError as e:
             logs = "".join(e.get_log_lines(max_lines=10, from_file_end=True))
             e.cleanup()
-            raise OCMValidationException(
+            raise OCMValidationError(
                 f"last 10 lines from failed cluster creation job...\n\n{logs}"
             ) from None
 
@@ -459,7 +459,7 @@ class OCMProductRosa(OCMProduct):
             None,
         )
         if default_machine_pool is None:
-            raise OCMValidationException(
+            raise OCMValidationError(
                 f"No default machine pool found, id: {DEFAULT_OCM_MACHINE_POOL_ID}"
             )
 
@@ -625,10 +625,10 @@ class OCMProductHypershift(OCMProduct):
             )
             logging.info("cluster creation kicked off...")
             result.write_logs_to_logger(logging.info)
-        except RosaCliException as e:
+        except RosaCliError as e:
             logs = "".join(e.get_log_lines(max_lines=10, from_file_end=True))
             e.cleanup()
-            raise OCMValidationException(
+            raise OCMValidationError(
                 f"last 10 lines from failed cluster creation job...\n\n{logs}"
             ) from None
 

reconcile/utils/ocm/search_filters.py

@@ -182,7 +182,7 @@ class InvalidFilterError(Exception):
     pass
 
 
-class InvalidChunkRequest(Exception):
+class InvalidChunkRequestError(Exception):
     """
     Is raised for various reasons, when a chunk request on a filter is invalid
     """
@@ -344,7 +344,7 @@ class Filter:
         if ignore_missing:
             return [self]
 
-        raise InvalidChunkRequest(
+        raise InvalidChunkRequestError(
             f"cannot chunk by {key} because it is not a list condition"
         )
 

reconcile/utils/openshift_resource.py

@@ -375,7 +375,7 @@ class OpenshiftResource:
         annotations = body["metadata"]["annotations"]
         return annotations["qontract.sha256sum"]
 
-    def toJSON(self):
+    def to_json(self):
         return self.serialize(self.body)
 
     @staticmethod
@@ -445,13 +445,12 @@ class OpenshiftResource:
         if body["kind"] == "ServiceAccount":
             if "imagePullSecrets" in body:
                 # remove default pull secrets added by k8s
-                imagePullSecrets = [
+                if imagepullsecrets := [
                     s
                     for s in body.pop("imagePullSecrets")
                     if "-dockercfg-" not in s["name"]
-                ]
-                if imagePullSecrets:
-                    body["imagePullSecrets"] = imagePullSecrets
+                ]:
+                    body["imagePullSecrets"] = imagepullsecrets
             if "secrets" in body:
                 body.pop("secrets")
 
@@ -478,13 +477,15 @@ class OpenshiftResource:
             if "userNames" in body:
                 body.pop("userNames")
             if "roleRef" in body:
-                roleRef = body["roleRef"]
-                if "namespace" in roleRef:
-                    roleRef.pop("namespace")
-                if "apiGroup" in roleRef and roleRef["apiGroup"] in body["apiVersion"]:
-                    roleRef.pop("apiGroup")
-                if "kind" in roleRef:
-                    roleRef.pop("kind")
+                if "namespace" in body["roleRef"]:
+                    body["roleRef"].pop("namespace")
+                if (
+                    "apiGroup" in body["roleRef"]
+                    and body["roleRef"]["apiGroup"] in body["apiVersion"]
+                ):
+                    body["roleRef"].pop("apiGroup")
+                if "kind" in body["roleRef"]:
+                    body["roleRef"].pop("kind")
             for subject in body["subjects"]:
                 if "namespace" in subject:
                     subject.pop("namespace")
@@ -497,11 +498,13 @@ class OpenshiftResource:
             if "userNames" in body:
                 body.pop("userNames")
             if "roleRef" in body:
-                roleRef = body["roleRef"]
-                if "apiGroup" in roleRef and roleRef["apiGroup"] in body["apiVersion"]:
-                    roleRef.pop("apiGroup")
-                if "kind" in roleRef:
-                    roleRef.pop("kind")
+                if (
+                    "apiGroup" in body["roleRef"]
+                    and body["roleRef"]["apiGroup"] in body["apiVersion"]
+                ):
+                    body["roleRef"].pop("apiGroup")
+                if "kind" in body["roleRef"]:
+                    body["roleRef"].pop("kind")
             if "groupNames" in body:
                 body.pop("groupNames")
         if body["kind"] == "Service":
@@ -532,7 +535,7 @@ class OpenshiftResource:
 
 def fully_qualified_kind(kind: str, api_version: str) -> str:
     if "/" in api_version:
-        group = api_version.split("/")[0]
+        group = api_version.split("/")[0]  # noqa: PLC0207
         return f"{kind}.{group}"
     return kind
 

reconcile/utils/pagerduty_api.py

@@ -20,11 +20,11 @@ from reconcile.utils.secret_reader import (
 )
 
 
-class PagerDutyTargetException(Exception):
+class PagerDutyTargetError(Exception):
     """This exception is raised when PagerDutyTarget is not configured correctly."""
 
 
-class PagerDutyApiException(Exception):
+class PagerDutyApiError(Exception):
     """This exception is raised when PagerDuty API call fails."""
 
 
@@ -89,7 +89,7 @@ class PagerDutyApi:
                 users = self.get_escalation_policy_users(resource_id, now)
         except requests.exceptions.HTTPError as e:
             logging.error(str(e))
-            raise PagerDutyApiException(str(e)) from e
+            raise PagerDutyApiError(str(e)) from e
 
         return users
 
@@ -189,7 +189,7 @@ def get_pagerduty_name(user: PagerDutyUser) -> str:
     return user.pagerduty_username or user.org_username
 
 
-@retry(no_retry_exceptions=PagerDutyTargetException)
+@retry(no_retry_exceptions=PagerDutyTargetError)
 def get_usernames_from_pagerduty(
     pagerduties: Iterable[PagerDutyTarget],
     users: Iterable[PagerDutyUser],
@@ -202,7 +202,7 @@ def get_usernames_from_pagerduty(
     all_pagerduty_names = [get_pagerduty_name(u) for u in users]
     for pagerduty in pagerduties:
         if pagerduty.schedule_id is None and pagerduty.escalation_policy_id is None:
-            raise PagerDutyTargetException(
+            raise PagerDutyTargetError(
                 f"pagerduty {pagerduty.name}: Either schedule_id or escalation_policy_id must be set!"
             )
         if pagerduty.schedule_id is not None:

reconcile/utils/quay_api.py

@@ -1,7 +1,7 @@
 import requests
 
 
-class QuayTeamNotFoundException(Exception):
+class QuayTeamNotFoundError(Exception):
     pass
 
 
@@ -34,7 +34,7 @@ class QuayApi:
 
         r = requests.get(url, headers=self.auth_header, timeout=self._timeout)
         if r.status_code == 404:
-            raise QuayTeamNotFoundException(
+            raise QuayTeamNotFoundError(
                 f"team {team} is not found in "
                 f"org {self.organization}. "
                 f"contact org owner to create the "

reconcile/utils/rosa/rosa_cli.py

@@ -91,7 +91,7 @@ class RosaCliResult:
             self.log_handle.cleanup()
 
 
-class RosaCliException(Exception, RosaCliResult):
+class RosaCliError(Exception, RosaCliResult):
     """
     Represents an exception that occurred during a ROSA CLI execution.
     """

reconcile/utils/rosa/session.py

@@ -11,7 +11,7 @@ from reconcile.utils.jobcontroller.models import JobConcurrencyPolicy, JobStatus
 from reconcile.utils.ocm_base_client import OCMBaseClient
 from reconcile.utils.rosa.rosa_cli import (
     LogHandle,
-    RosaCliException,
+    RosaCliError,
     RosaCliResult,
     RosaJob,
 )
@@ -106,7 +106,7 @@ class RosaSession:
         log_dir = tempfile.mkdtemp()
         log_file_name = self.job_controller.store_job_logs(job.name(), log_dir)
         if status != JobStatus.SUCCESS:
-            raise RosaCliException(status, cmd, LogHandle(log_file_name))
+            raise RosaCliError(status, cmd, LogHandle(log_file_name))
         return RosaCliResult(status, cmd, LogHandle(log_file_name))
 
     def create_hcp_cluster(

reconcile/utils/runtime/desired_state_diff.py

@@ -97,13 +97,13 @@ def _extract_diffs_task(
         return_value[EXTRACT_TASK_RESULT_KEY_ERROR] = e
 
 
-class DiffDetectionTimeout(Exception):
+class DiffDetectionTimeoutError(Exception):
     """
     Raised when the fine grained diff detection takes too long.
     """
 
 
-class DiffDetectionFailure(Exception):
+class DiffDetectionFailureError(Exception):
     """
     Raised when the fine grained diff detection fails.
     """
@@ -155,20 +155,20 @@ def extract_diffs_with_timeout(
         )
         process.terminate()
         process.join()
-        raise DiffDetectionTimeout()
+        raise DiffDetectionTimeoutError()
 
     if EXTRACT_TASK_RESULT_KEY_DIFFS in result_value:
         return result_value[EXTRACT_TASK_RESULT_KEY_DIFFS]
 
     original_error = result_value.get(EXTRACT_TASK_RESULT_KEY_ERROR)
     if original_error:
-        raise DiffDetectionFailure() from original_error
+        raise DiffDetectionFailureError() from original_error
 
     # not every error situation of the diff extraction process
     # will result in an exception. the lack of a result is an error
     # indicator as well. in those cases, we raise at least
     # a generic exception to indicate that something went wrong
-    raise DiffDetectionFailure("unknown error during fine grained diff detection")
+    raise DiffDetectionFailureError("unknown error during fine grained diff detection")
 
 
 def build_desired_state_diff(
@@ -211,12 +211,12 @@ def build_desired_state_diff(
                     ShardedRunProposal(proposed_shards=changed_shards)
                 ):
                     shards = changed_shards
-    except DiffDetectionTimeout:
+    except DiffDetectionTimeoutError:
         logging.warning(
             f"unable to extract fine grained diffs for shard extraction "
             f"within {exract_diff_timeout_seconds} seconds. continue without sharding"
         )
-    except DiffDetectionFailure as e:
+    except DiffDetectionFailureError as e:
         logging.warning(
             f"unable to extract fine grained diffs for shard extraction: {e}"
         )

reconcile/utils/saasherder/interfaces.py

@@ -1,3 +1,4 @@
+# ruff: noqa: N801
 from __future__ import annotations
 
 from collections.abc import Mapping, Sequence, Set

reconcile/utils/saasherder/models.py

@@ -271,7 +271,7 @@ class ImageAuth:
     auth_server: str | None = None
     docker_config: dict[str, dict[str, dict[str, str]]] | None = None
 
-    def getDockerConfigJson(self) -> dict:
+    def get_docker_config_json(self) -> dict:
         if self.docker_config:
             return self.docker_config
         else:

reconcile/utils/saasherder/saasherder.py

@@ -726,7 +726,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         saas_file: SaasFile,
         trigger_reason: str,
     ) -> tuple[str, str]:
-        [url, sha] = trigger_reason.split(" ")[0].split("/commit/")
+        [url, sha] = trigger_reason.split(" ")[0].split("/commit/")  # noqa: PLC0207
         repo_info = VCS.parse_repo_url(url)
         repo_name = repo_info.name
         file_name = f"{repo_name.replace('/', '-')}-{sha}.tar.gz"

reconcile/utils/secret_reader.py

@@ -18,11 +18,11 @@ from reconcile.utils import (
 from reconcile.utils.vault import VaultClient
 
 
-class VaultForbidden(Exception):
+class VaultForbiddenError(Exception):
     pass
 
 
-class SecretNotFound(Exception):
+class SecretNotFoundError(Exception):
     pass
 
 
@@ -162,11 +162,11 @@ class VaultSecretReader(SecretReaderBase):
                 )
             )
         except Forbidden:
-            raise VaultForbidden(
+            raise VaultForbiddenError(
                 f"permission denied reading vault secret at {path}"
             ) from None
-        except vault.SecretNotFound as e:
-            raise SecretNotFound(*e.args) from e
+        except vault.SecretNotFoundError as e:
+            raise SecretNotFoundError(*e.args) from e
         return data
 
     def _read(
@@ -181,8 +181,8 @@ class VaultSecretReader(SecretReaderBase):
                     version=version,
                 )
             )
-        except vault.SecretNotFound as e:
-            raise SecretNotFound(*e.args) from e
+        except vault.SecretNotFoundError as e:
+            raise SecretNotFoundError(*e.args) from e
         return data
 
 
@@ -203,8 +203,8 @@ class ConfigSecretReader(SecretReaderBase):
                     version=version,
                 )
             )
-        except config.SecretNotFound as e:
-            raise SecretNotFound(*e.args) from e
+        except config.SecretNotFoundError as e:
+            raise SecretNotFoundError(*e.args) from e
         return data
 
     def _read_all(
@@ -219,8 +219,8 @@ class ConfigSecretReader(SecretReaderBase):
                     version=version,
                 )
             )
-        except config.SecretNotFound as e:
-            raise SecretNotFound(*e.args) from e
+        except config.SecretNotFoundError as e:
+            raise SecretNotFoundError(*e.args) from e
         return data
 
 
@@ -279,13 +279,13 @@ class SecretReader(SecretReaderBase):
         if self.settings and self.settings.get("vault"):
             try:
                 data = self.vault_client.read(params)  # type: ignore[attr-defined] # mypy doesn't recognize the VaultClient.__new__ method
-            except vault.SecretNotFound as e:
-                raise SecretNotFound(*e.args) from e
+            except vault.SecretNotFoundError as e:
+                raise SecretNotFoundError(*e.args) from e
         else:
             try:
                 data = config.read(params)
-            except config.SecretNotFound as e:
-                raise SecretNotFound(*e.args) from e
+            except config.SecretNotFoundError as e:
+                raise SecretNotFoundError(*e.args) from e
 
         return data
 
@@ -314,15 +314,15 @@ class SecretReader(SecretReaderBase):
             try:
                 data = self.vault_client.read_all(params)  # type: ignore[attr-defined] # mypy doesn't recognize the VaultClient.__new__ method
             except Forbidden:
-                raise VaultForbidden(
+                raise VaultForbiddenError(
                     f"permission denied reading vault secret at {path}"
                 ) from None
-            except vault.SecretNotFound as e:
-                raise SecretNotFound(*e.args) from e
+            except vault.SecretNotFoundError as e:
+                raise SecretNotFoundError(*e.args) from e
         else:
             try:
                 data = config.read_all(params)
-            except config.SecretNotFound as e:
-                raise SecretNotFound(*e.args) from e
+            except config.SecretNotFoundError as e:
+                raise SecretNotFoundError(*e.args) from e
 
         return data

reconcile/utils/slack_api.py

@@ -28,11 +28,11 @@ MAX_RETRIES = 5
 TIMEOUT = 30
 
 
-class UserNotFoundException(Exception):
+class UserNotFoundError(Exception):
     pass
 
 
-class UsergroupNotFoundException(Exception):
+class UsergroupNotFoundError(Exception):
     pass
 
 
@@ -296,7 +296,7 @@ class SlackApi:
     def get_usergroup_id(self, handle: str) -> str | None:
         try:
             return self.get_usergroup(handle)["id"]
-        except UsergroupNotFoundException:
+        except UsergroupNotFoundError:
             return None
 
     def _initiate_usergroups(self) -> None:
@@ -317,7 +317,7 @@ class SlackApi:
             self._initiate_usergroups()
         usergroup = [g for g in self.usergroups if g["handle"] == handle]
         if len(usergroup) != 1:
-            raise UsergroupNotFoundException(handle)
+            raise UsergroupNotFoundError(handle)
         return usergroup[0]
 
     def create_usergroup(self, handle: str) -> str:
@@ -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"]) from None
+                raise UserNotFoundError(e.response["error"]) from None
             raise
 
         return result["user"]["id"]
@@ -415,11 +415,19 @@ class SlackApi:
             k: v["name"] for k, v in self._get("channels").items() if k in channels_ids
         }
 
+    @staticmethod
+    def extract_name_from_user(user: dict[str, Any]) -> str | None:
+        if email := user["profile"].get("email"):
+            return email.split("@")[0]
+        return None
+
     def get_active_users_by_names(self, user_names: Iterable[str]) -> dict[str, str]:
         return {
-            k: v["name"]
+            k: name
             for k, v in self._get("users").items()
-            if v["name"] in user_names and not v["deleted"]
+            if not v["deleted"]
+            and (name := self.extract_name_from_user(v))
+            and name in user_names
         }
 
     def get_users_by_ids(self, users_ids: Iterable[str]) -> dict[str, str]:
@@ -428,9 +436,10 @@ class SlackApi:
             self._translate_user_id(user_id) for user_id in users_ids
         )
         return {
-            user_id: user["name"]
+            user_id: name
             for user_id in translated_user_ids
             if (user := users.get(user_id))
+            and (name := self.extract_name_from_user(user))
         }
 
     def _get(self, resource: str) -> dict[str, Any]:

reconcile/utils/slo_document_manager.py

@@ -24,15 +24,15 @@ DEFAULT_RETRIES = 3
 DEFAULT_THREAD_POOL_SIZE = 10
 
 
-class EmptySLOResult(Exception):
+class EmptySLOResultError(Exception):
     pass
 
 
-class EmptySLOValue(Exception):
+class EmptySLOValueError(Exception):
     pass
 
 
-class InvalidSLOValue(Exception):
+class InvalidSLOValueError(Exception):
     pass
 
 
@@ -104,13 +104,13 @@ class PrometheusClient(ApiBase):
     def _extract_current_slo_value(self, data: dict[str, Any]) -> float:
         result = data["data"]["result"]
         if not result:
-            raise EmptySLOResult("prometheus returned empty result")
+            raise EmptySLOResultError("prometheus returned empty result")
         slo_value = result[0]["value"]
         if not slo_value:
-            raise EmptySLOValue("prometheus returned empty SLO value")
+            raise EmptySLOValueError("prometheus returned empty SLO value")
         slo_value = float(slo_value[1])
         if isnan(slo_value):
-            raise InvalidSLOValue("slo value should be a number")
+            raise InvalidSLOValueError("slo value should be a number")
         return slo_value
 
 

reconcile/utils/state.py

@@ -39,7 +39,7 @@ from reconcile.utils.secret_reader import (
 )
 
 
-class StateInaccessibleException(Exception):
+class StateInaccessibleError(Exception):
     pass
 
 
@@ -180,7 +180,7 @@ def acquire_state_settings(
             state_bucket_account_name, query_func=query_func
         )
         if not account:
-            raise StateInaccessibleException(
+            raise StateInaccessibleError(
                 f"The AWS account {state_bucket_account_name} that holds the state bucket can't be found in app-interface."
             )
         secret = secret_reader.read_all_secret(account.automation_token)
@@ -203,11 +203,11 @@ def acquire_state_settings(
                 access_key_id=secret["aws_access_key_id"],
                 secret_access_key=secret["aws_secret_access_key"],
             )
-        raise StateInaccessibleException(
+        raise StateInaccessibleError(
             f"The app-interface state provider {ai_settings.provider} is not supported."
         )
 
-    raise StateInaccessibleException(
+    raise StateInaccessibleError(
         "app-interface state must be configured to use stateful integrations. "
         "use one of the following options to provide state config: "
         "* env vars APP_INTERFACE_STATE_BUCKET, APP_INTERFACE_STATE_BUCKET_REGION, APP_INTERFACE_STATE_AWS_PROFILE and AWS_CONFIG (hosting the requested profile) \n"
@@ -218,7 +218,7 @@ def acquire_state_settings(
     )
 
 
-class AbortStateTransaction(Exception):
+class AbortStateTransactionError(Exception):
     """Raise to abort a state transaction."""
 
 
@@ -249,7 +249,7 @@ class State:
         try:
             self.client.head_bucket(Bucket=self.bucket)
         except ClientError as details:
-            raise StateInaccessibleException(
+            raise StateInaccessibleError(
                 f"Bucket {self.bucket} is not accessible - {details!s}"
             ) from None
 
@@ -299,7 +299,7 @@ class State:
             if error_code == "404":
                 return False, {}
 
-            raise StateInaccessibleException(
+            raise StateInaccessibleError(
                 f"Can not access state key {key_path} "
                 f"in bucket {self.bucket} - {details!s}"
             ) from None
@@ -436,7 +436,7 @@ class State:
         state_obj = TransactionStateObj(key, value=current_value)
         try:
             yield state_obj
-        except AbortStateTransaction:
+        except AbortStateTransactionError:
             return
         else:
             if state_obj.changed and state_obj.value != current_value:

reconcile/utils/terraform_client.py

@@ -913,13 +913,13 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             )
 
 
-class TerraformPlanFailed(Exception):
+class TerraformPlanFailedError(Exception):
     pass
 
 
-class TerraformApplyFailed(Exception):
+class TerraformApplyFailedError(Exception):
     pass
 
 
-class TerraformDeletionDetected(Exception):
+class TerraformDeletionDetectedError(Exception):
     pass

reconcile/utils/terrascript/cloudflare_client.py

@@ -302,9 +302,9 @@ def _get_terraform_s3_state_key_name(
     return sharding_strategy.get_object_key(integration)
 
 
-class IntegrationUndefined(Exception):
+class IntegrationUndefinedError(Exception):
     pass
 
 
-class InvalidTerraformState(Exception):
+class InvalidTerraformStateError(Exception):
     pass

reconcile/utils/terrascript/cloudflare_resources.py

@@ -1,3 +1,4 @@
+# ruff: noqa: N801
 from collections.abc import (
     Iterable,
     MutableMapping,