From e7c3a08947f5a84dd66a46dc8f3a4da9b33d100f Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Wed, 6 Jan 2016 13:34:56 -0500 Subject: [PATCH] AWS: Provide newly required initialization arguments It seems that some formerly optional arguments are now required in the latest aws-sdk-go, see e.g. https://github.com/aws/aws-sdk-go/issues/452. --- pkg/cloudprovider/providers/aws/aws.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index f9e8e5ec547..1a77cbb1614 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -260,7 +260,7 @@ func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) { } func (p *awsSDKProvider) Metadata() (EC2Metadata, error) { - client := ec2metadata.New(nil) + client := ec2metadata.New(session.New(&aws.Config{})) return client, nil } @@ -439,7 +439,9 @@ func init() { creds := credentials.NewChainCredentials( []credentials.Provider{ &credentials.EnvProvider{}, - &ec2rolecreds.EC2RoleProvider{}, + &ec2rolecreds.EC2RoleProvider{ + Client: ec2metadata.New(session.New(&aws.Config{})), + }, &credentials.SharedCredentialsProvider{}, }) aws := &awsSDKProvider{creds: creds}