Tests cleanup; cargo clippy fixes, minor doc updates

Author: HJLebbink

Cargo.toml

@@ -41,9 +41,10 @@ hmac = { version = "0.12.1", optional = true }
 hyper = { version = "1.6.0", features = ["full"] }
 lazy_static = "1.5.0"
 log = "0.4.27"
-md5 = "0.7.0"
+md5 = "0.8.0"
 multimap = "0.10.1"
 percent-encoding = "2.3.1"
+url = "2.5.4"
 rand = { version = "0.8.5", features = ["small_rng"] }
 regex = "1.11.1"
 ring = { version = "0.17.14", optional = true, default-features = false, features = ["alloc"] }

common/Cargo.toml

@@ -14,6 +14,7 @@ chrono = "0.4.41"
 reqwest = "0.12.20"
 http = "1.3.1"
 futures = "0.3.31"
+uuid = { version = "1.17.0", features = ["v4"] }
 
 [lib]
 name = "minio_common"

common/src/utils.rs

@@ -15,16 +15,24 @@
 
 use http::{Response as HttpResponse, StatusCode};
 use minio::s3::error::Error;
-use rand::distributions::{Alphanumeric, DistString};
+use rand::distributions::Standard;
+use rand::{Rng, thread_rng};
+use uuid::Uuid;
 
 pub fn rand_bucket_name() -> String {
-    Alphanumeric
-        .sample_string(&mut rand::thread_rng(), 8)
-        .to_lowercase()
+    format!("test-bucket-{}", Uuid::new_v4())
 }
 
 pub fn rand_object_name() -> String {
-    Alphanumeric.sample_string(&mut rand::thread_rng(), 20)
+    format!("test-object-{}", Uuid::new_v4())
+}
+
+pub fn rand_object_name_utf8(len: usize) -> String {
+    let rng = thread_rng();
+    rng.sample_iter::<char, _>(Standard)
+        .filter(|c| !c.is_control())
+        .take(len)
+        .collect()
 }
 
 pub async fn get_bytes_from_response(v: Result<reqwest::Response, Error>) -> bytes::Bytes {

src/s3/builders/delete_objects.rs

@@ -209,7 +209,7 @@ impl DeleteObjects {
     }
 
     /// Enable verbose mode (defaults to false). If enabled, the response will
-    /// include the keys of objects that were successfully deleted. Otherwise
+    /// include the keys of objects that were successfully deleted. Otherwise,
     /// only objects that encountered an error are returned.
     pub fn verbose_mode(mut self, verbose_mode: bool) -> Self {
         self.verbose_mode = verbose_mode;

src/s3/client/delete_bucket.rs

@@ -61,11 +61,9 @@ impl Client {
             let mut stream = self.list_objects(&bucket).to_stream().await;
 
             while let Some(items) = stream.next().await {
+                let object_names = items?.contents.into_iter().map(ObjectToDelete::from);
                 let mut resp = self
-                    .delete_objects_streaming(
-                        &bucket,
-                        items?.contents.into_iter().map(ObjectToDelete::from),
-                    )
+                    .delete_objects_streaming(&bucket, object_names)
                     .to_stream()
                     .await;
                 while let Some(item) = resp.next().await {

src/s3/client/delete_objects.rs

@@ -66,7 +66,7 @@ impl Client {
 
     /// Creates a [`DeleteObjectsStreaming`] request builder to delete a stream of objects from an S3 bucket.
     ///
-    /// to execute the request, call [`DeleteObjectsStreaming::to_stream()`](crate::s3::types::S3Api::send),
+    /// To execute the request, call [`DeleteObjectsStreaming::to_stream()`](crate::s3::types::S3Api::send),
     /// which returns a [`Result`] containing a [`DeleteObjectsResponse`](crate::s3::response::DeleteObjectsResponse).
     pub fn delete_objects_streaming<S: Into<String>, D: Into<ObjectsStream>>(
         &self,

src/s3/lifecycle_config.rs

@@ -480,5 +480,5 @@ impl LifecycleRule {
 fn parse_iso8601(date_str: &str) -> Result<chrono::DateTime<chrono::Utc>, Error> {
     chrono::DateTime::parse_from_rfc3339(date_str)
         .map(|dt| dt.with_timezone(&chrono::Utc))
-        .map_err(|_| Error::XmlError(format!("Invalid date format: {}", date_str)))
+        .map_err(|_| Error::XmlError(format!("Invalid date format: {date_str}")))
 }

src/s3/response/get_bucket_policy.rs

@@ -48,7 +48,7 @@ impl GetBucketPolicyResponse {
     /// for accessing the bucket and its contents.
     pub fn config(&self) -> Result<&str, Error> {
         std::str::from_utf8(&self.body).map_err(|e| {
-            Error::Utf8Error(format!("Failed to parse bucket policy as UTF-8: {}", e).into())
+            Error::Utf8Error(format!("Failed to parse bucket policy as UTF-8: {e}").into())
         })
     }
 }

src/s3/response/get_object_prompt.rs

@@ -40,7 +40,7 @@ impl GetObjectPromptResponse {
     /// This method retrieves the content of the object as a UTF-8 encoded string.
     pub fn prompt_response(&self) -> Result<&str, Error> {
         std::str::from_utf8(&self.body).map_err(|e| {
-            Error::Utf8Error(format!("Failed to parse prompt_response as UTF-8: {}", e).into())
+            Error::Utf8Error(format!("Failed to parse prompt_response as UTF-8: {e}").into())
         })
     }
 }

src/s3/response/list_objects.rs

@@ -10,18 +10,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Response types for ListObjects APIs
-
 use crate::impl_has_s3fields;
+use crate::s3::error::Error;
 use crate::s3::response::a_response_traits::HasS3Fields;
-use crate::s3::{
-    error::Error,
-    types::{FromS3Response, ListEntry, S3Request},
-    utils::{
-        from_iso8601utc, parse_tags, urldecode,
-        xml::{Element, MergeXmlElements},
-    },
-};
+use crate::s3::types::{FromS3Response, ListEntry, S3Request};
+use crate::s3::utils::xml::{Element, MergeXmlElements};
+use crate::s3::utils::{from_iso8601utc, parse_tags, urldecode};
 use async_trait::async_trait;
 use bytes::{Buf, Bytes};
 use reqwest::header::HeaderMap;