eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

remove custom contains funcs for slices.Contains (#2015)

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-07-19 09:04:04 +02:00 • committed by GitHub
parent 9e523d4687
commit 11fde62b8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/headscale/cli/nodes.go
View file

@ -4,6 +4,7 @@ import (
"fmt"
"log"
"net/netip"
"slices"
"strconv"
"strings"
"time"
@ -617,14 +618,14 @@ func nodesToPtables(
forcedTags = strings.TrimLeft(forcedTags, ",")
var invalidTags string
for _, tag := range node.GetInvalidTags() {
if !contains(node.GetForcedTags(), tag) {
if !slices.Contains(node.GetForcedTags(), tag) {
invalidTags += "," + pterm.LightRed(tag)
}
}
invalidTags = strings.TrimLeft(invalidTags, ",")
var validTags string
for _, tag := range node.GetValidTags() {
if !contains(node.GetForcedTags(), tag) {
if !slices.Contains(node.GetForcedTags(), tag) {
validTags += "," + pterm.LightGreen(tag)
}
}

11
cmd/headscale/cli/utils.go
View file

@ -6,7 +6,6 @@ import (
"encoding/json"
"fmt"
"os"
"reflect"
"github.com/rs/zerolog/log"
"google.golang.org/grpc"
@ -197,13 +196,3 @@ func (t tokenAuth) GetRequestMetadata(
func (tokenAuth) RequireTransportSecurity() bool {
return true
}
func contains[T string](ts []T, t T) bool {
for _, v := range ts {
if reflect.DeepEqual(v, t) {
return true
}
}
return false
}