From e21ad5c3be149b71aae8372bb5e5a07687b425d3 Mon Sep 17 00:00:00 2001
From: Stuart Auld <sauld@cozero.com.au>
Date: Tue, 2 Jan 2018 15:08:08 +1100
Subject: [PATCH] Set the resource ID after successful creation

---
 aws/resource_aws_s3_bucket_policy.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aws/resource_aws_s3_bucket_policy.go b/aws/resource_aws_s3_bucket_policy.go
index 593d144fbd7..b7f7fed8f43 100644
--- a/aws/resource_aws_s3_bucket_policy.go
+++ b/aws/resource_aws_s3_bucket_policy.go
@@ -42,8 +42,6 @@ func resourceAwsS3BucketPolicyPut(d *schema.ResourceData, meta interface{}) erro
 	bucket := d.Get("bucket").(string)
 	policy := d.Get("policy").(string)
 
-	d.SetId(bucket)
-
 	log.Printf("[DEBUG] S3 bucket: %s, put policy: %s", bucket, policy)
 
 	params := &s3.PutBucketPolicyInput{
@@ -67,6 +65,8 @@ func resourceAwsS3BucketPolicyPut(d *schema.ResourceData, meta interface{}) erro
 		return fmt.Errorf("Error putting S3 policy: %s", err)
 	}
 
+	d.SetId(bucket)
+
 	return nil
 }