cmd/tailscale: promote new serve/funnel CLI to be default (#9833)

The change is being kept to a minimum to make a revert easy if necessary. After the release, we will go back for a final cleanup.

updates #8489

Signed-off-by: Tyler Smalley <tyler@tailscale.com>

cmd/tailscale/cli/funnel.go

@@ -13,7 +13,6 @@
 	"strings"
 
 	"github.com/peterbourgon/ff/v3/ffcli"
-	"tailscale.com/envknob"
 	"tailscale.com/ipn"
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/tailcfg"
@@ -22,13 +21,10 @@
 
 var funnelCmd = func() *ffcli.Command {
 	se := &serveEnv{lc: &localClient}
-	// This flag is used to switch to an in-development
+	// previously used to serve legacy newFunnelCommand unless useWIPCode is true
-	// implementation of the tailscale funnel command.
+	// change is limited to make a revert easier and full cleanup to come after the relase.
-	// See https://github.com/tailscale/tailscale/issues/7844
+	// TODO(tylersmalley): cleanup and removal of newFunnelCommand as of 2023-10-16
-	if envknob.UseWIPCode() {
+	return newServeV2Command(se, funnel)
-		return newServeDevCommand(se, funnel)
-	}
-	return newFunnelCommand(se)
 }
 
 // newFunnelCommand returns a new "funnel" subcommand using e as its environment.

cmd/tailscale/cli/serve_legacy.go

@@ -24,7 +24,6 @@
 
 	"github.com/peterbourgon/ff/v3/ffcli"
 	"tailscale.com/client/tailscale"
-	"tailscale.com/envknob"
 	"tailscale.com/ipn"
 	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/tailcfg"
@@ -34,17 +33,14 @@
 
 var serveCmd = func() *ffcli.Command {
 	se := &serveEnv{lc: &localClient}
-	// This flag is used to switch to an in-development
+	// previously used to serve legacy newFunnelCommand unless useWIPCode is true
-	// implementation of the tailscale funnel command.
+	// change is limited to make a revert easier and full cleanup to come after the relase.
-	// See https://github.com/tailscale/tailscale/issues/7844
+	// TODO(tylersmalley): cleanup and removal of newServeLegacyCommand as of 2023-10-16
-	if envknob.UseWIPCode() {
+	return newServeV2Command(se, serve)
-		return newServeDevCommand(se, serve)
-	}
-	return newServeCommand(se)
 }
 
-// newServeCommand returns a new "serve" subcommand using e as its environment.
+// newServeLegacyCommand returns a new "serve" subcommand using e as its environment.
-func newServeCommand(e *serveEnv) *ffcli.Command {
+func newServeLegacyCommand(e *serveEnv) *ffcli.Command {
 	return &ffcli.Command{
 		Name:      "serve",
 		ShortHelp: "Serve content and local servers",

cmd/tailscale/cli/serve_legacy_test.go

@@ -713,7 +713,7 @@ type step struct {
 			cmd = newFunnelCommand(e)
 			args = st.command[1:]
 		} else {
-			cmd = newServeCommand(e)
+			cmd = newServeLegacyCommand(e)
 			args = st.command
 		}
 		err := cmd.ParseAndRun(context.Background(), args)

cmd/tailscale/cli/serve_v2.go

@@ -94,8 +94,8 @@ func buildShortUsage(subcmd string) string {
 	}, "\n  ")
 }
 
-// newServeDevCommand returns a new "serve" subcommand using e as its environment.
+// newServeV2Command returns a new "serve" subcommand using e as its environment.
-func newServeDevCommand(e *serveEnv, subcmd serveMode) *ffcli.Command {
+func newServeV2Command(e *serveEnv, subcmd serveMode) *ffcli.Command {
 	if subcmd != serve && subcmd != funnel {
 		log.Fatalf("newServeDevCommand called with unknown subcmd %q", subcmd)
 	}

cmd/tailscale/cli/serve_v2_test.go

@@ -746,7 +746,7 @@ type step struct {
 		if st.command[0] == "funnel" {
 			mode = funnel
 		}
-		cmd = newServeDevCommand(e, mode)
+		cmd = newServeV2Command(e, mode)
 		args = st.command[1:]
 
 		err := cmd.ParseAndRun(context.Background(), args)