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

fix(object): fix failing acceptance tests #808

Merged
merged 3 commits into from
Apr 13, 2021
Merged

fix(object): fix failing acceptance tests #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
332d2f1
fix(object): fix & test expandObjectBucketTags helper
ndrpnt Apr 2, 2021
886a275
fix(object): fix error when updating bucket with empty tagsSet
ndrpnt Apr 2, 2021
9e61ad6
Merge branch 'master' into fix-object-bucket
remyleone Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scaleway/helpers_object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func expandObjectBucketTags(tags interface{}) []*s3.Tag {
tagsSet := []*s3.Tag(nil)
for key, value := range tags.(map[string]interface{}) {
tagsSet = append(tagsSet, &s3.Tag{
Key: &key,
Key: scw.StringPtr(key),
Value: expandStringPtr(value),
})
}
Expand Down
50 changes: 50 additions & 0 deletions scaleway/helpers_object_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package scaleway

import (
"testing"

"github.com/aws/aws-sdk-go/service/s3"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/stretchr/testify/assert"
)

func TestExpandObjectBucketTags(t *testing.T) {
tests := []struct {
name string
tags interface{}
want []*s3.Tag
}{
{
name: "no tags",
tags: map[string]interface{}{},
want: []*s3.Tag(nil),
},
{
name: "single tag",
tags: map[string]interface{}{
"key1": "val1",
},
want: []*s3.Tag{
{Key: scw.StringPtr("key1"), Value: scw.StringPtr("val1")},
},
},
{
name: "many tags",
tags: map[string]interface{}{
"key1": "val1",
"key2": "val2",
"key3": "val3",
},
want: []*s3.Tag{
{Key: scw.StringPtr("key1"), Value: scw.StringPtr("val1")},
{Key: scw.StringPtr("key2"), Value: scw.StringPtr("val2")},
{Key: scw.StringPtr("key3"), Value: scw.StringPtr("val3")},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert.ElementsMatch(t, tt.want, expandObjectBucketTags(tt.tags))
})
}
}
18 changes: 12 additions & 6 deletions scaleway/resource_object_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,18 @@ func resourceScalewayObjectBucketUpdate(ctx context.Context, d *schema.ResourceD
if d.HasChange("tags") {
tagsSet := expandObjectBucketTags(d.Get("tags"))

_, err = s3Client.PutBucketTaggingWithContext(ctx, &s3.PutBucketTaggingInput{
Bucket: scw.StringPtr(bucketName),
Tagging: &s3.Tagging{
TagSet: tagsSet,
},
})
if len(tagsSet) > 0 {
_, err = s3Client.PutBucketTaggingWithContext(ctx, &s3.PutBucketTaggingInput{
Bucket: scw.StringPtr(bucketName),
Tagging: &s3.Tagging{
TagSet: tagsSet,
},
})
} else {
_, err = s3Client.DeleteBucketTaggingWithContext(ctx, &s3.DeleteBucketTaggingInput{
Bucket: scw.StringPtr(bucketName),
})
}
if err != nil {
return diag.FromErr(err)
}
Expand Down
21 changes: 20 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 @@ -47,6 +47,10 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) {
resource "scaleway_object_bucket" "ams-bucket" {
name = "%s"
region = "nl-ams"
tags = {
foo = "bar"
baz = "qux"
}
}

resource "scaleway_object_bucket" "par-bucket" {
Expand All @@ -62,6 +66,9 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "endpoint", fmt.Sprintf("https://%s.s3.%s.scw.cloud", testBucketName, "fr-par")),

resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "name", testBucketNameAms),
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "tags.%", "2"),
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "tags.foo", "bar"),
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "tags.baz", "qux"),
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "endpoint", fmt.Sprintf("https://%s.s3.%s.scw.cloud", testBucketNameAms, "nl-ams")),

resource.TestCheckResourceAttr("scaleway_object_bucket.par-bucket", "name", testBucketNamePar),
Expand All @@ -74,11 +81,23 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) {
name = "%s"
acl = "%s"
}
`, testBucketName, testBucketUpdatedACL),

resource "scaleway_object_bucket" "ams-bucket" {
name = "%s"
region = "nl-ams"
tags = {
foo = "bar"
}
}
`, testBucketName, testBucketUpdatedACL, testBucketNameAms),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "name", testBucketName),
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "acl", testBucketUpdatedACL),
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "tags.%", "0"),

resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "name", testBucketNameAms),
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "tags.%", "1"),
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "tags.foo", "bar"),
),
},
},
Expand Down