diff options
| author | Will Norris <will@tailscale.com> | 2024-01-29 12:52:19 -0800 |
|---|---|---|
| committer | Will Norris <will@willnorris.com> | 2024-01-29 13:01:29 -0800 |
| commit | 13f8a669d5cd3bd2af39c693f4878ecbbb4d56d1 (patch) | |
| tree | 904c912946ae75e811ecc4db4f7c063a552099c7 /cmd/gitops-pusher | |
| parent | cce189bde1619ca3631ecd99d0e157549150ed55 (diff) | |
| download | tailscale-13f8a669d5cd3bd2af39c693f4878ecbbb4d56d1.tar.xz tailscale-13f8a669d5cd3bd2af39c693f4878ecbbb4d56d1.zip | |
cmd/gitops-pusher: fix logic for checking credentialsgitops-1.58.2
gitops-pusher supports authenticating with an API key or OAuth
credentials (added in #7393). You shouldn't ever use both of those
together, so we error if both are set.
In tailscale/gitops-acl-action#24, OAuth support is being added to the
GitHub action. In that environment, both the TS_API_KEY and OAuth
variables will be set, even if they are empty values. This causes an
error in gitops-pusher which expects only one to be set.
Update gitops-pusher to check that only one set of environment variables
are non-empty, rather than just checking if they are set.
Updates #7393
Signed-off-by: Will Norris <will@tailscale.com>
Diffstat (limited to 'cmd/gitops-pusher')
| -rw-r--r-- | cmd/gitops-pusher/gitops-pusher.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/gitops-pusher/gitops-pusher.go b/cmd/gitops-pusher/gitops-pusher.go index 5c9388105..72410fa91 100644 --- a/cmd/gitops-pusher/gitops-pusher.go +++ b/cmd/gitops-pusher/gitops-pusher.go @@ -158,7 +158,7 @@ func main() { if !ok && (!oiok || !osok) { log.Fatal("set envvar TS_API_KEY to your Tailscale API key or TS_OAUTH_ID and TS_OAUTH_SECRET to your Tailscale OAuth ID and Secret") } - if ok && (oiok || osok) { + if apiKey != "" && (oauthId != "" || oauthSecret != "") { log.Fatal("set either the envvar TS_API_KEY or TS_OAUTH_ID and TS_OAUTH_SECRET") } var client *http.Client |