lint and leftover

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

hscontrol/types/change/change.go

@@ -97,6 +97,35 @@ func (c ChangeSet) IsFull() bool {
 	return c.Change == Full || c.Change == Policy
 }
 
+func HasFull(cs []ChangeSet) bool {
+	for _, c := range cs {
+		if c.IsFull() {
+			return true
+		}
+	}
+	return false
+}
+
+func SplitAllAndSelf(cs []ChangeSet) (all []ChangeSet, self []ChangeSet) {
+	for _, c := range cs {
+		if c.SelfUpdateOnly {
+			self = append(self, c)
+		} else {
+			all = append(all, c)
+		}
+	}
+	return all, self
+}
+
+func RemoveUpdatesForSelf(id types.NodeID, cs []ChangeSet) (ret []ChangeSet) {
+	for _, c := range cs {
+		if c.NodeID != id || c.Change.AlsoSelf() {
+			ret = append(ret, c)
+		}
+	}
+	return ret
+}
+
 func (c ChangeSet) AlsoSelf() bool {
 	// If NodeID is 0, it means this ChangeSet is not related to a specific node,
 	// so we consider it as a change that should be sent to all nodes.

hscontrol/types/config.go

@@ -489,6 +489,7 @@ func derpConfig() DERPConfig {
 		urlAddr, err := url.Parse(urlStr)
 		if err != nil {
 			log.Error().
+				Caller().
 				Str("url", urlStr).
 				Err(err).
 				Msg("Failed to parse url, ignoring...")
@@ -561,6 +562,7 @@ func logConfig() LogConfig {
 		logFormat = TextLogFormat
 	default:
 		log.Error().
+			Caller().
 			Str("func", "GetLogConfig").
 			Msgf("Could not parse log format: %s. Valid choices are 'json' or 'text'", logFormatOpt)
 	}

hscontrol/types/node.go

@@ -54,6 +54,20 @@ func (id NodeID) String() string {
 	return strconv.FormatUint(id.Uint64(), util.Base10)
 }
 
+func ParseNodeID(s string) (NodeID, error) {
+	id, err := strconv.ParseUint(s, util.Base10, 64)
+	return NodeID(id), err
+}
+
+func MustParseNodeID(s string) NodeID {
+	id, err := ParseNodeID(s)
+	if err != nil {
+		panic(err)
+	}
+
+	return id
+}
+
 // Node is a Headscale client.
 type Node struct {
 	ID NodeID `gorm:"primary_key"`

hscontrol/types/preauth_key.go

@@ -61,6 +61,7 @@ func (pak *PreAuthKey) Validate() error {
 	}
 
 	log.Debug().
+		Caller().
 		Str("key", pak.Key).
 		Bool("hasExpiration", pak.Expiration != nil).
 		Time("expiration", func() time.Time {

hscontrol/types/users.go

@@ -321,7 +321,7 @@ func (u *User) FromClaim(claims *OIDCClaims) {
 	if err == nil {
 		u.Name = claims.Username
 	} else {
-		log.Debug().Err(err).Msgf("Username %s is not valid", claims.Username)
+		log.Debug().Caller().Err(err).Msgf("Username %s is not valid", claims.Username)
 	}
 
 	if claims.EmailVerified {