fix: aws credential chain by using aws.Config

This commit is contained in:
Erik Kristensen
2023-01-10 20:58:43 -07:00
committed by Ben Johnson
parent 64e535e23b
commit 530930465d

View File

@@ -18,7 +18,6 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/defaults"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
@@ -95,6 +94,8 @@ func (c *ReplicaClient) Init(ctx context.Context) (err error) {
if region != "" {
config.Region = aws.String(region)
}
config.CredentialsChainVerboseErrors = aws.Bool(true)
sess, err := session.NewSession(config)
if err != nil {
return fmt.Errorf("cannot create aws session: %w", err)
@@ -107,7 +108,8 @@ func (c *ReplicaClient) Init(ctx context.Context) (err error) {
// config returns the AWS configuration. Uses the default credential chain
// unless a key/secret are explicitly set.
func (c *ReplicaClient) config() *aws.Config {
config := defaults.Get().Config
config := &aws.Config{}
if c.AccessKeyID != "" || c.SecretAccessKey != "" {
config.Credentials = credentials.NewStaticCredentials(c.AccessKeyID, c.SecretAccessKey, "")
}