WIP

Author: mdellweg

pulp-glue/pulp_glue/common/openapi.py

@@ -522,6 +522,9 @@ async def _http_middleware(
             raise UnsafeCallError(_("Call aborted due to safe mode"))
 
         response = await handler(request)
+
+        if "Correlation-Id" in response.headers:
+            self._set_correlation_id(response.headers["Correlation-Id"])
         return response
 
     async def _send_request(
@@ -554,21 +557,6 @@ async def _send_request(
         # Somehow this does not work properly for multipart...
         if content_type is not None and content_type.startswith("application/json"):
             _headers["Content-Type"] = content_type
-        request = self._session.prepare_request(
-            requests.Request(
-                method,
-                url,
-                auth=auth,
-                params=params,
-                headers=_headers,
-                data=data,
-                files=files,
-            )
-        )
-        if content_type:
-            assert request.headers["content-type"].startswith(
-                content_type
-            ), f"{request.headers['content-type']} != {content_type}"
         try:
             async with aiohttp.ClientSession(
                 headers=self._headers, middlewares=(self._http_middleware,)
@@ -581,25 +569,26 @@ async def _send_request(
                     data=data,
                     # files=files,
                     ssl=self.ssl_context,
+                    max_redirects=0,
                 ) as response:
                     response.raise_for_status()
                     response_body = await response.read()
-        except requests.TooManyRedirects as e:
-            assert e.response is not None
+        except aiohttp.TooManyRedirects as e:
+            # We could handle that in the middleware...
+            assert e.history[-1] is not None
             raise OpenAPIError(
                 _("Received redirect to '{url}'. Please check your configuration.").format(
-                    url=e.response.headers["location"]
+                    url=e.history[-1].headers["location"]
                 )
             )
-        except requests.RequestException as e:
+        except aiohttp.ClientResponseError as e:
             raise OpenAPIError(str(e))
+
         self._debug_callback(1, _("Response: {status_code}").format(status_code=response.status))
         for key, value in response.headers.items():
             self._debug_callback(2, f"  {key}: {value}")
-        if response.text:
-            self._debug_callback(3, f"{response.text}")
-        if "Correlation-Id" in response.headers:
-            self._set_correlation_id(response.headers["Correlation-Id"])
+        if response_body:
+            self._debug_callback(3, f"{response_body!r}")
         if response.status == 401:
             raise PulpAuthenticationFailed(method_spec["operationId"])
         if response.status == 403: