code review updates

Author: HJLebbink

.claude/settings.local.json

@@ -1,9 +1,13 @@
 {
+  "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "permissions": {
     "allow": [
-      "Bash(grep:*)"
+      "Bash(grep:*)",
+      "WebSearch",
+      "Bash(cargo check:*)",
+      "Bash(cargo test:*)",
+      "Bash(find:*)"
     ],
     "deny": []
-  },
-  "$schema": "https://json.schemastore.org/claude-code-settings.json"
+  }
 }

benches/s3/bench_object_retention.rs

@@ -34,7 +34,7 @@ pub(crate) async fn bench_put_object_retention(criterion: &mut Criterion) {
                 .client(ctx.client.clone())
                 .bucket(ctx.bucket.clone())
                 .object(ctx.object.clone())
-                .retention_mode(Some(RetentionMode::GOVERNANCE))
+                .retention_mode(RetentionMode::GOVERNANCE)
                 .retain_until_date(Some(utc_now() + chrono::Duration::days(1)))
                 .build()
         },
@@ -53,7 +53,7 @@ pub(crate) async fn bench_get_object_retention(criterion: &mut Criterion) {
                 .client(ctx.client.clone())
                 .bucket(ctx.bucket.clone())
                 .object(ctx.object.clone())
-                .retention_mode(Some(RetentionMode::GOVERNANCE))
+                .retention_mode(RetentionMode::GOVERNANCE)
                 .retain_until_date(Some(utc_now() + chrono::Duration::days(1)))
                 .build()
                 .send()

src/s3/builders/append_object.rs

@@ -231,9 +231,10 @@ impl AppendObjectContent {
                 data: Arc::new(seg_bytes),
             };
             ao.send().await
-        } else if object_size.is_known() && (seg_bytes.len() as u64) < part_size {
+        } else if let Some(expected) = object_size.value()
+            && (seg_bytes.len() as u64) < part_size
+        {
             // Not enough data!
-            let expected = object_size.as_u64().unwrap();
             let got = seg_bytes.len() as u64;
             Err(ValidationErr::InsufficientData { expected, got })?
         } else {

src/s3/builders/put_object.rs

@@ -450,7 +450,7 @@ pub struct PutObjectContent {
     retention: Option<Retention>,
     #[builder(default = false)]
     legal_hold: bool,
-    #[builder(default)]
+    #[builder(default, setter(into))]
     part_size: Size,
     #[builder(default, setter(into))]
     content_type: Option<String>,
@@ -548,9 +548,10 @@ impl PutObjectContent {
                 .await?;
 
             Ok(PutObjectContentResponse::new(resp, size))
-        } else if object_size.is_known() && (seg_bytes.len() as u64) < part_size {
+        } else if let Some(expected) = object_size.value()
+            && (seg_bytes.len() as u64) < part_size
+        {
             // Not enough data!
-            let expected: u64 = object_size.as_u64().unwrap();
             let got: u64 = seg_bytes.len() as u64;
             Err(ValidationErr::InsufficientData { expected, got }.into())
         } else {
@@ -642,8 +643,7 @@ impl PutObjectContent {
                 return Err(ValidationErr::TooManyParts(part_number as u64).into());
             }
 
-            if object_size.is_known() {
-                let exp = object_size.as_u64().unwrap();
+            if let Some(exp) = object_size.value() {
                 if exp < total_read {
                     return Err(ValidationErr::TooMuchData(exp).into());
                 }
@@ -686,8 +686,7 @@ impl PutObjectContent {
         // Complete the multipart upload.
         let size = parts.iter().map(|p| p.size).sum();
 
-        if object_size.is_known() {
-            let expected = object_size.as_u64().unwrap();
+        if let Some(expected) = object_size.value() {
             if expected != size {
                 return Err(ValidationErr::InsufficientData {
                     expected,

src/s3/client/put_object_retention.rs

@@ -24,6 +24,10 @@ impl MinioClient {
     ///
     /// 🛈 This operation is not supported for express buckets.
     ///
+    /// Note: there is no separate delete object retention API. To remove object retention, you must
+    /// call put_object_retention without '.retention_mode()' or '.retain_until_date()' to remove the retention.
+    /// You must set '.bypass_governance_mode(true)' to remove retention from objects in GOVERNANCE mode.
+    ///
     /// # Example
     ///
     /// ```no_run
@@ -40,7 +44,7 @@ impl MinioClient {
     ///     let retain_until_date = utc_now() + chrono::Duration::days(1);
     ///     let resp: PutObjectRetentionResponse = client
     ///         .put_object_retention("bucket-name", "object-name")
-    ///         .retention_mode(Some(RetentionMode::GOVERNANCE))
+    ///         .retention_mode(RetentionMode::GOVERNANCE)
     ///         .retain_until_date(Some(retain_until_date))
     ///         .build().send().await.unwrap();
     ///     println!("set the object retention for object '{}'", resp.object());

src/s3/object_content.rs

@@ -36,15 +36,18 @@ pub enum Size {
 }
 
 impl Size {
+    /// Returns `true` if the size is known and `false` otherwise.
     pub fn is_known(&self) -> bool {
         matches!(self, Size::Known(_))
     }
 
+    /// Returns `true` if the size is unknown and `false` otherwise.
     pub fn is_unknown(&self) -> bool {
         matches!(self, Size::Unknown)
     }
 
-    pub fn as_u64(&self) -> Option<u64> {
+    /// Returns the size if known, otherwise returns `None`.
+    pub fn value(&self) -> Option<u64> {
         match self {
             Size::Known(v) => Some(*v),
             Size::Unknown => None,
@@ -61,6 +64,12 @@ impl From<Option<u64>> for Size {
     }
 }
 
+impl From<u64> for Size {
+    fn from(value: u64) -> Self {
+        Size::Known(value)
+    }
+}
+
 #[cfg(test)]
 impl Arbitrary for Size {
     fn arbitrary(g: &mut quickcheck::Gen) -> Self {

tests/test_object_put.rs

@@ -14,7 +14,6 @@
 // limitations under the License.
 
 use http::header;
-use minio::s3::builders::Size::Known;
 use minio::s3::builders::{MIN_PART_SIZE, ObjectContent};
 use minio::s3::response::a_response_traits::{
     HasBucket, HasEtagFromHeaders, HasIsDeleteMarker, HasObject, HasS3Fields,
@@ -164,7 +163,7 @@ async fn put_object_content_2(ctx: TestContext, bucket_name: String) {
                 &object_name,
                 ObjectContent::new_from_stream(data_src, None),
             )
-            .part_size(Known(MIN_PART_SIZE))
+            .part_size(MIN_PART_SIZE)
             .build()
             .send()
             .await