Merge pull request #260 from thomas9911/main

feat: add newer_concurrent_versions option to put lifecycle
ex-aws · Sep 10, 2024 · b25cc77 · b25cc77
2 parents f441871 + 1754a6a
commit b25cc77
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/lib/ex_aws/s3.ex b/lib/ex_aws/s3.ex
@@ -404,6 +404,7 @@ defmodule ExAws.S3 do
           },
           noncurrent_version_expiration: %{
             trigger: {:days, 2} # Only days based
+            newer_noncurrent_versions: 10
           },
           abort_incomplete_multipart_upload: %{
             trigger: {:days, 2} # Only days based

diff --git a/lib/ex_aws/s3/utils.ex b/lib/ex_aws/s3/utils.ex
@@ -210,7 +210,13 @@ defmodule ExAws.S3.Utils do
       },
       noncurrent_version_expiration: %{
         tag: "NoncurrentVersionExpiration",
-        action_tags: fn _data -> [] end
+        action_tags: fn
+          %{newer_noncurrent_versions: versions} ->
+            [["<NewerNoncurrentVersions>", "#{versions}", "</NewerNoncurrentVersions>"]]
+
+          _ ->
+            []
+        end
       },
       abort_incomplete_multipart_upload: %{
         tag: "AbortIncompleteMultipartUpload",

diff --git a/test/lib/s3/utils_test.exs b/test/lib/s3/utils_test.exs
@@ -86,16 +86,23 @@ defmodule ExAws.S3.ImplTest do
             storage: ""
           },
           noncurrent_version_expiration: %{
-            trigger: {:days, 2}
+            trigger: {:days, 2},
+            newer_noncurrent_versions: 10
           },
           abort_incomplete_multipart_upload: %{
             trigger: {:days, 2}
           }
         }
       }
 
-      assert rule |> Utils.build_lifecycle_rule() ==
-               "<Rule><AbortIncompleteMultipartUpload><DaysAfterInitiation>2</DaysAfterInitiation></AbortIncompleteMultipartUpload><NoncurrentVersionExpiration><NoncurrentDays>2</NoncurrentDays></NoncurrentVersionExpiration><NoncurrentVersionTransition><NoncurrentDays>2</NoncurrentDays><StorageClass></StorageClass></NoncurrentVersionTransition><Expiration><Days>2</Days><ExpiredObjectDeleteMarker>true</ExpiredObjectDeleteMarker></Expiration><Transition><Days>2</Days><StorageClass></StorageClass></Transition><Filter><Prefix>prefix/</Prefix></Filter><Status>Enabled</Status><ID>123</ID></Rule>"
+      assert Utils.build_lifecycle_rule(rule) ==
+               Enum.join([
+                 "<Rule><AbortIncompleteMultipartUpload><DaysAfterInitiation>2</DaysAfterInitiation></AbortIncompleteMultipartUpload>",
+                 "<NoncurrentVersionExpiration><NoncurrentDays>2</NoncurrentDays><NewerNoncurrentVersions>10</NewerNoncurrentVersions></NoncurrentVersionExpiration>",
+                 "<NoncurrentVersionTransition><NoncurrentDays>2</NoncurrentDays><StorageClass></StorageClass></NoncurrentVersionTransition>",
+                 "<Expiration><Days>2</Days><ExpiredObjectDeleteMarker>true</ExpiredObjectDeleteMarker></Expiration>",
+                 "<Transition><Days>2</Days><StorageClass></StorageClass></Transition><Filter><Prefix>prefix/</Prefix></Filter><Status>Enabled</Status><ID>123</ID></Rule>"
+               ])
     end
 
     test "lifecycle rule with 0 day trigger" do