From 5adde9e3f3f87cd9ce47832244aad49bcfb96bd8 Mon Sep 17 00:00:00 2001
From: KevinLiang10 <37811973+KevinLiang10@users.noreply.github.com>
Date: Fri, 18 Jul 2025 15:06:09 -0400
Subject: [PATCH] cmd/tailscale/cli: remove advertise command (#16592)

This commit removes the advertise command for service. The advertising is now embedded into
serve command and unadvertising is moved to drain subcommand

Fixes tailscale/corp#22954

Signed-off-by: KevinLiang10 <37811973+KevinLiang10@users.noreply.github.com>
---
 cmd/tailscale/cli/advertise.go | 76 ----------------------------------
 cmd/tailscale/cli/cli.go       |  1 -
 cmd/tailscale/cli/cli_test.go  |  2 +-
 3 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 cmd/tailscale/cli/advertise.go

diff --git a/cmd/tailscale/cli/advertise.go b/cmd/tailscale/cli/advertise.go
deleted file mode 100644
index 83d1a35aa..000000000
--- a/cmd/tailscale/cli/advertise.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Tailscale Inc & AUTHORS
-// SPDX-License-Identifier: BSD-3-Clause
-
-package cli
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/peterbourgon/ff/v3/ffcli"
-	"tailscale.com/envknob"
-	"tailscale.com/ipn"
-	"tailscale.com/tailcfg"
-)
-
-var advertiseArgs struct {
-	services string // comma-separated list of services to advertise
-}
-
-// TODO(naman): This flag may move to set.go or serve_v2.go after the WIPCode
-// envknob is not needed.
-func advertiseCmd() *ffcli.Command {
-	if !envknob.UseWIPCode() {
-		return nil
-	}
-	return &ffcli.Command{
-		Name:       "advertise",
-		ShortUsage: "tailscale advertise --services=<services>",
-		ShortHelp:  "Advertise this node as a destination for a service",
-		Exec:       runAdvertise,
-		FlagSet: (func() *flag.FlagSet {
-			fs := newFlagSet("advertise")
-			fs.StringVar(&advertiseArgs.services, "services", "", "comma-separated services to advertise; each must start with \"svc:\" (e.g. \"svc:idp,svc:nas,svc:database\")")
-			return fs
-		})(),
-	}
-}
-
-func runAdvertise(ctx context.Context, args []string) error {
-	if len(args) > 0 {
-		return flag.ErrHelp
-	}
-
-	services, err := parseServiceNames(advertiseArgs.services)
-	if err != nil {
-		return err
-	}
-
-	_, err = localClient.EditPrefs(ctx, &ipn.MaskedPrefs{
-		AdvertiseServicesSet: true,
-		Prefs: ipn.Prefs{
-			AdvertiseServices: services,
-		},
-	})
-	return err
-}
-
-// parseServiceNames takes a comma-separated list of service names
-// (eg. "svc:hello,svc:webserver,svc:catphotos"), splits them into
-// a list and validates each service name. If valid, it returns
-// the service names in a slice of strings.
-func parseServiceNames(servicesArg string) ([]string, error) {
-	var services []string
-	if servicesArg != "" {
-		services = strings.Split(servicesArg, ",")
-		for _, svc := range services {
-			err := tailcfg.ServiceName(svc).Validate()
-			if err != nil {
-				return nil, fmt.Errorf("service %q: %s", svc, err)
-			}
-		}
-	}
-	return services, nil
-}
diff --git a/cmd/tailscale/cli/cli.go b/cmd/tailscale/cli/cli.go
index d7e8e5ca2..bdfc7af42 100644
--- a/cmd/tailscale/cli/cli.go
+++ b/cmd/tailscale/cli/cli.go
@@ -260,7 +260,6 @@ change in the future.
 			debugCmd(),
 			driveCmd,
 			idTokenCmd,
-			advertiseCmd(),
 			configureHostCmd(),
 		),
 		FlagSet: rootfs,
diff --git a/cmd/tailscale/cli/cli_test.go b/cmd/tailscale/cli/cli_test.go
index 5dd4fa234..2e1bec8c9 100644
--- a/cmd/tailscale/cli/cli_test.go
+++ b/cmd/tailscale/cli/cli_test.go
@@ -964,7 +964,7 @@ func TestPrefFlagMapping(t *testing.T) {
 			// flag for this.
 			continue
 		case "AdvertiseServices":
-			// Handled by the tailscale advertise subcommand, we don't want a
+			// Handled by the tailscale serve subcommand, we don't want a
 			// CLI flag for this.
 			continue
 		case "InternalExitNodePrior":