Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(object): lifecycle rules: fix parsing error when prefix+1tag set #2455

Merged
merged 6 commits into from
Mar 13, 2024
Merged

fix(object): lifecycle rules: fix parsing error when prefix+1tag set #2455

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d52117
fix(object): lifecycle rules: fix parsing error when prefix+1tag set
Mia-Cross Mar 13, 2024
7bfaae8
Merge branch 'master' into object_lifecycle_fix_filter_parsing
Mia-Cross Mar 13, 2024
75ae1ac
whitespace fixing attempt
Mia-Cross Mar 13, 2024
625904b
whitespace fixing attempt 2
Mia-Cross Mar 13, 2024
1d7f8eb
rework to check for prefix content before setting it
Mia-Cross Mar 13, 2024
9c2f479
cassette
Mia-Cross Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions scaleway/resource_object_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,19 +352,20 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.S3, d *schema.R

// Filter
tags := expandObjectBucketTags(r["tags"])
ruleHasPrefix := len(r["prefix"].(string)) > 0
filter := &s3.LifecycleRuleFilter{}
if len(tags) == 1 {

if !ruleHasPrefix && len(tags) == 1 {
filter.SetTag(tags[0])
}
if len(tags) > 1 {
lifecycleRuleAndOp := &s3.LifecycleRuleAndOperator{}
if len(r["prefix"].(string)) > 0 {
} else {
if len(tags) == 0 {
filter.SetPrefix(r["prefix"].(string))
Codelax marked this conversation as resolved.
Show resolved Hide resolved
} else {
lifecycleRuleAndOp := &s3.LifecycleRuleAndOperator{}
lifecycleRuleAndOp.SetPrefix(r["prefix"].(string))
lifecycleRuleAndOp.SetTags(tags)
filter.SetAnd(lifecycleRuleAndOp)
}
lifecycleRuleAndOp.SetTags(tags)
filter.SetAnd(lifecycleRuleAndOp)
} else if len(r["prefix"].(string)) > 0 {
filter.SetPrefix(r["prefix"].(string))
}
rule.SetFilter(filter)

Expand Down
30 changes: 29 additions & 1 deletion scaleway/resource_object_bucket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func TestAccScalewayObjectBucket_Lifecycle(t *testing.T) {
name = "%s"
region = "%s"
acl = "private"

lifecycle_rule {
id = "id1"
prefix = "path1/"
Expand Down Expand Up @@ -348,6 +348,34 @@ func TestAccScalewayObjectBucket_Lifecycle(t *testing.T) {
resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.abort_incomplete_multipart_upload_days", "30"),
),
},
{
Config: fmt.Sprintf(`
resource "scaleway_object_bucket" "main-bucket-lifecycle"{
name = "%s"
region = "%s"
acl = "private"

lifecycle_rule {
prefix = "path1/"
enabled = true
tags = {
"deleted" = "true"
}
expiration {
days = 1
}
}
}
`, 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.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.tags.deleted", "true"),
resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.prefix", "path1/"),
resource.TestCheckResourceAttr(resourceNameLifecycle, "lifecycle_rule.0.expiration.0.days", "1"),
),
},
},
})
}
Expand Down