LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow AWS-SDK to handle gathering credentials. 

This change enables ec2 instance assumed roles, environment variables, and shared configs as is standard for the aws-sdk.
This commit is contained in:
Mark Armendariz 2018-06-14 13:58:57 -05:00
parent 23177d4a49
commit d416990829
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tusd/cli/composer.go
View File

@ -11,7 +11,6 @@ import (
"github.com/tus/tusd/gcsstore" "github.com/tus/tusd/gcsstore"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
) )
@ -33,10 +32,9 @@ func CreateComposer() {
s3Config = s3Config.WithEndpoint(Flags.S3Endpoint).WithS3ForcePathStyle(true) s3Config = s3Config.WithEndpoint(Flags.S3Endpoint).WithS3ForcePathStyle(true)
} }
// Derive credentials from AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID and // Derive credentials from default credential chain (env, shared, ec2 instance role)
// AWS_REGION environment variables. // as per https://github.com/aws/aws-sdk-go#configuring-credentials
s3Config = s3Config.WithCredentials(credentials.NewEnvCredentials()) store := s3store.New(Flags.S3Bucket, s3.New(session.Must(session.NewSession()), s3Config))
store := s3store.New(Flags.S3Bucket, s3.New(session.New(), s3Config))
store.UseIn(Composer) store.UseIn(Composer)
locker := memorylocker.New() locker := memorylocker.New()