fix(object): fix failing acceptance tests (#808)

Signed-off-by: Julien ALEXANDRE <[email protected]>

* fix(object): fix & test expandObjectBucketTags helper

Co-authored-by: DuarteRoberto <[email protected]>
Co-authored-by: paulden <[email protected]>
Co-authored-by: pomverte <[email protected]>
Co-authored-by: ralbon <[email protected]>
Co-authored-by: schaltiemi <[email protected]>
Co-authored-by: Rémy Léone <[email protected]>

Author: 7 people

scaleway/helpers_object.go

@@ -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),
 		})
 	}

scaleway/helpers_object_test.go

@@ -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))
+		})
+	}
+}

scaleway/resource_object_bucket.go

@@ -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)
 		}

scaleway/resource_object_bucket_test.go

@@ -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" {
@@ -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),
@@ -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"),
 				),
 			},
 		},