Merge pull request #2820 from sjauld/2819-aws_s3_bucket_policy_derp

r/aws_s3_bucket_policy: set the resource ID after successful creation
hashicorp · Jan 2, 2018 · 86502f0 · 86502f0
2 parents c3b13ed + e21ad5c
commit 86502f0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 }