Merge pull request #33531 from hashicorp/f-sdk-go-v2-retriers

S3 bucket resources retry delete on `conflicting conditional operation` errors

Author: ewbankkit

.changelog/33531.txt

@@ -0,0 +1,11 @@
+```release-note:bug
+resource/aws_s3_bucket_policy: Retry resource Delete on `OperationAborted: A conflicting conditional operation is currently in progress against this resource` errors
+```
+
+```release-note:bug
+resource/aws_s3_bucket_versioning: Retry resource Delete on `OperationAborted: A conflicting conditional operation is currently in progress against this resource` errors
+```
+
+```release-note:bug
+resource/aws_s3_bucket_accelerate_configuration: Retry resource Delete on `OperationAborted: A conflicting conditional operation is currently in progress against this resource` errors
+```

internal/conns/apiretry.go

@@ -0,0 +1,29 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package conns
+
+import (
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/retry"
+)
+
+// AddIsErrorRetryables returns a Retryer which runs the specified retryables on any error.
+func AddIsErrorRetryables(r aws.RetryerV2, retryables ...retry.IsErrorRetryable) aws.RetryerV2 {
+	return &withIsErrorRetryables{
+		RetryerV2:  r,
+		retryables: retryables,
+	}
+}
+
+type withIsErrorRetryables struct {
+	aws.RetryerV2
+	retryables retry.IsErrorRetryables
+}
+
+func (r *withIsErrorRetryables) IsErrorRetryable(err error) bool {
+	if v := r.retryables.IsErrorRetryable(err); v != aws.UnknownTernary {
+		return v.Bool()
+	}
+	return r.RetryerV2.IsErrorRetryable(err)
+}

internal/conns/apiretry_test.go

@@ -0,0 +1,54 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package conns
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/retry"
+	"github.com/hashicorp/terraform-provider-aws/internal/errs"
+)
+
+func TestAddIsErrorRetryables(t *testing.T) {
+	t.Parallel()
+
+	f := func(err error) aws.Ternary {
+		if errs.Contains(err, "testing") {
+			return aws.TrueTernary
+		}
+		return aws.UnknownTernary
+	}
+	testCases := []struct {
+		name     string
+		err      error
+		expected bool
+	}{
+		{
+			name: "no error",
+		},
+		{
+			name: "non-retryable",
+			err:  errors.New(`this is not retryable`),
+		},
+		{
+			name:     "retryable",
+			err:      errors.New(`this is testing`),
+			expected: true,
+		},
+	}
+
+	for _, testCase := range testCases {
+		testCase := testCase
+		t.Run(testCase.name, func(t *testing.T) {
+			t.Parallel()
+
+			got := AddIsErrorRetryables(retry.NewStandard(), retry.IsErrorRetryableFunc(f)).IsErrorRetryable(testCase.err)
+			if got, want := got, testCase.expected; got != want {
+				t.Errorf("IsErrorRetryable(%q) = %v, want %v", testCase.err, got, want)
+			}
+		})
+	}
+}

internal/service/s3/bucket_object_data_source_test.go

@@ -363,23 +363,6 @@ func TestAccS3BucketObjectDataSource_multipleSlashes(t *testing.T) {
 	})
 }
 
-func TestAccS3BucketObjectDataSource_singleSlashAsKey(t *testing.T) {
-	ctx := acctest.Context(t)
-	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:                  func() { acctest.PreCheck(ctx, t) },
-		ErrorCheck:                acctest.ErrorCheck(t, s3.EndpointsID),
-		ProtoV5ProviderFactories:  acctest.ProtoV5ProviderFactories,
-		PreventPostDestroyRefresh: true,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccBucketObjectDataSourceConfig_singleSlashAsKey(rName),
-			},
-		},
-	})
-}
-
 func testAccBucketObjectDataSourceConfig_basic(randInt int) string {
 	return fmt.Sprintf(`
 resource "aws_s3_bucket" "object_bucket" {
@@ -685,16 +668,3 @@ data "aws_s3_object" "obj3" {
 
 	return resources, both
 }
-
-func testAccBucketObjectDataSourceConfig_singleSlashAsKey(rName string) string {
-	return fmt.Sprintf(`
-resource "aws_s3_bucket" "test" {
-  bucket = %[1]q
-}
-
-data "aws_s3_object" "test" {
-  bucket = aws_s3_bucket.test.bucket
-  key    = "/"
-}
-`, rName)
-}

internal/service/s3/service_package.go

@@ -7,13 +7,16 @@ import (
 	"context"
 
 	aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
+	retry_sdkv2 "github.com/aws/aws-sdk-go-v2/aws/retry"
 	s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3"
 	aws_sdkv1 "github.com/aws/aws-sdk-go/aws"
 	endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints"
 	request_sdkv1 "github.com/aws/aws-sdk-go/aws/request"
 	session_sdkv1 "github.com/aws/aws-sdk-go/aws/session"
 	s3_sdkv1 "github.com/aws/aws-sdk-go/service/s3"
-	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	tfawserr_sdkv1 "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	tfawserr_sdkv2 "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr"
+	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 )
 
 // NewConn returns a new AWS SDK for Go v1 client for this service package's AWS API.
@@ -34,7 +37,7 @@ func (p *servicePackage) NewConn(ctx context.Context, m map[string]any) (*s3_sdk
 // CustomizeConn customizes a new AWS SDK for Go v1 client for this service package's AWS API.
 func (p *servicePackage) CustomizeConn(ctx context.Context, conn *s3_sdkv1.S3) (*s3_sdkv1.S3, error) {
 	conn.Handlers.Retry.PushBack(func(r *request_sdkv1.Request) {
-		if tfawserr.ErrMessageContains(r.Error, errCodeOperationAborted, "A conflicting conditional operation is currently in progress against this resource. Please try again.") {
+		if tfawserr_sdkv1.ErrMessageContains(r.Error, errCodeOperationAborted, "A conflicting conditional operation is currently in progress against this resource. Please try again.") {
 			r.Retryable = aws_sdkv1.Bool(true)
 		}
 	})
@@ -55,5 +58,12 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 			o.Region = "aws-global"
 		}
 		o.UsePathStyle = config["s3_use_path_style"].(bool)
+
+		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry_sdkv2.IsErrorRetryableFunc(func(err error) aws_sdkv2.Ternary {
+			if tfawserr_sdkv2.ErrMessageContains(err, errCodeOperationAborted, "A conflicting conditional operation is currently in progress against this resource. Please try again.") {
+				return aws_sdkv2.TrueTernary
+			}
+			return aws_sdkv2.UnknownTernary // Delegate to configured Retryer.
+		}))
 	}), nil
 }