TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: use new Go 1.23 slices.Sorted

Browse Source 
And a grammatical nit.

Updates #12912

Change-Id: I9feae53beb4d28dfe98b583373e2e0a43c801fc4
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2024-09-04 12:59:28 -07:00 committed by Brad Fitzpatrick
parent 11d205f6c4
commit bcc47d91ca
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/tailscale/cli/dns-status.go
View File

@ -6,6 +6,7 @@
import ( import (
"context" "context"
"fmt" "fmt"
"maps"
"slices" "slices"
"strings" "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.Println("This is the DNS configuration provided by the coordination server to this device.")
fmt.Print("\n") fmt.Print("\n")
if s.CurrentTailnet == nil { 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 return nil
} else if s.CurrentTailnet.MagicDNSEnabled { } else if s.CurrentTailnet.MagicDNSEnabled {
fmt.Printf("MagicDNS: enabled tailnet-wide (suffix = %s)", s.CurrentTailnet.MagicDNSSuffix) 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 { if len(dnsConfig.Routes) == 0 {
fmt.Println(" (no routes configured: split DNS might not be in use)") fmt.Println(" (no routes configured: split DNS might not be in use)")
} }
routesKeys := make([]string, 0, len(dnsConfig.Routes)) for _, k := range slices.Sorted(maps.Keys(dnsConfig.Routes)) {
for k := range dnsConfig.Routes {
routesKeys = append(routesKeys, k)
}
slices.Sort(routesKeys)
for _, k := range routesKeys {
v := dnsConfig.Routes[k] v := dnsConfig.Routes[k]
for _, r := range v { for _, r := range v {
fmt.Printf(" - %-30s -> %v", k, r.Addr) fmt.Printf(" - %-30s -> %v", k, r.Addr)