suite-py 1.42.1__tar.gz → 1.42.2__tar.gz

{suite_py-1.42.1 → suite_py-1.42.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: suite-py
-Version: 1.42.1
+Version: 1.42.2
 Summary: 
 Author: larrywax, EugenioLaghi, michelangelomo
 Author-email: devops@prima.it
@@ -21,12 +21,12 @@ Requires-Dist: black (>=22.6,<25.0)
 Requires-Dist: boto3 (>=1.17.84)
 Requires-Dist: cement (>=3.0)
 Requires-Dist: colorama (>=0.4.3)
-Requires-Dist: cryptography (==43.0.0)
+Requires-Dist: cryptography (==43.0.1)
 Requires-Dist: halo (>=0.0.28)
 Requires-Dist: inquirer (==3.1.4)
 Requires-Dist: itsdangerous (==2.2.0)
 Requires-Dist: keyring (>=23.9.1,<26.0.0)
-Requires-Dist: kubernetes (==30.1.0)
+Requires-Dist: kubernetes (==31.0.0)
 Requires-Dist: logzero (==1.7.0)
 Requires-Dist: markupsafe (==2.0.1)
 Requires-Dist: pptree (==3.1)
@@ -36,7 +36,7 @@ Requires-Dist: pytest (>=7.0.0)
 Requires-Dist: python-dateutil (>=2.8.2)
 Requires-Dist: requests (>=2.26.0)
 Requires-Dist: requests-toolbelt (>=0.9.1)
-Requires-Dist: rich (==13.7.1)
+Requires-Dist: rich (==13.9.2)
 Requires-Dist: semver (>=2.13.0,<3.0.0)
 Requires-Dist: termcolor (>=1.1.0)
 Requires-Dist: truststore (>=0.7,<0.10) ; python_version >= "3.10"

{suite_py-1.42.1 → suite_py-1.42.2}/pyproject.toml

@@ -2,7 +2,7 @@
 authors = ["larrywax, EugenioLaghi, michelangelomo <devops@prima.it>"]
 description = ""
 name = "suite-py"
-version = "1.42.1"
+version = "1.42.2"
 
 [tool.poetry.dependencies]
 Click = ">=7.0"
@@ -19,7 +19,7 @@ halo = ">=0.0.28"
 inquirer = "==3.1.4"
 itsdangerous = "==2.2.0"
 keyring = ">=23.9.1,<26.0.0"
-kubernetes = "==30.1.0"
+kubernetes = "==31.0.0"
 logzero = "==1.7.0"
 markupsafe = "==2.0.1"
 pptree = "==3.1"
@@ -30,11 +30,11 @@ python = ">=3.8,<4.0"
 python-dateutil = ">=2.8.2"
 requests = ">=2.26.0"
 requests-toolbelt = ">=0.9.1"
-rich = "==13.7.1"
+rich = "==13.9.2"
 semver = "^2.13.0"
 termcolor = ">=1.1.0"
 truststore = {version = ">=0.7,<0.10", python = ">=3.10"}
-cryptography = "43.0.0"
+cryptography = "43.0.1"
 
 [tool.poetry.dev-dependencies]
 

{suite_py-1.42.1 → suite_py-1.42.2}/suite_py/__version__.py

@@ -1,2 +1,2 @@
 # -*- encoding: utf-8 -*-
-__version__ = "1.42.1"
+__version__ = "1.42.2"

{suite_py-1.42.1 → suite_py-1.42.2}/suite_py/cli.py

@@ -107,9 +107,11 @@ def catch_exceptions(func):
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
-        except ClickException as e:
-            raise e
         except Exception as e:
+            # Ignore all exception classes from the click module
+            if type(e).__module__.startswith("click."):
+                raise e
+
             logger.debug("An error occured:", exc_info=True)
             raise ClickException(f"{str(e)}. rerun with -v for more details") from e
 
@@ -168,7 +170,7 @@ def main(ctx, project, timeout, verbose):
     if not skip_confirmation and not prompt_utils.ask_confirm(
         f"Do you want to continue on project {os.path.basename(project)}?"
     ):
-        return
+        ctx.exit()
     if timeout:
         config.user["captainhook_timeout"] = timeout
 

{suite_py-1.42.1 → suite_py-1.42.2}/suite_py/lib/handler/okta_handler.py

@@ -9,7 +9,9 @@ _SCOPE = "openid offline_access"
 
 
 class OktaError(Exception):
-    pass
+    def __init__(self, message) -> None:
+        message = f"{message}\nTry relogging with 'suite-py login'"
+        super().__init__(message)
 
 
 class Okta:
@@ -38,15 +40,17 @@ class Okta:
 
         refresh_token = self._get_refresh_token()
         if not isinstance(refresh_token, str):
-            raise OktaError(
-                "Invalid okta refresh token. Try logging in with `suite-py login`"
+            raise OktaError("Invalid okta refresh token")
+
+        try:
+            res = oauth.do_refresh_token(
+                self._config.okta["client_id"],
+                self._config.okta["base_url"],
+                _SCOPE,
+                refresh_token,
             )
-        res = oauth.do_refresh_token(
-            self._config.okta["client_id"],
-            self._config.okta["base_url"],
-            _SCOPE,
-            refresh_token,
-        )
+        except oauth.OAuthError as e:
+            raise OktaError(f"Error refreshing a token with okta: {e}") from e
 
         return self._update_tokens(res)
 

{suite_py-1.42.1 → suite_py-1.42.2}/suite_py/lib/oauth.py

@@ -37,7 +37,7 @@ def retrieve_token(base_url, params) -> OAuthTokenResponse:
     data = requests.post(url, headers=headers, data=params, timeout=30).json()
     logger.debug(data)
 
-    if error := data.get("error_description", None):
+    if error := data.get("error_description", data.get("errorSummary", None)):
         raise OAuthError(f"OAuth error: {error}")
 
     return OAuthTokenResponse(