Merge pull request #5474 from kjmkznr/skip-normalize-empty-policy

provider/aws: Fix error parsing JSON in S3 bucket policy
hashicorp · Mar 7, 2016 · 46e4717 · 46e4717
2 parents 122e9ac + 8d1292d
commit 46e4717
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go
@@ -907,7 +907,7 @@ func removeNil(data map[string]interface{}) map[string]interface{} {
 }
 
 func normalizeJson(jsonString interface{}) string {
-	if jsonString == nil {
+	if jsonString == nil || jsonString == "" {
 		return ""
 	}
 	var j interface{}

diff --git a/builtin/providers/aws/resource_aws_s3_bucket_test.go b/builtin/providers/aws/resource_aws_s3_bucket_test.go
@@ -69,6 +69,14 @@ func TestAccAWSS3Bucket_Policy(t *testing.T) {
 						"aws_s3_bucket.bucket", ""),
 				),
 			},
+			resource.TestStep{
+				Config: testAccAWSS3BucketConfigWithEmptyPolicy(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSS3BucketExists("aws_s3_bucket.bucket"),
+					testAccCheckAWSS3BucketPolicy(
+						"aws_s3_bucket.bucket", ""),
+				),
+			},
 		},
 	})
 }
@@ -724,6 +732,16 @@ resource "aws_s3_bucket" "bucket" {
 `, randInt)
 }
 
+func testAccAWSS3BucketConfigWithEmptyPolicy(randInt int) string {
+	return fmt.Sprintf(`
+resource "aws_s3_bucket" "bucket" {
+	bucket = "tf-test-bucket-%d"
+	acl = "public-read"
+	policy = ""
+}
+`, randInt)
+}
+
 func testAccAWSS3BucketConfigWithVersioning(randInt int) string {
 	return fmt.Sprintf(`
 resource "aws_s3_bucket" "bucket" {