aboutsummaryrefslogtreecommitdiffstats
path: root/client/go/internal
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2024-06-11 14:46:13 +0200
committerMartin Polden <mpolden@mpolden.no>2024-06-11 14:46:13 +0200
commit15cb97dd996b2e1addd999f5db967e9008339047 (patch)
treeda55d3e7d3640126d35cc3197d7954cb65528037 /client/go/internal
parentca5464d58807dff9ea1e904996c3ee8b993b80eb (diff)
Remove unused parameter
Diffstat (limited to 'client/go/internal')
-rw-r--r--client/go/internal/cli/cmd/config.go2
-rw-r--r--client/go/internal/cli/cmd/config_test.go12
-rw-r--r--client/go/internal/cli/cmd/root.go2
3 files changed, 8 insertions, 8 deletions
diff --git a/client/go/internal/cli/cmd/config.go b/client/go/internal/cli/cmd/config.go
index fc6d69aab61..77ca2cf8c12 100644
--- a/client/go/internal/cli/cmd/config.go
+++ b/client/go/internal/cli/cmd/config.go
@@ -513,7 +513,7 @@ func (c *Config) authConfigPath() string {
return filepath.Join(c.homeDir, "auth.json")
}
-func (c *Config) readAPIKey(cli *CLI, system vespa.System, tenantName string) ([]byte, error) {
+func (c *Config) readAPIKey(cli *CLI, tenantName string) ([]byte, error) {
if override, ok := c.apiKeyFromEnv(); ok {
return override, nil
}
diff --git a/client/go/internal/cli/cmd/config_test.go b/client/go/internal/cli/cmd/config_test.go
index b13f8365f5f..a70766ff931 100644
--- a/client/go/internal/cli/cmd/config_test.go
+++ b/client/go/internal/cli/cmd/config_test.go
@@ -156,19 +156,19 @@ func assertConfigCommandErr(t *testing.T, configHome, expected string, args ...s
func TestReadAPIKey(t *testing.T) {
cli, _, _ := newTestCLI(t)
- key, err := cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
+ key, err := cli.config.readAPIKey(cli, "t1")
assert.Nil(t, key)
require.NotNil(t, err)
// 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")
+ key, err = cli.config.readAPIKey(cli, "t1")
require.Nil(t, err)
assert.Equal(t, []byte("foo"), key)
// Cloud CI never reads key from disk as it's not expected to have any
cli, _, _ = newTestCLI(t, "VESPA_CLI_CLOUD_CI=true")
- key, err = cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
+ key, err = cli.config.readAPIKey(cli, "t1")
require.Nil(t, err)
assert.Nil(t, key)
@@ -176,20 +176,20 @@ func TestReadAPIKey(t *testing.T) {
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")
+ key, err = cli.config.readAPIKey(cli, "t1")
require.Nil(t, err)
assert.Equal(t, []byte("bar"), key)
// From key specified in environment
cli, _, _ = newTestCLI(t, "VESPA_CLI_API_KEY=baz")
- key, err = cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
+ key, err = cli.config.readAPIKey(cli, "t1")
require.Nil(t, err)
assert.Equal(t, []byte("baz"), key)
// Prefer Auth0 if we have auth config
cli, _, _ = newTestCLI(t)
require.Nil(t, os.WriteFile(filepath.Join(cli.config.homeDir, "auth.json"), []byte("foo"), 0600))
- key, err = cli.config.readAPIKey(cli, vespa.PublicSystem, "t1")
+ key, err = cli.config.readAPIKey(cli, "t1")
require.Nil(t, err)
assert.Nil(t, key)
}
diff --git a/client/go/internal/cli/cmd/root.go b/client/go/internal/cli/cmd/root.go
index 6d0c747954a..26e84773b9f 100644
--- a/client/go/internal/cli/cmd/root.go
+++ b/client/go/internal/cli/cmd/root.go
@@ -463,7 +463,7 @@ func (c *CLI) createCustomTarget(targetType, customURL string) (vespa.Target, er
}
func (c *CLI) cloudApiAuthenticator(deployment vespa.Deployment, system vespa.System) (vespa.Authenticator, error) {
- apiKey, err := c.config.readAPIKey(c, system, deployment.Application.Tenant)
+ apiKey, err := c.config.readAPIKey(c, deployment.Application.Tenant)
if err != nil {
return nil, err
}