style: final tweaks

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

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/common/authentication/aws/static.go b/common/authentication/aws/static.go
@@ -202,9 +202,11 @@ func (a *StaticAuth) Ses() *SesClients {
 }
 
 func (a *StaticAuth) getTokenClient() (*session.Session, error) {
-	awsConfig := a.Cfg
+	var awsConfig *aws.Config
 	if a.Cfg == nil {
 		awsConfig = aws.NewConfig()
+	} else {
+		awsConfig = a.Cfg
 	}
 
 	if a.Region != "" {

diff --git a/common/authentication/aws/x509.go b/common/authentication/aws/x509.go
@@ -345,13 +345,15 @@ func (a *x509) createOrRefreshSession(ctx context.Context) (*session.Session, er
 	}}
 	var mySession *session.Session
 
-	awsConfig := a.Cfg
-	if awsConfig != nil {
-		awsConfig = a.Cfg.WithRegion(*a.region).WithHTTPClient(client).WithLogLevel(aws.LogOff)
+	var awsConfig *aws.Config
+	if a.Cfg == nil {
+		awsConfig = aws.NewConfig().WithHTTPClient(client).WithLogLevel(aws.LogOff)
 	} else {
-		awsConfig = aws.NewConfig().WithRegion(*a.region).WithHTTPClient(client).WithLogLevel(aws.LogOff)
+		awsConfig = a.Cfg.WithHTTPClient(client).WithLogLevel(aws.LogOff)
+	}
+	if a.region != nil {
+		awsConfig.WithRegion(*a.region)
 	}
-
 	// this is needed for testing purposes to mock the client,
 	// so code never sets the client, but tests do.
 	var rolesClient *rolesanywhere.RolesAnywhere