Merge pull request #36855 from hashicorp/f-config.MaxBackoff

AWS SDK for Go v2 `MaxBackoff` delay to match AWS SDK for Go v1 default
hashicorp · Apr 11, 2024 · ca464c0 · ca464c0
2 parents 63f73e5 + 9c28e9f
commit ca464c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.changelog/36855.txt b/.changelog/36855.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+provider: Change the default AWS SDK for Go v2 API client [`MaxBackoff`](https://aws.github.io/aws-sdk-go-v2/docs/configuring-sdk/retries-timeouts/#limiting-the-max-back-off-delay) value to 300 seconds so that services migrated to AWS SDK for Go v2 maintain behavioral compatibility with AWS SDK for Go v1
+```
diff --git a/internal/conns/config.go b/internal/conns/config.go
@@ -7,6 +7,7 @@ import (
  "context"
  "fmt"
  "strings"
+ "time"
 
  aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
  imds_sdkv2 "github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -91,6 +92,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
  HTTPSProxy: c.HTTPSProxy,
  HTTPProxyMode: awsbase.HTTPProxyModeLegacy,
  Logger: logger,
+ MaxBackoff: 300 * time.Second, // AWS SDK for Go v1 DefaultRetryerMaxRetryDelay: https:/aws/aws-sdk-go/blob/9f6e3bb9f523aef97fa1cd5c5f8ba8ecf212e44e/aws/client/default_retryer.go#L48-L49.
  MaxRetries: c.MaxRetries,
  NoProxy: c.NoProxy,
  Profile: c.Profile,