Skip to content

Commit da52711

Browse files
jbergknoff-rivalazr
authored andcommitted
Use default AWS credential chain under normal circumstances (#218)
1 parent 4d89f82 commit da52711

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

s3/get_s3.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,20 +179,15 @@ func (g *Getter) getObject(ctx context.Context, client *s3.S3, dst, bucket, key,
179179

180180
func (g *Getter) getAWSConfig(region string, url *url.URL, creds *credentials.Credentials) *aws.Config {
181181
conf := &aws.Config{}
182-
if creds == nil {
183-
// Grab the metadata URL
184-
metadataURL := os.Getenv("AWS_METADATA_URL")
185-
if metadataURL == "" {
186-
metadataURL = "http://169.254.169.254:80/latest"
187-
}
188-
182+
metadataURLOverride := os.Getenv("AWS_METADATA_URL")
183+
if creds == nil && metadataURLOverride != "" {
189184
creds = credentials.NewChainCredentials(
190185
[]credentials.Provider{
191186
&credentials.EnvProvider{},
192187
&credentials.SharedCredentialsProvider{Filename: "", Profile: ""},
193188
&ec2rolecreds.EC2RoleProvider{
194189
Client: ec2metadata.New(session.New(&aws.Config{
195-
Endpoint: aws.String(metadataURL),
190+
Endpoint: aws.String(metadataURLOverride),
196191
})),
197192
},
198193
})
@@ -211,7 +206,7 @@ func (g *Getter) getAWSConfig(region string, url *url.URL, creds *credentials.Cr
211206
conf.Region = aws.String(region)
212207
}
213208

214-
return conf
209+
return conf.WithCredentialsChainVerboseErrors(true)
215210
}
216211

217212
func (g *Getter) parseUrl(u *url.URL) (region, bucket, path, version string, creds *credentials.Credentials, err error) {

0 commit comments

Comments
 (0)