[PATCH proxmox v2 2/4] s3-client: return dedicated error type for delete object response

[Christian Ebner <c.ebner@proxmox.com>]

In order to be able to reuse the delete object API calls as opt-in
replacement for delete objects API calls, but not suppress the
HTTP status code on failure.

Use an enum to distinguish the two cases and implement the Into trait
on it to be albe to easily convert back to an anyhow::Error type.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
changes since version 1:
- not present in previous version

 proxmox-s3-client/src/client.rs          |  5 ++-
 proxmox-s3-client/src/response_reader.rs | 39 +++++++++++++++++++++---
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs
index 3d0af5d6..e536614b 100644
--- a/proxmox-s3-client/src/client.rs
+++ b/proxmox-s3-client/src/client.rs
@@ -554,7 +554,10 @@ impl S3Client {
 
         let response = self.send(request, None).await?;
         let response_reader = ResponseReader::new(response);
-        response_reader.delete_object_response(object_key).await
+        response_reader
+            .delete_object_response(object_key)
+            .await
+            .map_err(Into::into)
     }
 
     /// Delete multiple objects from a bucket using a single HTTP request.
diff --git a/proxmox-s3-client/src/response_reader.rs b/proxmox-s3-client/src/response_reader.rs
index be7c0950..3478ea7c 100644
--- a/proxmox-s3-client/src/response_reader.rs
+++ b/proxmox-s3-client/src/response_reader.rs
@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use anyhow::{anyhow, bail, Context, Error};
+use anyhow::{anyhow, bail, format_err, Context, Error};
 use http_body_util::BodyExt;
 use hyper::body::{Bytes, Incoming};
 use hyper::header::HeaderName;
@@ -226,6 +226,26 @@ pub struct Bucket {
     pub creation_date: LastModifiedTimestamp,
 }
 
+pub(crate) enum DeleteError {
+    Response(DeleteObjectError),
+    Parsing(Error),
+}
+
+impl Into<Error> for DeleteError {
+    fn into(self) -> Error {
+        match self {
+            Self::Response(delete_error) => {
+                if let Some(code) = delete_error.code {
+                    format_err!("unexpected status code: {code}")
+                } else {
+                    format_err!("failed to generate error, missing error status code")
+                }
+            }
+            Self::Parsing(error) => error,
+        }
+    }
+}
+
 impl ResponseReader {
     /// Create a new response reader to parse given response.
     pub(crate) fn new(response: Response<Incoming>) -> Self {
@@ -364,22 +384,31 @@ impl ResponseReader {
     pub(crate) async fn delete_object_response(
         self,
         key: S3ObjectKey,
-    ) -> Result<DeletedObject, Error> {
+    ) -> Result<DeletedObject, DeleteError> {
         let (parts, _body) = self.response.into_parts();
 
         match parts.status {
             StatusCode::NO_CONTENT => (),
-            status_code => bail!("unexpected status code {status_code}"),
+            status_code => {
+                return Err(DeleteError::Response(DeleteObjectError {
+                    code: Some(status_code.to_string()),
+                    key: Some(key),
+                    message: None,
+                    version_id: None,
+                }));
+            }
         };
 
         let delete_marker = Self::parse_optional_header(
             HeaderName::from_static("x-amz-delete-marker"),
             &parts.headers,
-        )?;
+        )
+        .map_err(|err| DeleteError::Parsing(err))?;
         let delete_marker_version_id = Self::parse_optional_header(
             HeaderName::from_static("x-amz-version-id"),
             &parts.headers,
-        )?;
+        )
+        .map_err(|err| DeleteError::Parsing(err))?;
 
         Ok(DeletedObject {
             delete_marker,
-- 
2.47.3