From 3a63e1c493814e8832ac7627fed1ee3f2585758b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 May 2024 11:53:30 -0400 Subject: [PATCH 1/4] Add 'Config.Backoff'. --- aws_config.go | 6 ++++++ internal/config/config.go | 2 ++ 2 files changed, 8 insertions(+) diff --git a/aws_config.go b/aws_config.go index e98a9382..069cf26b 100644 --- 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 index ac3906ba..b5aa59b6 100644 --- 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 From 8575fdbc96736682dfca6078a74eac0b6f1fe581 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 May 2024 11:56:37 -0400 Subject: [PATCH 2/4] Add CHANGELOG entries. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69111a03..e8736d5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # v2.0.0 (Unreleased) +BUG FIXES + +* Updates dependencies. + +ENHANCEMENTS + +* Adds `Backoff` parameter to configure the backoff strategy the retryer will use to determine the delay between retry attempts + # v2.0.0-beta.52 (2024-04-11) BUG FIXES From e13a3e690f1a3b8cd55b2dbaecc9eacdcd8148d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 May 2024 12:05:26 -0400 Subject: [PATCH 3/4] Add 'v2.0.0-beta.53' CHANGELOG entry. --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8736d5b..8ae12565 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,15 @@ # 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 +* 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) From d88efef867ba8d45c1532d25cf078c405ac2ab9c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 9 May 2024 12:06:13 -0400 Subject: [PATCH 4/4] Update `v2/awsv1shim/go.mod`. --- v2/awsv1shim/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/awsv1shim/go.mod b/v2/awsv1shim/go.mod index db72306e..52b1cdc9 100644 --- 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