fix nil session token

Signed-off-by: Fabian Martinez <[email protected]>
dapr · Nov 28, 2024 · 9b12903 · 9b12903
1 parent c8d900a
commit 9b12903
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/common/authentication/aws/static.go b/common/authentication/aws/static.go
@@ -38,10 +38,10 @@ type StaticAuth struct {
 	endpoint     *string
 	accessKey    *string
 	secretKey    *string
-	sessionToken *string
+	sessionToken string
 
 	assumeRoleARN *string
-	sessionName   *string
+	sessionName   string
 
 	session *session.Session
 	cfg     *aws.Config
@@ -75,13 +75,13 @@ func newStaticIAM(_ context.Context, opts Options, cfg *aws.Config) (*StaticAuth
 		auth.secretKey = &opts.SecretKey
 	}
 	if opts.SessionToken != "" {
-		auth.sessionToken = &opts.SessionToken
+		auth.sessionToken = opts.SessionToken
 	}
 	if opts.AssumeRoleARN != "" {
 		auth.assumeRoleARN = &opts.AssumeRoleARN
 	}
 	if opts.SessionName != "" {
-		auth.sessionName = &opts.SessionName
+		auth.sessionName = opts.SessionName
 	}
 
 	initialSession, err := auth.createSession()
@@ -245,8 +245,8 @@ func (a *StaticAuth) Kafka(opts KafkaOptions) (*KafkaClients, error) {
 	if a.assumeRoleARN != nil {
 		tokenProvider.awsIamRoleArn = *a.assumeRoleARN
 	}
-	if a.sessionName != nil {
-		tokenProvider.awsStsSessionName = *a.sessionName
+	if a.sessionName != "" {
+		tokenProvider.awsStsSessionName = a.sessionName
 	}
 
 	err := a.clients.kafka.New(a.session, &tokenProvider)
@@ -271,7 +271,7 @@ func (a *StaticAuth) createSession() (*session.Session, error) {
 
 	if a.accessKey != nil && a.secretKey != nil {
 		// session token is an option field
-		awsConfig = awsConfig.WithCredentials(credentials.NewStaticCredentials(*a.accessKey, *a.secretKey, *a.sessionToken))
+		awsConfig = awsConfig.WithCredentials(credentials.NewStaticCredentials(*a.accessKey, *a.secretKey, a.sessionToken))
 	}
 
 	if a.endpoint != nil {

diff --git a/common/authentication/aws/static_test.go b/common/authentication/aws/static_test.go
@@ -48,7 +48,7 @@ func TestGetTokenClient(t *testing.T) {
 			awsInstance: &StaticAuth{
 				accessKey:    aws.String("testAccessKey"),
 				secretKey:    aws.String("testSecretKey"),
-				sessionToken: aws.String("testSessionToken"),
+				sessionToken: "testSessionToken",
 				region:       aws.String("us-west-2"),
 				endpoint:     aws.String("https://test.endpoint.com"),
 			},