Commit afeda35a authored by Brendan Burns's avatar Brendan Burns

Merge pull request #19336 from justinsb/aws_initialize_metadata

AWS: Provide newly required initialization arguments
parents 9ac13f66 e7c3a089
...@@ -260,7 +260,7 @@ func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) { ...@@ -260,7 +260,7 @@ func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) {
} }
func (p *awsSDKProvider) Metadata() (EC2Metadata, error) { func (p *awsSDKProvider) Metadata() (EC2Metadata, error) {
client := ec2metadata.New(nil) client := ec2metadata.New(session.New(&aws.Config{}))
return client, nil return client, nil
} }
...@@ -439,7 +439,9 @@ func init() { ...@@ -439,7 +439,9 @@ func init() {
creds := credentials.NewChainCredentials( creds := credentials.NewChainCredentials(
[]credentials.Provider{ []credentials.Provider{
&credentials.EnvProvider{}, &credentials.EnvProvider{},
&ec2rolecreds.EC2RoleProvider{}, &ec2rolecreds.EC2RoleProvider{
Client: ec2metadata.New(session.New(&aws.Config{})),
},
&credentials.SharedCredentialsProvider{}, &credentials.SharedCredentialsProvider{},
}) })
aws := &awsSDKProvider{creds: creds} aws := &awsSDKProvider{creds: creds}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment