fix(object): lifecycle: fix case with no tags and no prefix (#2463)

scaleway · Mar 18, 2024 · f0d34ef · f0d34ef
1 parent 46d62b5
commit f0d34ef
Show file tree

Hide file tree

Showing 3 changed files with 1,638 additions and 819 deletions.
diff --git a/scaleway/resource_object_bucket.go b/scaleway/resource_object_bucket.go
@@ -355,20 +355,21 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.S3, d *schema.R
 		ruleHasPrefix := len(r["prefix"].(string)) > 0
 		filter := &s3.LifecycleRuleFilter{}
 
+		if len(tags) > 1 || (ruleHasPrefix && len(tags) == 1) {
+			lifecycleRuleAndOp := &s3.LifecycleRuleAndOperator{}
+			lifecycleRuleAndOp.SetTags(tags)
+			if ruleHasPrefix {
+				lifecycleRuleAndOp.SetPrefix(r["prefix"].(string))
+			}
+			filter.SetAnd(lifecycleRuleAndOp)
+		}
+
 		if !ruleHasPrefix && len(tags) == 1 {
 			filter.SetTag(tags[0])
-		} else {
-			if len(tags) == 0 && ruleHasPrefix {
-				filter.SetPrefix(r["prefix"].(string))
-			} else {
-				lifecycleRuleAndOp := &s3.LifecycleRuleAndOperator{}
-				lifecycleRuleAndOp.SetTags(tags)
-				if ruleHasPrefix {
-					lifecycleRuleAndOp.SetPrefix(r["prefix"].(string))
-				}
-				filter.SetAnd(lifecycleRuleAndOp)
-			}
+		} else if ruleHasPrefix && len(tags) == 0 {
+			filter.SetPrefix(r["prefix"].(string))
 		}
+
 		rule.SetFilter(filter)
 
 		// ID

diff --git a/scaleway/resource_object_bucket_test.go b/scaleway/resource_object_bucket_test.go
@@ -378,6 +378,36 @@ func TestAccScalewayObjectBucket_Lifecycle(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.expiration.0.days", "1"),
 				),
 			},
+			{
+				Config: fmt.Sprintf(`
+				resource "scaleway_object_bucket" "main-bucket-lifecycle" {
+					name                = "%s"
+					region = "%s"
+					object_lock_enabled = true
+			
+					lifecycle_rule {
+						enabled = true
+						prefix  = ""
+						expiration {
+							days = 2
+						}
+					}
+			
+					lifecycle_rule {
+						enabled = true
+						abort_incomplete_multipart_upload_days = 30
+					}
+				}`, bucketLifecycle, objectTestsMainRegion),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExists(tt, "scaleway_object_bucket.main-bucket-lifecycle", true),
+					testAccCheckScalewayObjectBucketLifecycleConfigurationExists(tt, resourceNameLifecycle),
+					resource.TestCheckResourceAttrSet(resourceNameLifecycle, "lifecycle_rule.0.id"),
+					resource.TestCheckResourceAttrSet(resourceNameLifecycle, "lifecycle_rule.1.id"),
+					resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.prefix", ""),
+					resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.expiration.0.days", "2"),
+					resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.1.abort_incomplete_multipart_upload_days", "30"),
+				),
+			},
 		},
 	})
 }