cmd/gitops-pusher: only use OAuth creds if non-empty string

`os.LookupEnv` may return true if the variable is present in
the environment but an empty string. We should only attempt
to set OAuth Config if thsoe values are non-empty.

Updates gitops-acl-action#33

Signed-off-by: Jenny Zhang <jz@tailscale.com>
pull/11127/head
Jenny Zhang 10 months ago committed by phirework
parent 993acf4475
commit c446451bfa

@ -162,7 +162,9 @@ func main() {
log.Fatal("set either the envvar TS_API_KEY or TS_OAUTH_ID and TS_OAUTH_SECRET") log.Fatal("set either the envvar TS_API_KEY or TS_OAUTH_ID and TS_OAUTH_SECRET")
} }
var client *http.Client var client *http.Client
if oiok { if oiok && (oauthId != "" || oauthSecret != "") {
// Both should ideally be set, but if either are non-empty it means the user had an intent
// to set _something_, so they should receive the oauth error flow.
oauthConfig := &clientcredentials.Config{ oauthConfig := &clientcredentials.Config{
ClientID: oauthId, ClientID: oauthId,
ClientSecret: oauthSecret, ClientSecret: oauthSecret,

Loading…
Cancel
Save