Skip to content

Commit

Permalink
resource/aws_s3control_bucket: Remove workaround fixed in AWS Go SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
bflad committed Oct 16, 2020
1 parent d21ec0b commit c58091d
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions aws/resource_aws_s3control_bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,6 @@ func resourceAwsS3ControlBucketDelete(d *schema.ResourceData, meta interface{})
// can occur on deletion:
// InvalidBucketState: Bucket is in an invalid state
err = resource.Retry(s3controlBucketStatePropagationTimeout, func() *resource.RetryError {
// Reference: https://github.com/aws/aws-sdk-go/issues/3583
input.Bucket = aws.String(d.Id())

_, err := conn.DeleteBucket(input)

if tfawserr.ErrCodeEquals(err, "InvalidBucketState") {
Expand All @@ -216,9 +213,6 @@ func resourceAwsS3ControlBucketDelete(d *schema.ResourceData, meta interface{})
})

if tfresource.TimedOut(err) {
// Reference: https://github.com/aws/aws-sdk-go/issues/3583
input.Bucket = aws.String(d.Id())

_, err = conn.DeleteBucket(input)
}

Expand Down

0 comments on commit c58091d

Please sign in to comment.