From d035bb768796fefff14f3e3ae5fe30636e0a1a22 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Fri, 14 Apr 2023 12:56:19 +0200
Subject: [PATCH] better error handing

---
 plugins/module_utils/ansible_requests.py | 37 ++++++++++++++++++++----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/plugins/module_utils/ansible_requests.py b/plugins/module_utils/ansible_requests.py
index 19cec6a912..8d574cde7d 100644
--- a/plugins/module_utils/ansible_requests.py
+++ b/plugins/module_utils/ansible_requests.py
@@ -18,14 +18,23 @@ def prepare_multipart(fields):
         raise NotImplementedError
 
 
+class RequestException(Exception):
+    def __init__(self, msg, response):
+        super(RequestException, self).__init__(msg)
+        self.response = response
+
+
 class RequestResponse(object):
     def __init__(self, resp):
         self._resp = resp
+        self._body = None
 
     @property
     def status_code(self):
         if hasattr(self._resp, 'status'):
             status = self._resp.status
+        elif hasattr(self._resp, 'code'):
+            status = self._resp.code
         else:
             status = self._resp.getcode()
         return status
@@ -38,8 +47,10 @@ def headers(self):
     def url(self):
         if hasattr(self._resp, 'url'):
             url = self._resp.url
-        else:
+        elif hasattr(self._resp, 'geturl'):
             url = self._resp.geturl()
+        else:
+            url = ""
         return url
 
     @property
@@ -50,6 +61,19 @@ def reason(self):
             reason = ""
         return reason
 
+    @property
+    def body(self):
+        if self._body is None:
+            try:
+                self._body = self._resp.read()
+            except Exception:
+                pass
+        return self._body
+
+    @property
+    def text(self):
+        return to_native(self.body)
+
     def raise_for_status(self):
         http_error_msg = ""
 
@@ -59,10 +83,10 @@ def raise_for_status(self):
             http_error_msg = "{0} Server Error: {1} for url: {2}".format(self.status_code, self.reason, self.url)
 
         if http_error_msg:
-            raise Exception(http_error_msg)
+            raise RequestException(http_error_msg, response=self)
 
     def json(self, **kwargs):
-        return json.loads(to_native(self._resp.read()), **kwargs)
+        return json.loads(to_native(self.body), **kwargs)
 
 
 class RequestSession(Request):
@@ -111,8 +135,11 @@ def request(self, method, url, **kwargs):
             if headers is None:
                 headers = {}
             headers['Content-Type'] = 'application/json'
-        result = self.open(method, url, validate_certs=validate_certs, data=data, headers=headers, **kwargs)
-        return RequestResponse(result)
+        try:
+            result = self.open(method, url, validate_certs=validate_certs, data=data, headers=headers, **kwargs)
+            return RequestResponse(result)
+        except six.moves.urllib.error.HTTPError as e:
+            return RequestResponse(e)
 
     def get(self, url, **kwargs):
         return self.request('GET', url, **kwargs)