feat(go-vcr): include go-vcr retryer override when configured via extra options

[jar-b]

Description

All generated service clients contain a functional option which overrides the default retryer with additional handling for go-vcr-specific errors. However, a handful of service clients include additional hand-written options which also override the default retryer, typically addressing some nuance related to error codes unique to a given service. To ensure these service-local overrides do not overwrite the go-vcr handling, the extra options implementations have been modified to merge both sets of retryables.

Relations

Closes #42949
Relates #25602
Relates #42801

Output from Acceptance Testing

Example of a go-vcr failure which previously hung due to unintentional retries on the EC2 client. This now fails immediately once the first go-vcr error is encountered (as desired).

% VCR_MODE=REPLAY_ONLY VCR_PATH=/Users/jaredbaker/development/_vcr-testdata/ make testacc PKG=timestreaminfluxdb TESTS=TestAccTimestreamInfluxDBDBCluster_basic
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.24.6 test ./internal/service/timestreaminfluxdb/... -v -count 1 -parallel 20 -run='TestAccTimestreamInfluxDBDBCluster_basic'  -timeout 360m -vet=off
2025/08/28 14:41:43 Creating Terraform AWS Provider (SDKv2-style)...
2025/08/28 14:41:43 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccTimestreamInfluxDBDBCluster_basic
=== PAUSE TestAccTimestreamInfluxDBDBCluster_basic
=== CONT  TestAccTimestreamInfluxDBDBCluster_basic
    db_cluster_test.go:35: Step 1/2 error: Error running apply: exit status 1

        Error: creating Security Group (terraform-20250828184146602500000001): operation error EC2: CreateSecurityGroup, https response error StatusCode: 0, RequestID: , request send failed, Post "https://ec2.us-west-2.amazonaws.com/": requested interaction not found

          with aws_security_group.test,
          on terraform_plugin_test.tf line 42, in resource "aws_security_group" "test":
          42: resource "aws_security_group" "test" {

--- FAIL: TestAccTimestreamInfluxDBDBCluster_basic (5.38s)
FAIL
FAIL    github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb 11.930s
FAIL
make: *** [testacc] Error 1

[github-actions]

Community Guidelines

This comment is added to every new Pull Request 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 Pull Request 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 Pull Request and do not help prioritize the request.

Pull Request Authors

• Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
• Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

[ewbankkit]

LGTM 🚀.

[github-actions]

Warning

This Issue has been closed, meaning that any additional comments are much easier for the maintainers to miss. Please assume that the maintainers will not see them.

Ongoing conversations amongst community members are welcome, however, the issue will be locked after 30 days. Moving conversations to another venue, such as the AWS Provider forum, is recommended. If you have additional concerns, please open a new issue, referencing this one where needed.