Refactor/cleanup errors (#179)

* error refactored: moved to thiserror
* Result type alias for better ergonomics:
* removed field from MinioErrorCode::BucketNotEmpty enum
* made field private of MinioErrorResponse
* updated XmlError
* simplified calling errors
* bumped toolchain channel form 1.86.0 to 1.87.0
* bumped toolchain channel form 1.87.0 to 1.88.0 due to clippy fixes that are not compatible with 1.87.0

Author: HJLebbink

Cargo.toml

@@ -11,7 +11,7 @@ keywords = ["object-storage", "minio", "s3"]
 categories = ["api-bindings", "web-programming::http-client"]
 
 [dependencies.reqwest]
-version = "0.12.18"
+version = "0.12.22"
 default-features = false
 features = ["stream"]
 
@@ -51,19 +51,20 @@ regex = "1.11.1"
 ring = { version = "0.17.14", optional = true, default-features = false, features = ["alloc"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-sha2 = { version = "0.10.8", optional = true }
+sha2 = { version = "0.10.9", optional = true }
 urlencoding = "2.1.3"
 xmltree = "0.11.0"
 futures = "0.3.31"
 http = "1.3.1"
+thiserror = "2.0.12"
 
 [dev-dependencies]
-tokio = { version = "1.45.1", features = ["full"] }
+tokio = { version = "1.47.1", features = ["full"] }
 minio_common = { path = "./common" }
 async-std = { version = "1.13.1", features = ["attributes", "tokio1"] }
-clap = { version = "4.5.40", features = ["derive"] }
+clap = { version = "4.5.44", features = ["derive"] }
 quickcheck = "1.0.3"
-criterion = "0.6.0"
+criterion = "0.7.0"
 minio-macros = { path = "./macros" }
 
 [lib]

benches/s3/bench_object_append.rs

@@ -17,6 +17,7 @@ use crate::common_benches::{Ctx2, benchmark_s3_api};
 
 use criterion::Criterion;
 use minio::s3::builders::AppendObject;
+use minio::s3::error::Error;
 use minio::s3::response::StatObjectResponse;
 use minio::s3::segmented_bytes::SegmentedBytes;
 use minio::s3::types::S3Api;
@@ -38,8 +39,9 @@ pub(crate) async fn bench_object_append(criterion: &mut Criterion) {
             let data1: SegmentedBytes = SegmentedBytes::from(content1.to_string());
 
             let resp: StatObjectResponse = task::block_in_place(|| {
-                tokio::runtime::Runtime::new()?
-                    .block_on(ctx.client.stat_object(&ctx.bucket, &ctx.object).send())
+                let runtime =
+                    tokio::runtime::Runtime::new().map_err(|e| Error::DriveIo(e.into()))?;
+                runtime.block_on(ctx.client.stat_object(&ctx.bucket, &ctx.object).send())
             })
             .unwrap();
 

benches/s3/common_benches.rs

@@ -24,7 +24,6 @@ use minio_common::utils::{
     get_bytes_from_response, get_response_from_bytes, rand_bucket_name, rand_object_name,
 };
 use std::env;
-
 use tokio::runtime::Runtime;
 
 pub(crate) struct Ctx2 {
@@ -170,7 +169,7 @@ pub(crate) fn benchmark_s3_api<ApiType, GlobalSetupFuture>(
 pub(crate) async fn skip_express_mode(bench_name: &str) -> bool {
     let skip = TestContext::new_from_env().client.is_minio_express().await;
     if skip {
-        println!("Skipping benchmark '{}' (MinIO Express mode)", bench_name);
+        println!("Skipping benchmark '{bench_name}' (MinIO Express mode)");
     }
     skip
 }

common/Cargo.toml

@@ -5,16 +5,16 @@ edition = "2024"
 
 [dependencies]
 minio = {path = ".." }
-tokio = { version = "1.45.1", features = ["full"] }
+tokio = { version = "1.47.1", features = ["full"] }
 async-std = "1.13.1"
 rand = { version = "0.8.5", features = ["small_rng"] }
 bytes = "1.10.1"
 log = "0.4.27"
 chrono = "0.4.41"
-reqwest = "0.12.20"
+reqwest = "0.12.22"
 http = "1.3.1"
 futures = "0.3.31"
-uuid = { version = "1.17.0", features = ["v4"] }
+uuid = { version = "1.18.0", features = ["v4"] }
 
 [lib]
 name = "minio_common"

common/src/cleanup_guard.rs

@@ -46,7 +46,7 @@ pub async fn cleanup(client: Client, bucket_name: &str) {
                     //eprintln!("Bucket {} removed successfully", bucket_name);
                 }
                 Err(e) => {
-                    eprintln!("Error removing bucket {}: {:?}", bucket_name, e);
+                    eprintln!("Error removing bucket '{}':\n{}", bucket_name, e);
                 }
             }
         }

common/src/example.rs

@@ -45,7 +45,7 @@ pub fn create_bucket_notification_config_example() -> NotificationConfig {
                 String::from("s3:ObjectCreated:Put"),
                 String::from("s3:ObjectCreated:Copy"),
             ],
-            id: Some("".to_string()), //TODO or should this be NONE??
+            id: None, //Some("".to_string()), //TODO or should this be NONE??
             prefix_filter_rule: Some(PrefixFilterRule {
                 value: String::from("images"),
             }),

examples/append_object.rs

@@ -57,23 +57,21 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         offset_bytes += data_size;
         if resp.object_size() != offset_bytes {
             panic!(
-                "from the append_object: size mismatch: expected {}, got {}",
+                "from the append_object: size mismatch: expected {}, got {offset_bytes}",
                 resp.object_size(),
-                offset_bytes
             )
         }
-        //println!("Append response: {:#?}", resp);
+        //println!("Append response: {resp:#?}");
 
         let resp: StatObjectResponse = client.stat_object(bucket_name, object_name).send().await?;
         if resp.size()? != offset_bytes {
             panic!(
-                "from the stat_Object: size mismatch: expected {}, got {}",
+                "from the stat_Object: size mismatch: expected {}, got {offset_bytes}",
                 resp.size()?,
-                offset_bytes
             )
         }
-        println!("{}/{}", i, n_segments);
-        //println!("Stat response: {:#?}", resp);
+        println!("{i}/{n_segments}");
+        //println!("Stat response: {resp:#?}");
     }
 
     Ok(())

examples/bucket_encryption.rs

@@ -33,7 +33,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     log::info!("encryption before: config={:?}", resp.config());
 
     let config = SseConfig::default();
-    log::info!("going to set encryption config={:?}", config);
+    log::info!("going to set encryption config={config:?}");
 
     let _resp: PutBucketEncryptionResponse = client
         .put_bucket_encryption(bucket_name)

examples/bucket_lifecycle.rs

@@ -35,7 +35,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         // TODO
         let resp: GetBucketLifecycleResponse =
             client.get_bucket_lifecycle(bucket_name).send().await?;
-        log::info!("life cycle settings before setting: resp={:?}", resp);
+        log::info!("life cycle settings before setting: resp={resp:?}");
     }
 
     let rules: Vec<LifecycleRule> = vec![LifecycleRule {
@@ -54,20 +54,20 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         .life_cycle_config(LifecycleConfig { rules })
         .send()
         .await?;
-    log::info!("response of setting life cycle config: resp={:?}", resp);
+    log::info!("response of setting life cycle config: resp={resp:?}");
 
     if false {
         // TODO
         let resp: GetBucketLifecycleResponse =
             client.get_bucket_lifecycle(bucket_name).send().await?;
-        log::info!("life cycle settings after setting: resp={:?}", resp);
+        log::info!("life cycle settings after setting: resp={resp:?}");
     }
 
     if false {
         // TODO
         let resp: DeleteBucketLifecycleResponse =
             client.delete_bucket_lifecycle(bucket_name).send().await?;
-        log::info!("response of deleting lifecycle config: resp={:?}", resp);
+        log::info!("response of deleting lifecycle config: resp={resp:?}");
     }
     Ok(())
 }

examples/common.rs

@@ -7,7 +7,7 @@ use minio::s3::{Client, ClientBuilder};
 #[allow(dead_code)]
 pub fn create_client_on_play() -> Result<Client, Box<dyn std::error::Error + Send + Sync>> {
     let base_url = "https://play.min.io".parse::<BaseUrl>()?;
-    log::info!("Trying to connect to MinIO at: `{:?}`", base_url);
+    log::info!("Trying to connect to MinIO at: `{base_url:?}`");
 
     let static_provider = StaticProvider::new(
         "Q3AM3UQ867SPQQA43P2F",
@@ -24,7 +24,7 @@ pub fn create_client_on_play() -> Result<Client, Box<dyn std::error::Error + Sen
 #[allow(dead_code)]
 pub fn create_client_on_localhost() -> Result<Client, Box<dyn std::error::Error + Send + Sync>> {
     let base_url = "http://localhost:9000/".parse::<BaseUrl>()?;
-    log::info!("Trying to connect to MinIO at: `{:?}`", base_url);
+    log::info!("Trying to connect to MinIO at: `{base_url:?}`");
 
     let static_provider = StaticProvider::new("minioadmin", "minioadmin", None);