Ensure all string slice args get whitespace cleaned

buildkite · Oct 3, 2024 · fe814e2 · fe814e2
1 parent ee70db6
commit fe814e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 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
@@ -421,6 +421,8 @@ func (l Loader) normalizeField(fieldName string, normalization string) error {
 						continue
 					}
 
+					normalized = strings.TrimSpace(normalized)
+
 					normalizedSlice = append(normalizedSlice, normalized)
 				}
 			}