Skip to content

Commit 21c8a7f

Browse files
fix (s3): assume role on ecs
1 parent 5741311 commit 21c8a7f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

server/plugin/plg_backend_s3/index.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import (
99
"github.com/aws/aws-sdk-go/aws"
1010
"github.com/aws/aws-sdk-go/aws/awserr"
1111
"github.com/aws/aws-sdk-go/aws/credentials"
12-
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
1312
"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"
1514
"github.com/aws/aws-sdk-go/aws/session"
1615
"github.com/aws/aws-sdk-go/service/s3"
1716
"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)
5857
}})
5958
}
6059
if params["role_arn"] != "" {
61-
sessOptions := session.Options{Config: aws.Config{Region: aws.String(params["region"])}}
6260
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"])}}))),
6462
RoleARN: params["role_arn"],
6563
Duration: stscreds.DefaultDuration,
6664
})
6765
}
6866
creds = append(
6967
creds,
70-
&ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.Must(session.NewSession()))},
7168
&credentials.EnvProvider{},
69+
defaults.RemoteCredProvider(*defaults.Config(), defaults.Handlers()),
7270
)
71+
7372
config := &aws.Config{
7473
Credentials: credentials.NewChainCredentials(creds),
7574
CredentialsChainVerboseErrors: aws.Bool(true),

0 commit comments

Comments
 (0)