chore(bors): merge pull request openebs#685

685: refactor(kube-forward): remove local work-around r=tiagolobocastro a=tiagolobocastro

Upstream fix has been merged, so we can remove the WA to distinguish between the type of received error.

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

k8s/forward/src/http_forward.rs

@@ -121,36 +121,7 @@ impl hyper::service::Service<hyper::Request<body::Body>> for HttpProxy {
 
     fn call(&mut self, request: hyper::Request<body::Body>) -> Self::Future {
         let client = self.client.clone();
-        Box::pin(async move {
-            let (parts, body) = request.into_parts();
-
-            let body_bytes = body::to_bytes(body).await;
-            let bytes = body_bytes.map_err(kube::Error::HyperError)?.to_vec();
-
-            let request = hyper::Request::from_parts(parts, bytes);
-            match client.request_text(request).await {
-                Ok(r) => Ok(Response::new(body::Body::from(r))),
-                Err(error) => match error {
-                    // without https://github.com/kube-rs/kube-rs/pull/972 all errors get translated
-                    // to a kube-api error type `ErrorResponse` so it's not possible to distinguish
-                    // where the error came from, i.e. kubeapi proxy or the target service.
-                    kube::Error::Api(response) => {
-                        let message =
-                            match serde_json::from_str::<serde_json::Value>(&response.message) {
-                                // undo the debug print which created response.message
-                                Ok(message) => message.as_str().unwrap_or("").to_string(),
-                                Err(_) => response.message,
-                            };
-
-                        Response::builder()
-                            .status(response.code)
-                            .body(body::Body::from(message))
-                            .map_err(kube::Error::HttpError)
-                    }
-                    _ => Err(error),
-                },
-            }
-        })
+        Box::pin(async move { client.send(request).await })
     }
 }