lists and dicts can be handled in raise_for_status (#1234)

* lists and dicts can be handled in raise_for_status

* Fixed some formatting

---------

Co-authored-by: [email protected] <[email protected]>

Author: Ch3ri0ur

atlassian/rest_client.py

@@ -476,13 +476,13 @@ def raise_for_status(self, response):
                 if self.url == "https://api.atlassian.com":
                     error_msg = "\n".join([k + ": " + v for k, v in j.items()])
                 else:
-                    error_msg = "\n".join(
-                        j.get("errorMessages", list())
-                        + [
-                            k.get("message", "") if isinstance(k, dict) else v
-                            for k, v in j.get("errors", dict()).items()
-                        ]
-                    )
+                    error_msg_list = j.get("errorMessages", list())
+                    errors = j.get("errors", dict())
+                    if isinstance(errors, dict):
+                        error_msg_list.append(errors.get("message", ""))
+                    elif isinstance(errors, list):
+                        error_msg_list.extend([v.get("message", "") if isinstance(v, dict) else v for v in errors])
+                    error_msg = "\n".join(error_msg_list)
             except Exception as e:
                 log.error(e)
                 response.raise_for_status()

tests/mockup.py

@@ -39,6 +39,8 @@ def request_mockup(*args, **kwargs):
                     response.status_code = data.pop("status_code")
                 else:
                     response.status_code = 200
+                if "headers" in data:
+                    response.headers = data.pop("headers")
 
                 # Extend the links with the server
                 for item in [None, "owner", "project", "workspace"]:

tests/responses/jira/rest/api/2/issue/POST

@@ -3,3 +3,14 @@ responses['{"fields": {"issuetype": "foo", "summary": "summary", "project": "pro
     "errorMessages": [],
     "errors": {"labels": "Field 'labels' cannot be set. It is not on the appropriate screen, or unknown."},
 }
+responses['{"fields": {"issuetype": "fail", "summary": "authentication", "project": "project"}}'] = {
+    "status_code": 401,
+    "headers": {"Content-Type": "application/json;charset=UTF-8"},
+    "errors": [
+        {
+            "context": None,
+            "message": "Authentication failed. Please check your credentials and try again.",
+            "exceptionName": "com.atlassian.bitbucket.auth.IncorrectPasswordAuthenticationException",
+        }
+    ],
+}

tests/test_jira.py

@@ -49,3 +49,8 @@ def test_post_issue_with_invalid_request(self):
         """Post an issue but receive a 400 error response"""
         with self.assertRaises(HTTPError):
             self.jira.create_issue(fields={"issuetype": "foo", "summary": "summary", "project": "project"})
+
+    def test_post_issue_expect_failed_authentication(self):
+        """Post an issue but receive a 401 error response"""
+        with self.assertRaises(HTTPError):
+            self.jira.create_issue(fields={"issuetype": "fail", "summary": "authentication", "project": "project"})