Ensure all string slice args get whitespace cleaned

buildkite · Oct 2, 2024 · 3338f3d · 3338f3d
1 parent ee70db6
commit 3338f3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/clicommand/oidc_request_token.go b/clicommand/oidc_request_token.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/buildkite/agent/v3/api"
@@ -111,10 +110,6 @@ var OIDCRequestTokenCommand = cli.Command{
 			return fmt.Errorf("lifetime %d must be a non-negative integer.", cfg.Lifetime)
 		}
 
-		for i, claim := range cfg.Claims {
-			cfg.Claims[i] = strings.TrimSpace(claim)
-		}
-
 		// Create the API client
 		client := api.NewClient(l, loadAPIClientConfig(cfg, "AgentAccessToken"))
 

diff --git a/cliconfig/loader.go b/cliconfig/loader.go
@@ -225,7 +225,11 @@ func (l Loader) setFieldValueFromCLI(fieldName string, cliName string) error {
 				case reflect.String:
 					value = configFileValue
 				case reflect.Slice:
-					value = strings.Split(configFileValue, ",")
+					valueSlice := strings.Split(configFileValue, ",")
+					for i, e := range valueSlice {
+						valueSlice[i] = strings.TrimSpace(e)
+					}
+					value = valueSlice
 				case reflect.Bool:
 					value, _ = strconv.ParseBool(configFileValue)
 				case reflect.Int: