ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/aws: match with upstream changes

This commit is contained in:
Paul Hinze 2015-08-10 15:39:47 -05:00
parent d4f67bfa67
commit ca993a5a5e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/providers/aws/provider.go
View File

@ -5,7 +5,8 @@ import (
"sync" "sync"
"time" "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/hashcode"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/terraform" "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) conn, err := net.DialTimeout("tcp", "169.254.169.254:80", 100*time.Millisecond)
if err == nil { if err == nil {
conn.Close() conn.Close()
providers = append(providers, &credentials.EC2RoleProvider{}) providers = append(providers, &ec2rolecreds.EC2RoleProvider{})
} }
credVal, credErr = credentials.NewChainCredentials(providers).Get() credVal, credErr = credentials.NewChainCredentials(providers).Get()