Merge pull request #12949 from nijave/nv-retry-s3-ops-in-progress-errors

Retry S3 OperationAborted errors
hashicorp · Nov 19, 2021 · 9e0b7e9 · 9e0b7e9
2 parents 8f298ae + e8a8982
commit 9e0b7e9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/.changelog/12949.txt b/.changelog/12949.txt
@@ -0,0 +1,11 @@
+```release-note:bug
+resource/aws_s3_bucket: Prevent `OperationAborted` conflict errors when simultaneously applying `aws_s3_bucket_policy`, `aws_s3_bucket_public_access_block` changes
+```
+
+```release-note:bug
+resource/aws_s3_bucket_policy: Prevent `OperationAborted` conflict errors when simultaneously applying `aws_s3_bucket`, `aws_s3_bucket_public_access_block` changes
+```
+
+```release-note:bug
+resource/aws_s3_bucket_public_access_block: Prevent `OperationAborted` conflict errors when simultaneously applying `aws_s3_bucket_policy`, `aws_s3_bucket` changes
+```
diff --git a/internal/conns/conns.go b/internal/conns/conns.go
@@ -1740,6 +1740,12 @@ func (c *Config) Client() (interface{}, error) {
 		}
 	})
 
+	client.S3Conn.Handlers.Retry.PushBack(func(r *request.Request) {
+		if tfawserr.ErrMessageContains(r.Error, "OperationAborted", "A conflicting conditional operation is currently in progress against this resource. Please try again.") {
+			r.Retryable = aws.Bool(true)
+		}
+	})
+
 	// Reference: https://github.com/hashicorp/terraform-provider-aws/issues/17996
 	client.SecurityHubConn.Handlers.Retry.PushBack(func(r *request.Request) {
 		switch r.Operation.Name {