alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Merge pull request #2002 from lnr0626/1996-instance-roles-with-regionendpoint

Browse source 
Allow using ec2 roles when specifying region endpoint
This commit is contained in:
Richard Scothern 2016-10-17 13:50:02 -07:00 committed by GitHub
commit d0cdc4802b
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
registry/storage/driver/s3-aws/s3.go
View file

@ -389,9 +389,7 @@ func New(params DriverParameters) (*Driver, error) {
} }
awsConfig := aws.NewConfig() awsConfig := aws.NewConfig()
var creds *credentials.Credentials creds := credentials.NewChainCredentials([]credentials.Provider{
if params.RegionEndpoint == "" {
creds = credentials.NewChainCredentials([]credentials.Provider{
&credentials.StaticProvider{ &credentials.StaticProvider{
Value: credentials.Value{ Value: credentials.Value{
AccessKeyID: params.AccessKey, AccessKeyID: params.AccessKey,
@ -402,16 +400,8 @@ func New(params DriverParameters) (*Driver, error) {
&credentials.SharedCredentialsProvider{}, &credentials.SharedCredentialsProvider{},
&ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.New())}, &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(session.New())},
}) })
} else {
creds = credentials.NewChainCredentials([]credentials.Provider{ if params.RegionEndpoint != "" {
&credentials.StaticProvider{
Value: credentials.Value{
AccessKeyID: params.AccessKey,
SecretAccessKey: params.SecretKey,
},
},
&credentials.EnvProvider{},
})
awsConfig.WithS3ForcePathStyle(true) awsConfig.WithS3ForcePathStyle(true)
awsConfig.WithEndpoint(params.RegionEndpoint) awsConfig.WithEndpoint(params.RegionEndpoint)
} }