Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update aws sdk to utilize aws credential chain #281

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update aws sdk to utilize aws credential chain #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions state/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ func NewAWS(aws config.AWSConfig, bucket config.S3BucketConfig, noLocks, noVersi
return nil
}

sess := session.Must(session.NewSession())
sess := session.Must(session.NewSessionWithOptions(session.Options{
SharedConfigState: session.SharedConfigEnable,
}))

awsConfig := aws_sdk.NewConfig()
var creds *credentials.Credentials
if len(aws.APPRoleArn) > 0 {
Expand All @@ -49,13 +52,8 @@ func NewAWS(aws config.AWSConfig, bucket config.S3BucketConfig, noLocks, noVersi
p.ExternalID = aws_sdk.String(aws.ExternalID)
}
})
} else {
if aws.AccessKey == "" || aws.SecretAccessKey == "" {
log.Fatal("Missing AccessKey or SecretAccessKey for AWS provider. Please check your configuration and retry")
}
creds = credentials.NewStaticCredentials(aws.AccessKey, aws.SecretAccessKey, aws.SessionToken)
awsConfig.WithCredentials(creds)
}
awsConfig.WithCredentials(creds)

if e := aws.Endpoint; e != "" {
awsConfig.WithEndpoint(e)
Expand Down