From ca993a5a5e11e7925a15a43f170a354936aae4ff Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Mon, 10 Aug 2015 15:39:47 -0500 Subject: [PATCH] provider/aws: match with upstream changes --- builtin/providers/aws/provider.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index 00de87f9d9..a5029b400a 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -5,7 +5,8 @@ import ( "sync" "time" - "github.com/awslabs/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/awslabs/aws-sdk-go/aws/credentials/ec2rolecreds" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" @@ -39,7 +40,7 @@ func Provider() terraform.ResourceProvider { conn, err := net.DialTimeout("tcp", "169.254.169.254:80", 100*time.Millisecond) if err == nil { conn.Close() - providers = append(providers, &credentials.EC2RoleProvider{}) + providers = append(providers, &ec2rolecreds.EC2RoleProvider{}) } credVal, credErr = credentials.NewChainCredentials(providers).Get()