fall back to token field if error occurs when reading file

nginx · Jan 20, 2025 · 371c72b · 371c72b
1 parent f26c45e
commit 371c72b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/internal/grpc/grpc.go b/internal/grpc/grpc.go
@@ -241,10 +241,11 @@ func addPerRPCCredentials(agentConfig *config.Config, resourceID string, opts []
 	token := agentConfig.Command.Auth.Token
 
 	if agentConfig.Command.Auth.TokenPath != "" {
-		var err error
-		token, err = retrieveTokenFromFile(agentConfig.Command.Auth.TokenPath)
-		if err != nil {
-			slog.Error("Unable to add token to gRPC dial options, token will be empty", "error", err)
+		tk, err := retrieveTokenFromFile(agentConfig.Command.Auth.TokenPath)
+		if err == nil {
+			token = tk
+		} else {
+			slog.Error("Unable to add token to gRPC dial options", "error", err)
 		}
 	}
 

diff --git a/test/types/config.go b/test/types/config.go
@@ -133,7 +133,8 @@ func AgentConfig() *config.Config {
 				Type: config.Grpc,
 			},
 			Auth: &config.AuthConfig{
-				Token: "1234",
+				Token:     "1234",
+				TokenPath: "",
 			},
 			TLS: &config.TLSConfig{
 				Cert:       "cert.pem",