|
9 | 9 | "github.com/aws/aws-sdk-go/aws" |
10 | 10 | "github.com/aws/aws-sdk-go/aws/awserr" |
11 | 11 | "github.com/aws/aws-sdk-go/aws/credentials" |
12 | | - "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" |
13 | 12 | "github.com/aws/aws-sdk-go/aws/credentials/stscreds" |
14 | | - "github.com/aws/aws-sdk-go/aws/ec2metadata" |
| 13 | + "github.com/aws/aws-sdk-go/aws/defaults" |
15 | 14 | "github.com/aws/aws-sdk-go/aws/session" |
16 | 15 | "github.com/aws/aws-sdk-go/service/s3" |
17 | 16 | "github.com/aws/aws-sdk-go/service/s3/s3manager" |
@@ -58,18 +57,18 @@ func (this S3Backend) Init(params map[string]string, app *App) (IBackend, error) |
58 | 57 | }}) |
59 | 58 | } |
60 | 59 | if params["role_arn"] != "" { |
61 | | - sessOptions := session.Options{Config: aws.Config{Region: aws.String(params["region"])}} |
62 | 60 | creds = append(creds, &stscreds.AssumeRoleProvider{ |
63 | | - Client: sts.New(session.Must(session.NewSessionWithOptions(sessOptions))), |
| 61 | + Client: sts.New(session.Must(session.NewSessionWithOptions(session.Options{Config: aws.Config{Region: aws.String(params["region"])}}))), |
64 | 62 | RoleARN: params["role_arn"], |
65 | 63 | Duration: stscreds.DefaultDuration, |
66 | 64 | }) |
67 | 65 | } |
68 | 66 | creds = append( |
69 | 67 | creds, |
70 | | - &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.Must(session.NewSession()))}, |
71 | 68 | &credentials.EnvProvider{}, |
| 69 | + defaults.RemoteCredProvider(*defaults.Config(), defaults.Handlers()), |
72 | 70 | ) |
| 71 | + |
73 | 72 | config := &aws.Config{ |
74 | 73 | Credentials: credentials.NewChainCredentials(creds), |
75 | 74 | CredentialsChainVerboseErrors: aws.Bool(true), |
|
0 commit comments