From bcc47d91ca83aecd5123a4b0ac645e5ccb574000 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 4 Sep 2024 12:59:28 -0700 Subject: [PATCH] cmd/tailscale/cli: use new Go 1.23 slices.Sorted And a grammatical nit. Updates #12912 Change-Id: I9feae53beb4d28dfe98b583373e2e0a43c801fc4 Signed-off-by: Brad Fitzpatrick --- cmd/tailscale/cli/dns-status.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cmd/tailscale/cli/dns-status.go b/cmd/tailscale/cli/dns-status.go index f412f6c31..0d59e4b91 100644 --- a/cmd/tailscale/cli/dns-status.go +++ b/cmd/tailscale/cli/dns-status.go @@ -6,6 +6,7 @@ package cli import ( "context" "fmt" + "maps" "slices" "strings" @@ -43,7 +44,7 @@ func runDNSStatus(ctx context.Context, args []string) error { fmt.Println("This is the DNS configuration provided by the coordination server to this device.") fmt.Print("\n") if s.CurrentTailnet == nil { - fmt.Println("No tailnet information available; make sure you're logged into a tailnet.") + fmt.Println("No tailnet information available; make sure you're logged in to a tailnet.") return nil } else if s.CurrentTailnet.MagicDNSEnabled { fmt.Printf("MagicDNS: enabled tailnet-wide (suffix = %s)", s.CurrentTailnet.MagicDNSSuffix) @@ -76,12 +77,7 @@ func runDNSStatus(ctx context.Context, args []string) error { if len(dnsConfig.Routes) == 0 { fmt.Println(" (no routes configured: split DNS might not be in use)") } - routesKeys := make([]string, 0, len(dnsConfig.Routes)) - for k := range dnsConfig.Routes { - routesKeys = append(routesKeys, k) - } - slices.Sort(routesKeys) - for _, k := range routesKeys { + for _, k := range slices.Sorted(maps.Keys(dnsConfig.Routes)) { v := dnsConfig.Routes[k] for _, r := range v { fmt.Printf(" - %-30s -> %v", k, r.Addr)