From be60d39b24cd245bef76ce2857a6e11773efe864 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Thu, 26 Mar 2015 11:45:16 -0500
Subject: [PATCH] Add proper reading/updating of tags for S3

---
 builtin/providers/aws/resource_aws_s3_bucket.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go
index 0b5ef23260..c45e439b67 100644
--- a/builtin/providers/aws/resource_aws_s3_bucket.go
+++ b/builtin/providers/aws/resource_aws_s3_bucket.go
@@ -91,6 +91,18 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
+
+	resp, err := s3conn.GetBucketTagging(&s3.GetBucketTaggingRequest{
+		Bucket: aws.String(d.Id()),
+	})
+	if err != nil {
+		return err
+	}
+
+	if err := d.Set("tags", tagsToMapS3(resp.TagSet)); err != nil {
+		return err
+	}
+
 	return nil
 }