diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2022-04-20 00:15:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-20 00:15:27 +0200 |
commit | 2dcb262db7e0087cb7f2ea455c732fd1ea84dd6b (patch) | |
tree | 7beb5dc6975987e362ce305f6b03df0d91a09de0 /client/go/cmd/config_test.go | |
parent | ddd16fd9efba8428e0d62430550e8741dcf696b8 (diff) | |
parent | 178d188787c0fe89a6ba30497d1757f0a6e8283f (diff) |
Merge pull request #22158 from vespa-engine/revert-22138-mpolden/ci-api-key-filev7.575.35
Revert "Allow reading API key from default path when Auth0 is not configured"
Diffstat (limited to 'client/go/cmd/config_test.go')
-rw-r--r-- | client/go/cmd/config_test.go | 39 |
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")) } |