Retry S3 OperationAborted errors

[nijave]

These crop up when Terraform is performing an operation against a bucket and tries to perform a conflicting operation against the same bucket in parallel. This will allow Terraform to automatically retry instead of having to rerun the Terraform command

Fixes #7628

(don't have the error from Terraform handy but here's what the details look like)

Community Note

• Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Release note for CHANGELOG:

Retry conflicting S3 bucket operations

[nijave]

I fixed the merge conflict--the changes should still apply but I no longer have a handy way to test this

[zhelding]

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

[breathingdust]

Hi all 👋 Just letting you know that this is issue is featured on this quarters roadmap. If a PR exists to close the issue a maintainer will review and either make changes directly, or work with the original author to get the contribution merged. If you have written a PR to resolve the issue please ensure the "Allow edits from maintainers" box is checked. Thanks for your patience and we are looking forward to getting this merged soon!

[YakDriver]

@nijave Thanks for your work on this! I do not see a good way of testing this. However, since it is in line with the way we handle this with many other services, I see no problem moving forward. We will have to rely on the community to make that this resolves all the issues in #7628 .

[YakDriver]

Great work! 🎉

Output from acceptance tests:
(Several of the S3 tests are flaky)

--- PASS: TestAccS3Bucket_Tags_ignoreTags (52.21s)
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (80.69s)
--- PASS: TestAccS3Bucket_Replication_basic (125.98s)
--- PASS: TestAccS3Bucket_Basic_basic (60.95s)
--- PASS: TestAccS3Bucket_Basic_emptyString (59.28s)
--- PASS: TestAccS3Bucket_Basic_forceDestroy (47.66s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (50.35s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (58.71s)
--- PASS: TestAccS3Bucket_Basic_generatedName (78.23s)
--- PASS: TestAccS3Bucket_Basic_keyEnabled (91.82s)
--- PASS: TestAccS3Bucket_Basic_namePrefix (77.49s)
--- PASS: TestAccS3Bucket_Basic_requestPayer (126.90s)
--- PASS: TestAccS3Bucket_Basic_shouldFailNotFound (43.16s)
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (214.29s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (121.61s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (95.45s)
--- PASS: TestAccS3Bucket_Manage_objectLock (98.43s)
--- PASS: TestAccS3Bucket_Manage_versioning (208.21s)
--- PASS: TestAccS3Bucket_Replication_expectVersioningValidationError (37.20s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (140.62s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (133.89s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (479.90s)
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (68.91s)
--- PASS: TestAccS3Bucket_Replication_twoDestination (74.42s)
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (73.93s)
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (86.31s)
--- PASS: TestAccS3Bucket_Security_aclToGrant (140.56s)
--- PASS: TestAccS3Bucket_Security_corsDelete (73.60s)
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (61.01s)
--- PASS: TestAccS3Bucket_Security_corsUpdate (156.49s)
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (156.64s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (90.31s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (93.00s)
--- PASS: TestAccS3Bucket_Security_grantToACL (138.78s)
--- PASS: TestAccS3Bucket_Security_logging (74.49s)
--- PASS: TestAccS3Bucket_Security_policy (209.06s)
--- PASS: TestAccS3Bucket_Security_updateACL (139.60s)
--- PASS: TestAccS3Bucket_Security_updateGrant (207.80s)
--- PASS: TestAccS3Bucket_Tags_basic (78.36s)
--- PASS: TestAccS3Bucket_Tags_withNoSystemTags (190.64s)
--- PASS: TestAccS3Bucket_Tags_withSystemTags (247.73s)
--- PASS: TestAccS3Bucket_Web_redirect (207.96s)
--- PASS: TestAccS3Bucket_Web_routingRules (156.11s)
--- PASS: TestAccS3Bucket_Web_simple (208.19s)
--- PASS: TestAccS3BucketPolicy_basic (122.71s)
--- PASS: TestAccS3BucketPolicy_policyUpdate (213.74s)
--- PASS: TestAccS3BucketPublicAccessBlock_basic (115.38s)
--- PASS: TestAccS3BucketPublicAccessBlock_blockPublicACLs (214.57s)
--- PASS: TestAccS3BucketPublicAccessBlock_blockPublicPolicy (179.74s)
--- PASS: TestAccS3BucketPublicAccessBlock_disappears (101.07s)
--- PASS: TestAccS3BucketPublicAccessBlock_Disappears_bucket (66.10s)
--- PASS: TestAccS3BucketPublicAccessBlock_ignorePublicACLs (130.33s)
--- PASS: TestAccS3BucketPublicAccessBlock_restrictPublicBuckets (123.16s)
--- SKIP: TestAccS3Bucket_Basic_acceleration (0.00s)
--- SKIP: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (30.46s)
--- SKIP: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (32.95s)
--- SKIP: TestAccS3Bucket_Replication_RTC_valid (26.40s)

[github-actions]

This functionality has been released in v3.67.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

[github-actions]

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.