all: adopt slices helpers

This commit is contained in:
Kristoffer Dalby
2026-06-16 06:57:11 +00:00
parent 60f0544b78
commit ac725f27e4
18 changed files with 94 additions and 166 deletions
+4 -7
View File
@@ -3,6 +3,7 @@ package cli
import (
"os"
"runtime"
"slices"
"strings"
"github.com/juanfont/headscale/hscontrol/types"
@@ -95,13 +96,9 @@ func initConfig() {
var prereleases = []string{"alpha", "beta", "rc", "dev"}
func isPreReleaseVersion(version string) bool {
for _, unstable := range prereleases {
if strings.Contains(version, unstable) {
return true
}
}
return false
return slices.ContainsFunc(prereleases, func(unstable string) bool {
return strings.Contains(version, unstable)
})
}
// filterPreReleasesIfStable returns a function that filters out
+4 -7
View File
@@ -7,6 +7,7 @@ import (
"errors"
"fmt"
"os"
"slices"
"time"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
@@ -318,13 +319,9 @@ func printError(err error, outputFormat string) {
}
func hasMachineOutputFlag() bool {
for _, arg := range os.Args {
if arg == outputFormatJSON || arg == outputFormatJSONLine || arg == outputFormatYAML {
return true
}
}
return false
return slices.ContainsFunc(os.Args, func(arg string) bool {
return arg == outputFormatJSON || arg == outputFormatJSONLine || arg == outputFormatYAML
})
}
type tokenAuth struct {