From 47e1ec85f19cdce279a75d5c648a3a224111a36b Mon Sep 17 00:00:00 2001
From: Phil Frost <phil.frost@paperg.com>
Date: Fri, 17 Apr 2015 13:30:31 -0400
Subject: [PATCH] Refresh state for deleted s3 bucket correctly

If reading an S3 bucket's state, and that bucket has been deleted, don't
fail with a 404 error. Instead, update the state to reflect that the
bucket does not exist. Fixes #1574.
---
 builtin/providers/aws/resource_aws_s3_bucket.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go
index 2d2e022d2..4481aaad0 100644
--- a/builtin/providers/aws/resource_aws_s3_bucket.go
+++ b/builtin/providers/aws/resource_aws_s3_bucket.go
@@ -85,7 +85,13 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error {
 		Bucket: aws.String(d.Id()),
 	})
 	if err != nil {
-		return err
+		if awsError, ok := err.(aws.APIError); ok && awsError.StatusCode == 404 {
+			d.SetId("")
+		} else {
+			// some of the AWS SDK's errors can be empty strings, so let's add
+			// some additional context.
+			return fmt.Errorf("error reading S3 bucket \"%s\": %#v", d.Id())
+		}
 	}
 
 	tagSet, err := getTagSetS3(s3conn, d.Id())