Go-VCR: Account for clients with extra options containing `Retryer` overrides

[jar-b]

Description

#42801 added a generated functional option for all AWS service clients to handle VCR-specific error codes. However, if a service client has "extra options" implemented which also overrides the default Retryer, the generated option may be overwritten during client initialization. One known example is the S3 client:

terraform-provider-aws/internal/service/s3/service_package.go

Lines 40 to 47 in b3cd3cc

	func(o *s3.Options) {
	o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary {
	if tfawserr.ErrMessageContains(err, errCodeOperationAborted, "A conflicting conditional operation is currently in progress against this resource. Please try again.") {
	return aws.TrueTernary
	}
	return aws.UnknownTernary // Delegate to configured Retryer.
	}))
	},

When the Retryer is overridden in this way, VCR-specific errors can once again cause replayed acceptance tests to hang while retrying interaction not found errors.

=== NAME  TestAccElastiCacheCluster_Engine_Redis_LogDeliveryConfigurations
    cluster_test.go:1053: Step 1/9 error: Error running apply: exit status 1

        Error: creating S3 Bucket (terraform-20250610133851487100000001): operation error S3: CreateBucket, exceeded maximum number of attempts, 25, https response error StatusCode: 0, RequestID: , HostID: , request send failed, Put "https://terraform-20250610133851487100000001.s3.us-west-2.amazonaws.com/": requested interaction not found

          with aws_s3_bucket.b,
          on terraform_plugin_test.tf line 39, in resource "aws_s3_bucket" "b":
          39: resource "aws_s3_bucket" "b" {

--- FAIL: TestAccElastiCacheCluster_Engine_Redis_LogDeliveryConfigurations (4211.93s)

We should either:

1. Append to the existing set of retryable functions in the "extra options" (research needed to determine feasability).
2. Manually include the VCR-specific logic in the "extra options" definition for impacted clients. If this is only a handful of services this may be the pragmatic, if not most elegant, option.

Important Facts and References

Relates #25602
Relates #42801

Would you like to implement a relevant change?

No

[github-actions]

Community Guidelines

This comment is added to every new Issue to provide quick reference to how the Terraform AWS Provider is maintained. Please review the information below, and thank you for contributing to the community that keeps the provider thriving! 🚀

Voting for Prioritization

• Please vote on this Issue by adding a 👍 reaction to the original post to help the community and maintainers prioritize it.
• Please see our prioritization guide for additional information on how the maintainers handle prioritization.
• Please do not leave +1 or other comments that do not add relevant new information or questions; they generate extra noise for others following the Issue and do not help prioritize the request.

Volunteering to Work on This Issue

• If you are interested in working on this issue, please leave a comment.
• If this would be your first contribution, please review the contribution guide.
• For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.

[jar-b]

15 service clients override the Retryer in this way:

% rg -l "o\.Retryer" internal/service/**/service_package.go
internal/service/kinesis/service_package.go
internal/service/lightsail/service_package.go
internal/service/organizations/service_package.go
internal/service/apigateway/service_package.go
internal/service/appsync/service_package.go
internal/service/apigatewayv2/service_package.go
internal/service/s3/service_package.go
internal/service/schemas/service_package.go
internal/service/dynamodb/service_package.go
internal/service/ssoadmin/service_package.go
internal/service/cloudformation/service_package.go
internal/service/cloudhsmv2/service_package.go
internal/service/ec2/service_package.go
internal/service/kafka/service_package.go
internal/service/fms/service_package.go