Merge pull request #12915 from redpanda-data/cdt-handle-cloudv2-errors

rptest: handle errors from cloudv2 and rethrow proper error messages
redpanda-data · Aug 23, 2023 · c297f10 · c297f10
2 parents 8908198 + e2c3218
commit c297f10
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/tests/rptest/services/redpanda_cloud.py b/tests/rptest/services/redpanda_cloud.py
@@ -23,6 +23,16 @@ def __init__(self, config, log):
         self._config = config
         self._token = None
         self._logger = log
+        self.lasterror = None
+
+    def _handle_error(self, response):
+        try:
+            response.raise_for_status()
+        except requests.HTTPError as e:
+            self.lasterror = f'{e} {response.text}'
+            self._logger.error(self.lasterror)
+            return None
+        return response
 
     def _get_token(self):
         """
@@ -45,11 +55,9 @@ def _get_token(self):
             resp = requests.post(f'{self._config.oauth_url}',
                                  headers=headers,
                                  data=data)
-            try:
-                resp.raise_for_status()
-            except requests.HTTPError as e:
-                self._logger.error(f'{e} {resp.text}')
-                return None
+            _r = self._handle_error(resp)
+            if _r is None:
+                return _r
             j = resp.json()
             self._token = j['access_token']
         return self._token
@@ -63,12 +71,8 @@ def _http_get(self, endpoint='', **kwargs):
         resp = requests.get(f'{self._config.api_url}{endpoint}',
                             headers=headers,
                             **kwargs)
-        try:
-            resp.raise_for_status()
-        except requests.HTTPError as e:
-            self._logger.error(f'{e} {resp.text}')
-            return None
-        return resp.json()
+        _r = self._handle_error(resp)
+        return _r if _r is None else _r.json()
 
     def _http_post(self, base_url=None, endpoint='', **kwargs):
         token = self._get_token()
@@ -81,12 +85,8 @@ def _http_post(self, base_url=None, endpoint='', **kwargs):
         resp = requests.post(f'{base_url}{endpoint}',
                              headers=headers,
                              **kwargs)
-        try:
-            resp.raise_for_status()
-        except requests.HTTPError as e:
-            self._logger.error(f'{e} {resp.text}')
-            return None
-        return resp.json()
+        _r = self._handle_error(resp)
+        return _r if _r is None else _r.json()
 
     def _http_delete(self, endpoint='', **kwargs):
         token = self._get_token()
@@ -97,12 +97,8 @@ def _http_delete(self, endpoint='', **kwargs):
         resp = requests.delete(f'{self._config.api_url}{endpoint}',
                                headers=headers,
                                **kwargs)
-        try:
-            resp.raise_for_status()
-        except requests.HTTPError as e:
-            self._logger.error(f'{e} {resp.text}')
-            return None
-        return resp.json()
+        _r = self._handle_error(resp)
+        return _r if _r is None else _r.json()
 
 
 @dataclass(kw_only=True)
@@ -468,6 +464,10 @@ def create(self,
         r = self.cloudv2._http_post(
             endpoint='/api/v1/workflows/network-cluster', json=_body)
 
+        # handle error on CloudV2 side
+        if r is None:
+            raise RuntimeError(self.cloudv2.lasterror)
+
         self._logger.info(
             f'waiting for creation of cluster {self.current.name} '
             f'namespaceUuid {r["namespaceUuid"]}, checking every '