fix list_objects

rustfs/src/storage/ecfs.rs

@@ -16,7 +16,9 @@ use ecstore::bucket::policy_sys::PolicySys;
 use ecstore::bucket::tagging::decode_tags;
 use ecstore::bucket::tagging::encode_tags;
 use ecstore::bucket::versioning_sys::BucketVersioningSys;
+use ecstore::disk::error::is_err_file_not_found;
 use ecstore::disk::error::DiskError;
+use ecstore::error::Error as EcError;
 use ecstore::new_object_layer_fn;
 use ecstore::options::extract_metadata;
 use ecstore::options::put_opts;
@@ -69,6 +71,15 @@ lazy_static! {
         id: Some("c19050dbcee97fda828689dda99097a6321af2248fa760517237346e5d9c8a66".to_owned()),
     };
 }
+
+fn to_s3_error(err: EcError) -> S3Error {
+    if is_err_file_not_found(&err) {
+        return S3Error::with_message(S3ErrorCode::NoSuchKey, format!(" ec err {}", err));
+    }
+
+    S3Error::with_message(S3ErrorCode::InternalError, format!(" ec err {}", err))
+}
+
 #[derive(Debug, Clone)]
 pub struct FS {
     // pub store: ECStore,
@@ -392,7 +403,10 @@ impl S3 for FS {
             None => return Err(S3Error::with_message(S3ErrorCode::InternalError, "Not init".to_string())),
         };
 
-        let info = try_!(store.get_object_info(&bucket, &key, &ObjectOptions::default()).await);
+        let info = store
+            .get_object_info(&bucket, &key, &ObjectOptions::default())
+            .await
+            .map_err(to_s3_error)?;
         debug!("info {:?}", info);
 
         let content_type = {
@@ -468,6 +482,8 @@ impl S3 for FS {
 
     #[tracing::instrument(level = "debug", skip(self, req))]
     async fn list_objects_v2(&self, req: S3Request<ListObjectsV2Input>) -> S3Result<S3Response<ListObjectsV2Output>> {
+        // warn!("list_objects_v2 input {:?}", &req.input);
+
         let ListObjectsV2Input {
             bucket,
             continuation_token,