fix(cfg): leverage opts in cfgs for aws

Signed-off-by: Samantha Coyle <[email protected]>
dapr · Nov 13, 2024 · a42e742 · a42e742
1 parent 690b3ec
commit a42e742
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 20 deletions.
diff --git a/bindings/aws/dynamodb/dynamodb.go b/bindings/aws/dynamodb/dynamodb.go
@@ -67,7 +67,7 @@ func (d *DynamoDB) Init(ctx context.Context, metadata bindings.Metadata) error {
 		SessionToken: meta.SessionToken,
 	}
 
-	provider, err := awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+	provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 	if err != nil {
 		return err
 	}

diff --git a/bindings/aws/kinesis/kinesis.go b/bindings/aws/kinesis/kinesis.go
@@ -126,7 +126,7 @@ func (a *AWSKinesis) Init(ctx context.Context, metadata bindings.Metadata) error
 		SessionToken: "",
 	}
 	// extra configs needed per component type
-	provider, err := awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+	provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 	if err != nil {
 		return err
 	}

diff --git a/bindings/aws/ses/ses.go b/bindings/aws/ses/ses.go
@@ -79,7 +79,7 @@ func (a *AWSSES) Init(ctx context.Context, metadata bindings.Metadata) error {
 		SessionToken: "",
 	}
 	// extra configs needed per component type
-	provider, err := awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+	provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 	if err != nil {
 		return err
 	}

diff --git a/bindings/aws/sns/sns.go b/bindings/aws/sns/sns.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/sns"
 
 	"github.com/dapr/components-contrib/bindings"
@@ -75,7 +74,7 @@ func (a *AWSSNS) Init(ctx context.Context, metadata bindings.Metadata) error {
 		SessionToken: m.SessionToken,
 	}
 	// extra configs needed per component type
-	provider, err := awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+	provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 	if err != nil {
 		return err
 	}

diff --git a/bindings/aws/sqs/sqs.go b/bindings/aws/sqs/sqs.go
@@ -75,7 +75,7 @@ func (a *AWSSQS) Init(ctx context.Context, metadata bindings.Metadata) error {
 		SessionToken: m.SessionToken,
 	}
 	// extra configs needed per component type
-	provider, err := awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+	provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 	if err != nil {
 		return err
 	}

diff --git a/common/authentication/aws/static.go b/common/authentication/aws/static.go
@@ -45,18 +45,22 @@ type StaticAuth struct {
 }
 
 func newStaticIAM(_ context.Context, opts Options, cfg *aws.Config) (*StaticAuth, error) {
-	if cfg == nil {
-		cfg = aws.NewConfig()
-	}
 	auth := &StaticAuth{
 		Logger:       opts.Logger,
 		Region:       opts.Region,
 		Endpoint:     &opts.Endpoint,
 		AccessKey:    &opts.AccessKey,
 		SecretKey:    &opts.SecretKey,
 		SessionToken: &opts.SessionToken,
-		Cfg:          cfg,
-		Clients:      newClients(),
+		Cfg: func() *aws.Config {
+			// if nil is passed or it's just a default cfg,
+			// then we use the options to build the aws cfg.
+			if cfg != nil && cfg != aws.NewConfig() {
+				return cfg
+			}
+			return GetConfig(opts)
+		}(),
+		Clients: newClients(),
 	}
 
 	initialSession, err := auth.getTokenClient()

diff --git a/common/authentication/aws/x509.go b/common/authentication/aws/x509.go
@@ -80,18 +80,22 @@ func newX509(ctx context.Context, opts Options, cfg *aws.Config) (*x509, error)
 		return nil, errors.New("sessionDuration must be greater than 15 minutes, and less than 12 hours")
 	}
 
-	if cfg == nil {
-		cfg = aws.NewConfig()
-	}
 	auth := &x509{
 		wg:              sync.WaitGroup{},
 		logger:          opts.Logger,
 		TrustProfileArn: x509Auth.TrustProfileArn,
 		TrustAnchorArn:  x509Auth.TrustAnchorArn,
 		AssumeRoleArn:   x509Auth.AssumeRoleArn,
 		SessionDuration: x509Auth.SessionDuration,
-		Cfg:             GetConfig(opts),
-		Clients:         newClients(),
+		Cfg: func() *aws.Config {
+			// if nil is passed or it's just a default cfg,
+			// then we use the options to build the aws cfg.
+			if cfg != nil && cfg != aws.NewConfig() {
+				return cfg
+			}
+			return GetConfig(opts)
+		}(),
+		Clients: newClients(),
 	}
 
 	var err error

diff --git a/pubsub/aws/snssqs/snssqs.go b/pubsub/aws/snssqs/snssqs.go
@@ -155,7 +155,7 @@ func (s *snsSqs) Init(ctx context.Context, metadata pubsub.Metadata) error {
 		}
 		// extra configs needed per component type
 		var provider awsAuth.Provider
-		provider, err = awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+		provider, err = awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 		if err != nil {
 			return err
 		}

diff --git a/secretstores/aws/parameterstore/parameterstore.go b/secretstores/aws/parameterstore/parameterstore.go
@@ -73,7 +73,7 @@ func (s *ssmSecretStore) Init(ctx context.Context, metadata secretstores.Metadat
 		SessionToken: "",
 	}
 	// extra configs needed per component type
-	provider, err := awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+	provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 	if err != nil {
 		return err
 	}

diff --git a/secretstores/aws/secretmanager/secretmanager.go b/secretstores/aws/secretmanager/secretmanager.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
 
 	awsAuth "github.com/dapr/components-contrib/common/authentication/aws"
@@ -69,7 +68,7 @@ func (s *smSecretStore) Init(ctx context.Context, metadata secretstores.Metadata
 		Endpoint:     meta.Endpoint,
 	}
 
-	provider, err := awsAuth.NewProvider(ctx, opts, aws.NewConfig())
+	provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
 	if err != nil {
 		return err
 	}