feat(object): add tags to buckets (#501)

Author: Sh4d1

scaleway/helpers_object.go

@@ -0,0 +1,37 @@
+package scaleway
+
+import (
+	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+)
+
+func flattenObjectBucketTags(tagsSet []*s3.Tag) map[string]interface{} {
+	tags := map[string]interface{}{}
+
+	for _, tagSet := range tagsSet {
+		var key string
+		var value string
+		if tagSet.Key != nil {
+			key = *tagSet.Key
+		}
+		if tagSet.Value != nil {
+			value = *tagSet.Value
+		}
+		tags[key] = value
+	}
+
+	return tags
+}
+
+func expandObjectBucketTags(tags interface{}) []*s3.Tag {
+	tagsSet := make([]*s3.Tag, 0)
+
+	for key, value := range tags.(map[string]interface{}) {
+		tagsSet = append(tagsSet, &s3.Tag{
+			Key:   &key,
+			Value: scw.StringPtr(value.(string)),
+		})
+	}
+
+	return tagsSet
+}

scaleway/resource_object_bucket.go

@@ -38,6 +38,14 @@ func resourceScalewayObjectBucket() *schema.Resource {
 					s3.ObjectCannedACLAuthenticatedRead,
 				}, false),
 			},
+			"tags": {
+				Type: schema.TypeMap,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Optional:    true,
+				Description: "The tags associated with this bucket",
+			},
 			"region": regionSchema(),
 		},
 	}
@@ -60,6 +68,20 @@ func resourceScalewayObjectBucketCreate(d *schema.ResourceData, m interface{}) e
 		return err
 	}
 
+	tagsSet := expandObjectBucketTags(d.Get("tags"))
+
+	if len(tagsSet) > 0 {
+		_, err = s3Client.PutBucketTagging(&s3.PutBucketTaggingInput{
+			Bucket: aws.String(bucketName),
+			Tagging: &s3.Tagging{
+				TagSet: tagsSet,
+			},
+		})
+		if err != nil {
+			return err
+		}
+	}
+
 	d.SetId(newRegionalId(region, bucketName))
 
 	return resourceScalewayObjectBucketRead(d, m)
@@ -94,6 +116,21 @@ func resourceScalewayObjectBucketRead(d *schema.ResourceData, m interface{}) err
 		return fmt.Errorf("couldn't read bucket: %s", err)
 	}
 
+	var tagsSet []*s3.Tag
+
+	tagsResponse, err := s3Client.GetBucketTagging(&s3.GetBucketTaggingInput{
+		Bucket: aws.String(bucketName),
+	})
+	if err != nil {
+		if serr, ok := err.(awserr.Error); !ok || serr.Code() != "NoSuchTagSet" {
+			return fmt.Errorf("couldn't read tags from bucket: %s", err)
+		}
+	} else {
+		tagsSet = tagsResponse.TagSet
+	}
+
+	_ = d.Set("tags", flattenObjectBucketTags(tagsSet))
+
 	return nil
 }
 
@@ -116,6 +153,17 @@ func resourceScalewayObjectBucketUpdate(d *schema.ResourceData, m interface{}) e
 		}
 	}
 
+	if d.HasChange("tags") {
+		tagsSet := expandObjectBucketTags(d.Get("tags"))
+
+		_, err = s3Client.PutBucketTagging(&s3.PutBucketTaggingInput{
+			Bucket: aws.String(bucketName),
+			Tagging: &s3.Tagging{
+				TagSet: tagsSet,
+			},
+		})
+	}
+
 	return resourceScalewayObjectBucketRead(d, m)
 }
 

scaleway/resource_object_bucket_test.go

@@ -32,6 +32,9 @@ var (
 var testAccCheckScalewayObjectBucket = fmt.Sprintf(`
 	resource "scaleway_object_bucket" "base" {
 		name = "%s"
+		tags = {
+			foo = "bar"
+		}
 	}
 
 	resource "scaleway_object_bucket" "ams-bucket" {
@@ -63,6 +66,8 @@ func TestAccScalewayObjectBucket(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("scaleway_object_bucket.base", "name", testBucketName),
 					resource.TestCheckResourceAttr("scaleway_object_bucket.base", "acl", testBucketACL),
+					resource.TestCheckResourceAttr("scaleway_object_bucket.base", "tags.%", "1"),
+					resource.TestCheckResourceAttr("scaleway_object_bucket.base", "tags.foo", "bar"),
 					resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "name", testBucketNameAms),
 					resource.TestCheckResourceAttr("scaleway_object_bucket.par-bucket", "name", testBucketNamePar),
 				),
@@ -72,6 +77,7 @@ func TestAccScalewayObjectBucket(t *testing.T) {
 				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"),
 				),
 			},
 		},

website/docs/r/object_bucket.html.markdown

@@ -15,6 +15,9 @@ Creates and manages Scaleway object storage buckets. For more information, see [
 resource "scaleway_object_bucket" "some_bucket" {
     name = "some-unique-name"
     acl = "private"
+    tags = {
+        key = "value"
+    }
 }
 ```
 
@@ -23,6 +26,7 @@ resource "scaleway_object_bucket" "some_bucket" {
 The following arguments are supported:
 
 * `name` - (Required) The name of the bucket.
+* `tags` - (Optional) A list of tags (key / value) for the bucket.
 * `acl` - (Optional) The [canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) you want to apply to the bucket.
 * `region` - (Optional) The [region](https://developers.scaleway.com/en/quickstart/#region-definition) in which the bucket should be created.