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/root.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/root.go')
| -rw-r--r-- | client/go/cmd/root.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/go/cmd/root.go b/client/go/cmd/root.go index 0557248cedf..e88398a7fde 100644 --- a/client/go/cmd/root.go +++ b/client/go/cmd/root.go @@ -324,9 +324,11 @@ func (c *CLI) createCloudTarget(targetType string, opts targetOptions) (vespa.Ta ) switch targetType { case vespa.TargetCloud: - apiKey, err = c.config.readAPIKey(c, system, deployment.Application.Tenant) - if err != nil { - return nil, err + if c.config.useAPIKey(c, system, deployment.Application.Tenant) { + apiKey, err = c.config.readAPIKey(deployment.Application.Tenant) + if err != nil { + return nil, err + } } authConfigPath = c.config.authConfigPath() deploymentTLSOptions = vespa.TLSOptions{} |