From 454a03a766af20f814e50ab5dcc523120e828403 Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Wed, 17 Apr 2024 08:05:04 +0100 Subject: [PATCH] cmd/tailscale/cli: prepend "tailscale" to usage errors Updates #11626 Signed-off-by: Paul Scott --- cmd/tailscale/cli/debug.go | 6 +++--- cmd/tailscale/cli/file.go | 2 +- cmd/tailscale/cli/id-token.go | 2 +- cmd/tailscale/cli/nc.go | 2 +- cmd/tailscale/cli/network-lock.go | 6 +++--- cmd/tailscale/cli/ping.go | 2 +- cmd/tailscale/cli/ssh.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/tailscale/cli/debug.go b/cmd/tailscale/cli/debug.go index f54b694b9..88b7312c9 100644 --- a/cmd/tailscale/cli/debug.go +++ b/cmd/tailscale/cli/debug.go @@ -842,7 +842,7 @@ var debugComponentLogsArgs struct { func runDebugComponentLogs(ctx context.Context, args []string) error { if len(args) != 1 { - return errors.New("usage: debug component-logs [" + strings.Join(ipn.DebuggableComponents, "|") + "]") + return errors.New("usage: tailscale debug component-logs [" + strings.Join(ipn.DebuggableComponents, "|") + "]") } component := args[0] dur := debugComponentLogsArgs.forDur @@ -865,7 +865,7 @@ var devStoreSetArgs struct { func runDevStoreSet(ctx context.Context, args []string) error { if len(args) != 2 { - return errors.New("usage: dev-store-set --danger ") + return errors.New("usage: tailscale debug dev-store-set --danger ") } if !devStoreSetArgs.danger { return errors.New("this command is dangerous; use --danger to proceed") @@ -883,7 +883,7 @@ func runDevStoreSet(ctx context.Context, args []string) error { func runDebugDERP(ctx context.Context, args []string) error { if len(args) != 1 { - return errors.New("usage: debug derp ") + return errors.New("usage: tailscale debug derp ") } st, err := localClient.DebugDERPRegion(ctx, args[0]) if err != nil { diff --git a/cmd/tailscale/cli/file.go b/cmd/tailscale/cli/file.go index 4f769eee3..4c1b73a1a 100644 --- a/cmd/tailscale/cli/file.go +++ b/cmd/tailscale/cli/file.go @@ -554,7 +554,7 @@ func runFileGetOneBatch(ctx context.Context, dir string) []error { func runFileGet(ctx context.Context, args []string) error { if len(args) != 1 { - return errors.New("usage: file get ") + return errors.New("usage: tailscale file get ") } log.SetFlags(0) diff --git a/cmd/tailscale/cli/id-token.go b/cmd/tailscale/cli/id-token.go index 7efd42d62..e675819bf 100644 --- a/cmd/tailscale/cli/id-token.go +++ b/cmd/tailscale/cli/id-token.go @@ -19,7 +19,7 @@ var idTokenCmd = &ffcli.Command{ func runIDToken(ctx context.Context, args []string) error { if len(args) != 1 { - return errors.New("usage: id-token ") + return errors.New("usage: tailscale id-token ") } tr, err := localClient.IDToken(ctx, args[0]) diff --git a/cmd/tailscale/cli/nc.go b/cmd/tailscale/cli/nc.go index 21e69c220..e0d681644 100644 --- a/cmd/tailscale/cli/nc.go +++ b/cmd/tailscale/cli/nc.go @@ -33,7 +33,7 @@ func runNC(ctx context.Context, args []string) error { } if len(args) != 2 { - return errors.New("usage: nc ") + return errors.New("usage: tailscale nc ") } hostOrIP, portStr := args[0], args[1] diff --git a/cmd/tailscale/cli/network-lock.go b/cmd/tailscale/cli/network-lock.go index 26bc3857c..0aa73fc1e 100644 --- a/cmd/tailscale/cli/network-lock.go +++ b/cmd/tailscale/cli/network-lock.go @@ -461,7 +461,7 @@ func runNetworkLockSign(ctx context.Context, args []string) error { ) if len(args) == 0 || len(args) > 2 { - return errors.New("usage: lock sign []") + return errors.New("usage: tailscale lock sign []") } if err := nodeKey.UnmarshalText([]byte(args[0])); err != nil { return fmt.Errorf("decoding node-key: %w", err) @@ -508,7 +508,7 @@ func runNetworkLockDisable(ctx context.Context, args []string) error { return err } if len(secrets) != 1 { - return errors.New("usage: lock disable ") + return errors.New("usage: tailscale lock disable ") } return localClient.NetworkLockDisable(ctx, secrets[0]) } @@ -545,7 +545,7 @@ var nlDisablementKDFCmd = &ffcli.Command{ func runNetworkLockDisablementKDF(ctx context.Context, args []string) error { if len(args) != 1 { - return errors.New("usage: lock disablement-kdf ") + return errors.New("usage: tailscale lock disablement-kdf ") } secret, err := hex.DecodeString(args[0]) if err != nil { diff --git a/cmd/tailscale/cli/ping.go b/cmd/tailscale/cli/ping.go index fd59183f2..bf7f2c53d 100644 --- a/cmd/tailscale/cli/ping.go +++ b/cmd/tailscale/cli/ping.go @@ -95,7 +95,7 @@ func runPing(ctx context.Context, args []string) error { } if len(args) != 1 || args[0] == "" { - return errors.New("usage: ping ") + return errors.New("usage: tailscale ping ") } var ip string diff --git a/cmd/tailscale/cli/ssh.go b/cmd/tailscale/cli/ssh.go index 2ba8b3d9e..1aceb10bb 100644 --- a/cmd/tailscale/cli/ssh.go +++ b/cmd/tailscale/cli/ssh.go @@ -52,7 +52,7 @@ func runSSH(ctx context.Context, args []string) error { return errors.New("The 'tailscale ssh' subcommand is not available on macOS builds distributed through the App Store or TestFlight.\nInstall the Standalone variant of Tailscale (download it from https://pkgs.tailscale.com), or use the regular 'ssh' client instead.") } if len(args) == 0 { - return errors.New("usage: ssh [user@]") + return errors.New("usage: tailscale ssh [user@]") } arg, argRest := args[0], args[1:] username, host, ok := strings.Cut(arg, "@")