Rename integration test env variables

- Variables specific to concierge add it to their name
- All variables now start with `PINNIPED_TEST_` which makes it clear
  that they are for tests and also helps them not conflict with the
  env vars that are used in the Pinniped CLI code

test/integration/cli_test.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -26,49 +25,25 @@ func TestCLI(t *testing.T) {
 
 	idp := library.CreateTestWebhookIDP(ctx, t)
 
-	// Remove all Pinniped environment variables for the remainder of this test
-	// because some of their names clash with the env vars expected by our
-	// kubectl exec plugin. We would like this test to prove that the exec
-	// plugin receives all of the necessary env vars via the auto-generated
-	// kubeconfig from the Pinniped CLI.
-	initialEnvVars := make(map[string]string)
-	for _, e := range os.Environ() {
-		pair := strings.SplitN(e, "=", 2)
-		name := pair[0]
-		value := pair[1]
-		if strings.HasPrefix(name, "PINNIPED_") {
-			initialEnvVars[name] = value
-			err := os.Unsetenv(name)
-			require.NoError(t, err)
-		}
-	}
-	// Put them back for other tests to use after this one
-	t.Cleanup(func() {
-		for k, v := range initialEnvVars {
-			err := os.Setenv(k, v)
-			require.NoError(t, err)
-		}
-	})
-
 	// Build pinniped CLI.
 	pinnipedExe, cleanupFunc := buildPinnipedCLI(t)
 	defer cleanupFunc()
 
 	// Run pinniped CLI to get kubeconfig.
-	kubeConfigYAML := runPinnipedCLI(t, pinnipedExe, env.TestUser.Token, env.Namespace, "webhook", idp.Name)
+	kubeConfigYAML := runPinnipedCLI(t, pinnipedExe, env.TestUser.Token, env.ConciergeNamespace, "webhook", idp.Name)
 
 	// In addition to the client-go based testing below, also try the kubeconfig
 	// with kubectl to validate that it works.
 	adminClient := library.NewClientset(t)
 	t.Run(
 		"access as user with kubectl",
-		library.AccessAsUserWithKubectlTest(ctx, adminClient, kubeConfigYAML, env.TestUser.ExpectedUsername, env.Namespace),
+		library.AccessAsUserWithKubectlTest(ctx, adminClient, kubeConfigYAML, env.TestUser.ExpectedUsername, env.ConciergeNamespace),
 	)
 	for _, group := range env.TestUser.ExpectedGroups {
 		group := group
 		t.Run(
 			"access as group "+group+" with kubectl",
-			library.AccessAsGroupWithKubectlTest(ctx, adminClient, kubeConfigYAML, group, env.Namespace),
+			library.AccessAsGroupWithKubectlTest(ctx, adminClient, kubeConfigYAML, group, env.ConciergeNamespace),
 		)
 	}