From a6998e13a23bcb4881bca49574ca797bb44aca23 Mon Sep 17 00:00:00 2001 From: Jordan Jennings Date: Fri, 11 Mar 2022 11:57:40 -0500 Subject: [PATCH 1/2] Use default credential provider chain for AWS fixes #50 Signed-off-by: Jordan Jennings --- cmd/aws/aws.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/cmd/aws/aws.go b/cmd/aws/aws.go index fcd41af..7e0bb47 100644 --- a/cmd/aws/aws.go +++ b/cmd/aws/aws.go @@ -24,8 +24,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/credentials/ec2rolecreds" - "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/secretsmanager" "github.com/boxboat/dockcmd/cmd/common" @@ -122,21 +120,7 @@ func NewSecretsClient(opts ...SecretsClientOpt) (*SecretsClient, error) { } var creds = sess.Config.Credentials - if o.useChainCredentials { - creds = credentials.NewChainCredentials( - []credentials.Provider{ - &credentials.EnvProvider{}, - &credentials.SharedCredentialsProvider{ - Profile: o.profile, - }, - &ec2rolecreds.EC2RoleProvider{ - Client: ec2metadata.New(sess), - }, - &SessionProvider{ - Session: sess, - }, - }) - } else { + if !o.useChainCredentials { if o.accessKeyID == "" || o.secretAccessKey == "" { return nil, errors.New("no aws credentials provided") } From 33a0033e4bd0dd8101fbaebb611cf3ad30f043be Mon Sep 17 00:00:00 2001 From: Jordan Jennings Date: Fri, 11 Mar 2022 12:29:49 -0500 Subject: [PATCH 2/2] PR feedback Signed-off-by: Jordan Jennings --- cmd/aws/aws.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/cmd/aws/aws.go b/cmd/aws/aws.go index 7e0bb47..17fc5db 100644 --- a/cmd/aws/aws.go +++ b/cmd/aws/aws.go @@ -38,11 +38,6 @@ type SecretsClient struct { secretCache *cache.Cache } -// SessionProvider custom provider to allow for fallback to session configured credentials. -type SessionProvider struct { - Session *session.Session -} - type SecretsClientOpt interface { configureSecretsClient(opts *secretsClientOpts) error } @@ -134,16 +129,6 @@ func NewSecretsClient(opts ...SecretsClientOpt) (*SecretsClient, error) { return client, nil } -// Retrieve for SessionProvider. -func (m *SessionProvider) Retrieve() (credentials.Value, error) { - return m.Session.Config.Credentials.Get() -} - -// IsExpired for SessionProvider. -func (m *SessionProvider) IsExpired() bool { - return m.Session.Config.Credentials.IsExpired() -} - func (c *SecretsClient) getSecret(secretName string) (string, string, error) { adjustedSecretName := secretName version := latestVersion