From 4f95b6966bc91372dad00a32358d80828befeda7 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Wed, 12 Jul 2023 23:11:45 -0700 Subject: [PATCH] cmd/tailscale: remove TS_EXPERIMENT_OAUTH_AUTHKEY guardrail We've had support for OAuth client keys in `--authkey=...` for several releases, and we're using it in https://github.com/tailscale/github-action Remove the TS_EXPERIMENT_* guardrail, it is fully supported now. Fixes https://github.com/tailscale/tailscale/issues/8403 Signed-off-by: Denton Gentry --- cmd/tailscale/cli/up.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd/tailscale/cli/up.go b/cmd/tailscale/cli/up.go index 06d9b5ff8..48b11ec3a 100644 --- a/cmd/tailscale/cli/up.go +++ b/cmd/tailscale/cli/up.go @@ -30,7 +30,6 @@ qrcode "github.com/skip2/go-qrcode" "golang.org/x/oauth2/clientcredentials" "tailscale.com/client/tailscale" - "tailscale.com/envknob" "tailscale.com/health/healthmsg" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" @@ -1132,9 +1131,6 @@ func resolveAuthKey(ctx context.Context, v, tags string) (string, error) { if !strings.HasPrefix(v, "tskey-client-") { return v, nil } - if !envknob.Bool("TS_EXPERIMENT_OAUTH_AUTHKEY") { - return "", errors.New("oauth authkeys are in experimental status") - } if tags == "" { return "", errors.New("oauth authkeys require --advertise-tags") }