1 files changed, 12 insertions, 27 deletions

diff --git a/client/go/cmd/config_test.go b/client/go/cmd/config_test.go
index 9f41ef46914..f89e752f82d 100644
--- a/client/go/cmd/config_test.go
+++ b/client/go/cmd/config_test.go
@@ -145,33 +145,17 @@ func assertConfigCommandErr(t *testing.T, configHome, expected string, args ...s
 	assert.NotNil(t, assertConfigCommandStdErr(t, configHome, expected, args...))
 }
 
-func TestReadAPIKey(t *testing.T) {
+func TestUseAPIKey(t *testing.T) {
 	cli, _, _ := newTestCLI(t)
-	key, err := cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
-	assert.Nil(t, key)
-	require.NotNil(t, err)
+	assert.False(t, cli.config.useAPIKey(cli, vespa.PublicSystem, "t1"))
 
-	// From default path when it exists
-	require.Nil(t, os.WriteFile(filepath.Join(cli.config.homeDir, "t1.api-key.pem"), []byte("foo"), 0600))
-	key, err = cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
-	require.Nil(t, err)
-	assert.Equal(t, []byte("foo"), key)
-
-	// From file specified in environment
-	keyFile := filepath.Join(t.TempDir(), "key")
-	require.Nil(t, os.WriteFile(keyFile, []byte("bar"), 0600))
-	cli, _, _ = newTestCLI(t, "VESPA_CLI_API_KEY_FILE="+keyFile)
-	key, err = cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
-	require.Nil(t, err)
-	assert.Equal(t, []byte("bar"), key)
+	cli, _, _ = newTestCLI(t, "VESPA_CLI_API_KEY_FILE=/tmp/foo")
+	assert.True(t, cli.config.useAPIKey(cli, vespa.PublicSystem, "t1"))
 
-	// From key specified in environment
-	cli, _, _ = newTestCLI(t, "VESPA_CLI_API_KEY=baz")
-	key, err = cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
-	require.Nil(t, err)
-	assert.Equal(t, []byte("baz"), key)
+	cli, _, _ = newTestCLI(t, "VESPA_CLI_API_KEY=foo")
+	assert.True(t, cli.config.useAPIKey(cli, vespa.PublicSystem, "t1"))
 
-	// Auth0 is preferred when configured
+	// Prefer Auth0, if configured
 	authContent := `
 {
     "version": 1,
@@ -188,9 +172,10 @@ func TestReadAPIKey(t *testing.T) {
 		}
 	}
 }`
-	cli, _, _ = newTestCLI(t)
-	require.Nil(t, os.WriteFile(filepath.Join(cli.config.homeDir, "auth.json"), []byte(authContent), 0600))
-	key, err = cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
+	cli, _, _ = newTestCLI(t, "VESPA_CLI_CLOUD_SYSTEM=public")
+	_, err := os.Create(filepath.Join(cli.config.homeDir, "t2.api-key.pem"))
 	require.Nil(t, err)
-	assert.Equal(t, []byte(nil), key)
+	assert.True(t, cli.config.useAPIKey(cli, vespa.PublicSystem, "t2"))
+	require.Nil(t, os.WriteFile(filepath.Join(cli.config.homeDir, "auth.json"), []byte(authContent), 0600))
+	assert.False(t, cli.config.useAPIKey(cli, vespa.PublicSystem, "t2"))
 }