Skip to content

Commit 0668169

Browse files
authored
Set default IMDS timeouts to match AWS SDK (#10133) (#10168)
1 parent 3134650 commit 0668169

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

sdk/helper/awsutil/generate_credentials.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"net/http"
66
"os"
7+
"time"
78

89
"github.com/aws/aws-sdk-go/aws"
910
"github.com/aws/aws-sdk-go/aws/credentials"
@@ -89,6 +90,13 @@ func (c *CredentialsConfig) GenerateCredentialChain() (*credentials.Credentials,
8990
}
9091
if c.HTTPClient != nil {
9192
def.Config.HTTPClient = c.HTTPClient
93+
_, checkFullURI := os.LookupEnv("AWS_CONTAINER_CREDENTIALS_FULL_URI")
94+
_, checkRelativeURI := os.LookupEnv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI")
95+
if !checkFullURI && !checkRelativeURI {
96+
// match the sdk defaults from https://github.com/aws/aws-sdk-go/pull/3066
97+
def.Config.HTTPClient.Timeout = 1 * time.Second
98+
def.Config.MaxRetries = aws.Int(2)
99+
}
92100
}
93101

94102
providers = append(providers, defaults.RemoteCredProvider(*def.Config, def.Handlers))

vendor/github.com/hashicorp/vault/sdk/helper/awsutil/generate_credentials.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)