Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default IMDS timeouts to match AWS SDK #10133

Merged
merged 7 commits into from
Oct 16, 2020
Merged

Set default IMDS timeouts to match AWS SDK #10133

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f1cc82
set default imds timeouts to match aws sdk
tvoran Oct 9, 2020
12c3403
also check for AWS_CONTAINER_CREDENTIALS_RELATIVE_URI
tvoran Oct 14, 2020
ad363e5
Merge remote-tracking branch 'origin/master' into VAULT-564/set-imds-…
tvoran Oct 15, 2020
49b8672
Merge remote-tracking branch 'origin/master' into VAULT-564/set-imds-…
tvoran Oct 16, 2020
ea2cad4
Merge remote-tracking branch 'origin/master' into VAULT-564/set-imds-…
tvoran Oct 16, 2020
b237651
go mod tidy && go mod vendor
tvoran Oct 16, 2020
cd7d888
Merge branch 'master' into VAULT-564/set-imds-timeouts
tvoran Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions sdk/helper/awsutil/generate_credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"net/http"
"os"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
Expand Down Expand Up @@ -111,6 +112,13 @@ func (c *CredentialsConfig) GenerateCredentialChain() (*credentials.Credentials,
}
if c.HTTPClient != nil {
def.Config.HTTPClient = c.HTTPClient
_, checkFullURI := os.LookupEnv("AWS_CONTAINER_CREDENTIALS_FULL_URI")
_, checkRelativeURI := os.LookupEnv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI")
if !checkFullURI && !checkRelativeURI {
// match the sdk defaults from https://github.com/aws/aws-sdk-go/pull/3066
def.Config.HTTPClient.Timeout = 1 * time.Second
def.Config.MaxRetries = aws.Int(2)
}
}

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