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

Use default credential provider chain for AWS #51

Merged
merged 2 commits into from
Mar 14, 2022
Merged

Use default credential provider chain for AWS #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6998e1
Use default credential provider chain for AWS
jordanjennings Mar 11, 2022
33a0033
PR feedback
jordanjennings Mar 11, 2022
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
33 changes: 1 addition & 32 deletions cmd/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -40,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
}
Expand Down Expand Up @@ -122,21 +115,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")
}
Expand All @@ -150,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
Expand Down