From 9b30076180b8f73bbe25d0f4cd752207154ad0c1 Mon Sep 17 00:00:00 2001 From: LarytheLord Date: Thu, 5 Mar 2026 23:47:34 +0530 Subject: [PATCH 1/2] test(cli): isolate user-agent rest config test from host kubeconfig Signed-off-by: LarytheLord --- pkg/cli/environment_test.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkg/cli/environment_test.go b/pkg/cli/environment_test.go index 9303389a3..df87b86df 100644 --- a/pkg/cli/environment_test.go +++ b/pkg/cli/environment_test.go @@ -18,6 +18,7 @@ package cli import ( "os" + "path/filepath" "strings" "testing" @@ -220,6 +221,30 @@ func TestEnvOrBool(t *testing.T) { func TestUserAgentHeaderInK8sRESTClientConfig(t *testing.T) { defer resetEnv()() + kubeconfigPath := filepath.Join(t.TempDir(), "config") + kubeconfig := `apiVersion: v1 +clusters: +- cluster: + server: https://127.0.0.1:6443 + name: test +contexts: +- context: + cluster: test + user: test-user + name: test +current-context: test +kind: Config +preferences: {} +users: +- name: test-user + user: + token: test-token +` + if err := os.WriteFile(kubeconfigPath, []byte(kubeconfig), 0o600); err != nil { + t.Fatalf("failed to create test kubeconfig: %v", err) + } + t.Setenv("KUBECONFIG", kubeconfigPath) + settings := New() restConfig, err := settings.RESTClientGetter().ToRESTConfig() require.NoError(t, err) From 47bde119597961113d769a9d46a565f448565e7a Mon Sep 17 00:00:00 2001 From: LarytheLord Date: Sun, 8 Mar 2026 18:32:35 +0530 Subject: [PATCH 2/2] test(cli): use t.Cleanup for resetEnv with t.Setenv Signed-off-by: LarytheLord --- pkg/cli/environment_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/cli/environment_test.go b/pkg/cli/environment_test.go index df87b86df..2d7851a4f 100644 --- a/pkg/cli/environment_test.go +++ b/pkg/cli/environment_test.go @@ -120,7 +120,8 @@ func TestEnvSettings(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - defer resetEnv()() + cleanup := resetEnv() + t.Cleanup(cleanup) for k, v := range tt.envvars { t.Setenv(k, v) @@ -219,7 +220,8 @@ func TestEnvOrBool(t *testing.T) { } func TestUserAgentHeaderInK8sRESTClientConfig(t *testing.T) { - defer resetEnv()() + cleanup := resetEnv() + t.Cleanup(cleanup) kubeconfigPath := filepath.Join(t.TempDir(), "config") kubeconfig := `apiVersion: v1