Re-introduce maybe_from logic for error handling (openzfs#420)

Signed-off-by: Paul Dagnelie <[email protected]>

cmd/zfs_object_agent/zettaobject/src/object_access/blob.rs

@@ -85,9 +85,10 @@ impl MaybeFrom<HttpError> for GetError {
 impl MaybeFrom<HttpError> for PutError {
     fn maybe_from(value: HttpError) -> Result<Self, HttpError> {
         match value {
-            HttpError::StatusCode { status, body: _ } if status.is_client_error() => {
-                Ok(PutError {})
-            }
+            HttpError::StatusCode {
+                status: StatusCode::NOT_FOUND,
+                body,
+            } => Ok(PutError::NoSuchContainer(body)),
             _ => Err(value),
         }
     }
@@ -113,16 +114,24 @@ where
 {
     fn from(e: azure_core::HttpError) -> Self {
         match e {
-            HttpError::StatusCode { status, body } => {
+            HttpError::StatusCode { status, body: _ } => {
                 if status == StatusCode::FORBIDDEN {
                     return Self::InvalidCredentials;
                 }
-                Self::Unknown(
-                    Response::builder()
-                        .status(status)
-                        .body(Bytes::from(body))
-                        .unwrap(),
-                )
+                /*
+                 * XXX we need logic here to handle contentful errors that aren't
+                 * specific to E, like credential and validation issues.
+                 */
+                match E::maybe_from(e) {
+                    Ok(err) => Self::Service(err),
+                    Err(HttpError::StatusCode { status, body }) => Self::Unknown(
+                        Response::builder()
+                            .status(status)
+                            .body(Bytes::from(body))
+                            .unwrap(),
+                    ),
+                    Err(_) => panic!("Type changed during maybe_from"),
+                }
             }
             HttpError::Utf8(err) => Self::InternalError(err.to_string()),
             /*

cmd/zfs_object_agent/zettaobject/src/object_access/mod.rs

@@ -76,11 +76,15 @@ impl Display for GetError {
 impl Error for GetError {}
 
 #[derive(Debug)]
-pub struct PutError {}
+pub enum PutError {
+    NoSuchContainer(String),
+}
 
 impl Display for PutError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("put error")
+        match self {
+            PutError::NoSuchContainer(container) => write!(f, "Container not found: {}", container),
+        }
     }
 }
 impl Error for PutError {}

cmd/zfs_object_agent/zettaobject/src/object_access/s3.rs

@@ -67,7 +67,7 @@ impl From<GetObjectError> for GetError {
 impl From<PutObjectError> for PutError {
     fn from(_: PutObjectError) -> Self {
         // XXX S3 put errors are always returned as Unknown, at present.
-        PutError {}
+        panic!("S3 PutObjectErrors are not used");
     }
 }
 

cmd/zfs_object_agent/zettaobject/src/test_connectivity.rs

@@ -9,6 +9,7 @@ use crate::access_stats::ObjectAccessOpType;
 use crate::object_access::OAError;
 use crate::object_access::ObjectAccess;
 use crate::object_access::ObjectAccessProtocol;
+use crate::object_access::PutError;
 use crate::object_access::RequestError;
 
 #[derive(Debug, Deserialize)]
@@ -34,6 +35,9 @@ async fn do_test_connectivity(object_access: &ObjectAccess) -> Result<(), String
         )
         .await
     {
+        Err(OAError::RequestError(RequestError::Service(e @ PutError::NoSuchContainer(_)))) => {
+            Err(format!("Connectivity test failed: {}", e))
+        }
         Err(OAError::RequestError(RequestError::Unknown(response))) => {
             /*
              * The Byte-Order-Mark (or BOM), is a special marker added at the very beginning of
@@ -59,10 +63,6 @@ async fn do_test_connectivity(object_access: &ObjectAccess) -> Result<(), String
         Err(OAError::TimeoutError(_)) => {
             Err("Connectivity test failed with a timeout.".to_string())
         }
-        Err(OAError::RequestError(RequestError::Service(err))) => Err(format!(
-            "Connectivity test failed due to a service error: {}",
-            err
-        )),
         Err(OAError::RequestError(RequestError::Credentials(err))) => Err(format!(
             "Connectivity test failed due to a credentials error: {}",
             err