diff --git a/app.go b/app.go index b87fb33..39684f3 100644 --- a/app.go +++ b/app.go @@ -318,7 +318,8 @@ func (h *Headscale) expireEphemeralNodesWorker() { func (h *Headscale) grpcAuthenticationInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, - handler grpc.UnaryHandler) (interface{}, error) { + handler grpc.UnaryHandler, +) (interface{}, error) { // Check if the request is coming from the on-server client. // This is not secure, but it is to maintain maintainability // with the "legacy" database-based client diff --git a/cmd/headscale/cli/utils.go b/cmd/headscale/cli/utils.go index 7ea61df..7dde419 100644 --- a/cmd/headscale/cli/utils.go +++ b/cmd/headscale/cli/utils.go @@ -566,9 +566,9 @@ func GetFileMode(key string) fs.FileMode { return fs.FileMode(mode) } -func contains[T string](ts []T, t T) bool { +func contains(ts []T, t T) bool { for _, v := range ts { - if reflect.DeepEqual(v,t) { + if reflect.DeepEqual(v, t) { return true } } diff --git a/derp_server.go b/derp_server.go index d6fb47d..25c26dd 100644 --- a/derp_server.go +++ b/derp_server.go @@ -128,7 +128,7 @@ func (h *Headscale) DERPHandler(ctx *gin.Context) { if !fastStart { pubKey := h.privateKey.Public() - pubKeyStr := pubKey.UntypedHexString() // nolint + pubKeyStr := pubKey.UntypedHexString() fmt.Fprintf(conn, "HTTP/1.1 101 Switching Protocols\r\n"+ "Upgrade: DERP\r\n"+ "Connection: Upgrade\r\n"+ diff --git a/machine.go b/machine.go index fd63939..088eff8 100644 --- a/machine.go +++ b/machine.go @@ -363,8 +363,7 @@ func (h *Headscale) UpdateMachine(machine *Machine) error { // SetTags takes a Machine struct pointer and update the forced tags. func (h *Headscale) SetTags(machine *Machine, tags []string) error { machine.ForcedTags = tags - err := h.UpdateACLRules() - if err != nil { + if err := h.UpdateACLRules(); err != nil { return err } h.setLastStateChangeToNow(machine.Namespace.Name) @@ -670,6 +669,7 @@ func getTags( owners, err := expandTagOwners(aclPolicy, tag, stripEmailDomain) if errors.Is(err, errInvalidTag) { invalidTagMap[tag] = true + continue } var found bool diff --git a/machine_test.go b/machine_test.go index a1ddcff..988c7a5 100644 --- a/machine_test.go +++ b/machine_test.go @@ -387,13 +387,23 @@ func Test_getTags(t *testing.T) { ) for _, valid := range gotValid { if !contains(test.wantValid, valid) { - t.Errorf("valids: getTags() = %v, want %v", gotValid, test.wantValid) + t.Errorf( + "valids: getTags() = %v, want %v", + gotValid, + test.wantValid, + ) + break } } for _, invalid := range gotInvalid { if !contains(test.wantInvalid, invalid) { - t.Errorf("invalids: getTags() = %v, want %v", gotInvalid, test.wantInvalid) + t.Errorf( + "invalids: getTags() = %v, want %v", + gotInvalid, + test.wantInvalid, + ) + break } } diff --git a/poll.go b/poll.go index 3bad0b8..c273f79 100644 --- a/poll.go +++ b/poll.go @@ -619,7 +619,7 @@ func (h *Headscale) scheduledPollWorker( } } -func closeChanWithLog[C chan []byte | chan struct{}](channel C, machine, name string) { +func closeChanWithLog(channel C, machine, name string) { log.Trace(). Str("handler", "PollNetMap"). Str("machine", machine). diff --git a/proto/headscale/v1/machine.proto b/proto/headscale/v1/machine.proto index 0e5d75a..2f0cf28 100644 --- a/proto/headscale/v1/machine.proto +++ b/proto/headscale/v1/machine.proto @@ -40,9 +40,9 @@ message Machine { // bytes endpoints = 16; // bytes enabled_routes = 17; - repeated string forced_tags = 18; + repeated string forced_tags = 18; repeated string invalid_tags = 19; - repeated string valid_tags = 20; + repeated string valid_tags = 20; } message RegisterMachineRequest { @@ -63,8 +63,8 @@ message GetMachineResponse { } message SetTagsRequest { - uint64 machine_id = 1; - repeated string tags = 2; + uint64 machine_id = 1; + repeated string tags = 2; } message SetTagsResponse {