Merge pull request #345 from yoshidan/fix/change_sign_error_response

Fix sign_url error response

deny.toml

@@ -71,7 +71,8 @@ allow = [
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
-    "Unicode-3.0"
+    "Unicode-3.0",
+    "Zlib",
 ]
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the

storage/src/http/mod.rs

@@ -41,6 +41,9 @@ pub enum Error {
     /// Invalid Range error
     #[error("invalid range header, received: {0}")]
     InvalidRangeHeader(String),
+
+    #[error("Request failed: {0} detail={1}")]
+    RawResponse(reqwest::Error, String),
 }
 
 impl From<reqwest_middleware::Error> for Error {

storage/src/http/service_account_client.rs

@@ -1,8 +1,8 @@
-use std::sync::Arc;
-
 use google_cloud_token::TokenSource;
+use reqwest::Response;
+use std::sync::Arc;
 
-use crate::http::{check_response_status, Error};
+use crate::http::Error;
 
 #[derive(Clone)]
 pub struct ServiceAccountClient {
@@ -42,9 +42,21 @@ impl ServiceAccountClient {
             None => request,
         };
         let response = request.send().await?;
-        let response = check_response_status(response).await?;
+        let response = ServiceAccountClient::check_response_status(response).await?;
         Ok(response.json::<SignBlobResponse>().await?.signed_blob)
     }
+
+    /// Checks whether an HTTP response is successful and returns it, or returns an error.
+    async fn check_response_status(response: Response) -> Result<Response, Error> {
+        // Check the status code, returning the response if it is not an error.
+        match response.error_for_status_ref() {
+            Ok(_) => Ok(response),
+            Err(error) => match response.text().await {
+                Ok(raw) => Err(Error::RawResponse(error, raw)),
+                Err(_) => Err(Error::HttpClient(error)),
+            },
+        }
+    }
 }
 
 #[derive(serde::Serialize)]