Merge pull request #1045 from hashicorp/f-configurable-retry.BackoffD…

…elayer Add configurable `retry.BackoffDelayer`
hashicorp · May 9, 2024 · f532d35 · f532d35
2 parents fccf6cb + d88efef
commit f532d35
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 <!-- markdownlint-disable single-title -->
 # v2.0.0 (Unreleased)
 
+# v2.0.0-beta.53 (2024-05-09)
+
+BUG FIXES
+
+* Updates dependencies.
+
+ENHANCEMENTS
+
+* Adds `Backoff` parameter to configure the backoff strategy the retryer will use to determine the delay between retry attempts ([#1045](https://github.com/hashicorp/aws-sdk-go-base/pull/1045))
+
 # v2.0.0-beta.52 (2024-04-11)
 
 BUG FIXES

diff --git a/aws_config.go b/aws_config.go
@@ -202,6 +202,12 @@ func resolveRetryer(ctx context.Context, c *Config, awsConfig *aws.Config) {
 
 	var standardOptions []func(*retry.StandardOptions)
 
+	if backoff := c.Backoff; backoff != nil {
+		standardOptions = append(standardOptions, func(so *retry.StandardOptions) {
+			so.Backoff = backoff
+		})
+	}
+
 	if v, found, _ := awsconfig.GetRetryMaxAttempts(ctx, awsConfig.ConfigSources); found && v != 0 {
 		standardOptions = append(standardOptions, func(so *retry.StandardOptions) {
 			so.MaxAttempts = v

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/retry"
 	awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 	"github.com/hashicorp/aws-sdk-go-base/v2/diag"
@@ -34,6 +35,7 @@ type Config struct {
 	APNInfo                        *APNInfo
 	AssumeRole                     *AssumeRole
 	AssumeRoleWithWebIdentity      *AssumeRoleWithWebIdentity
+	Backoff                        retry.BackoffDelayer
 	CallerDocumentationURL         string
 	CallerName                     string
 	CustomCABundle                 string

diff --git a/v2/awsv1shim/go.mod b/v2/awsv1shim/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1
 	github.com/aws/aws-sdk-go-v2/service/sts v1.28.7
 	github.com/google/go-cmp v0.6.0
-	github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.52
+	github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.53
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.51.0