public/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-09-21 15:54:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

all: adopt maps and cmp helpers

Browse Source
This commit is contained in:
Kristoffer Dalby
2026-06-16 08:30:16 +00:00
parent ac725f27e4
commit 27468f944b
7 changed files with 28 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/capver/main.go
+7 -14
View File
@@ -10,15 +10,14 @@ import (
"go/format"
"io"
"log"
"maps"
"net/http"
"os"
"regexp"
"slices"
"sort"
"strconv"
"strings"
xmaps "golang.org/x/exp/maps"
"tailscale.com/tailcfg"
)
@@ -246,8 +245,7 @@ func getCapabilityVersions(ctx context.Context) (map[string]tailcfg.CapabilityVe
func calculateMinSupportedCapabilityVersion(versions map[string]tailcfg.CapabilityVersion) tailcfg.CapabilityVersion {
// Since we now store minor versions directly, just sort and take the oldest of the latest N
minorVersions := xmaps.Keys(versions)
sort.Strings(minorVersions)
minorVersions := slices.Sorted(maps.Keys(versions))
supportedCount := min(len(minorVersions), supportedMajorMinorVersions)
@@ -264,8 +262,7 @@ func calculateMinSupportedCapabilityVersion(versions map[string]tailcfg.Capabili
// firstTailscaleVerPerCapVer inverts versions into a map from each capability
// version to the first (lowest-sorted) Tailscale minor version reporting it.
func firstTailscaleVerPerCapVer(versions map[string]tailcfg.CapabilityVersion) map[tailcfg.CapabilityVersion]string {
sortedVersions := xmaps.Keys(versions)
sort.Strings(sortedVersions)
sortedVersions := slices.Sorted(maps.Keys(versions))
capVerToTailscaleVer := make(map[tailcfg.CapabilityVersion]string)
@@ -288,8 +285,7 @@ func writeCapabilityVersionsToFile(versions map[string]tailcfg.CapabilityVersion
content.WriteString("\n\n")
content.WriteString("var tailscaleToCapVer = map[string]tailcfg.CapabilityVersion{\n")
sortedVersions := xmaps.Keys(versions)
sort.Strings(sortedVersions)
sortedVersions := slices.Sorted(maps.Keys(versions))
for _, version := range sortedVersions {
fmt.Fprintf(&content, "\t\"%s\": %d,\n", version, versions[version])
@@ -302,8 +298,7 @@ func writeCapabilityVersionsToFile(versions map[string]tailcfg.CapabilityVersion
capVerToTailscaleVer := firstTailscaleVerPerCapVer(versions)
capsSorted := xmaps.Keys(capVerToTailscaleVer)
slices.Sort(capsSorted)
capsSorted := slices.Sorted(maps.Keys(capVerToTailscaleVer))
for _, capVer := range capsSorted {
fmt.Fprintf(&content, "\t%d:\t\t\"%s\",\n", capVer, capVerToTailscaleVer[capVer])
@@ -337,8 +332,7 @@ func writeCapabilityVersionsToFile(versions map[string]tailcfg.CapabilityVersion
func writeTestDataFile(versions map[string]tailcfg.CapabilityVersion, minSupportedCapVer tailcfg.CapabilityVersion) error {
// Sort minor versions
minorVersions := xmaps.Keys(versions)
sort.Strings(minorVersions)
minorVersions := slices.Sorted(maps.Keys(versions))
// Take latest N
supportedCount := min(len(minorVersions), supportedMajorMinorVersions)
@@ -416,8 +410,7 @@ func writeTestDataFile(versions map[string]tailcfg.CapabilityVersion, minSupport
fmt.Fprintf(&content, "\t{%d, \"%s\"},\n", minSupportedCapVer, minVersionString)
// Add a few more test cases
capsSorted := xmaps.Keys(capVerToTailscaleVer)
slices.Sort(capsSorted)
capsSorted := slices.Sorted(maps.Keys(capVerToTailscaleVer))
testCount := 0
for _, capVer := range capsSorted {