From 17fa0bcaa57cb9696abc2c7a04962bba47c474c2 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Wed, 26 Feb 2025 19:24:00 +0100 Subject: [PATCH] formatter: breaks lines Signed-off-by: Kristoffer Dalby --- hscontrol/app.go | 20 +++++++++++++++----- hscontrol/types/node.go | 6 +++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/hscontrol/app.go b/hscontrol/app.go index c37e1e89..8131316e 100644 --- a/hscontrol/app.go +++ b/hscontrol/app.go @@ -194,10 +194,14 @@ func NewHeadscale(cfg *types.Config) (*Headscale, error) { var magicDNSDomains []dnsname.FQDN if cfg.PrefixV4 != nil { - magicDNSDomains = append(magicDNSDomains, util.GenerateIPv4DNSRootDomain(*cfg.PrefixV4)...) + magicDNSDomains = append( + magicDNSDomains, + util.GenerateIPv4DNSRootDomain(*cfg.PrefixV4)...) } if cfg.PrefixV6 != nil { - magicDNSDomains = append(magicDNSDomains, util.GenerateIPv6DNSRootDomain(*cfg.PrefixV6)...) + magicDNSDomains = append( + magicDNSDomains, + util.GenerateIPv6DNSRootDomain(*cfg.PrefixV6)...) } // we might have routes already from Split DNS @@ -459,11 +463,13 @@ func (h *Headscale) createRouter(grpcMux *grpcRuntime.ServeMux) *mux.Router { router := mux.NewRouter() router.Use(prometheusMiddleware) - router.HandleFunc(ts2021UpgradePath, h.NoiseUpgradeHandler).Methods(http.MethodPost, http.MethodGet) + router.HandleFunc(ts2021UpgradePath, h.NoiseUpgradeHandler). + Methods(http.MethodPost, http.MethodGet) router.HandleFunc("/health", h.HealthHandler).Methods(http.MethodGet) router.HandleFunc("/key", h.KeyHandler).Methods(http.MethodGet) - router.HandleFunc("/register/{registration_id}", h.authProvider.RegisterHandler).Methods(http.MethodGet) + router.HandleFunc("/register/{registration_id}", h.authProvider.RegisterHandler). + Methods(http.MethodGet) if provider, ok := h.authProvider.(*AuthProviderOIDC); ok { router.HandleFunc("/oidc/callback", provider.OIDCCallbackHandler).Methods(http.MethodGet) @@ -523,7 +529,11 @@ func usersChangedHook(db *db.HSDatabase, polMan policy.PolicyManager, notif *not // Maybe we should attempt a new in memory state and not go via the DB? // Maybe this should be implemented as an event bus? // A bool is returned indicating if a full update was sent to all nodes -func nodesChangedHook(db *db.HSDatabase, polMan policy.PolicyManager, notif *notifier.Notifier) (bool, error) { +func nodesChangedHook( + db *db.HSDatabase, + polMan policy.PolicyManager, + notif *notifier.Notifier, +) (bool, error) { nodes, err := db.ListNodes() if err != nil { return false, err diff --git a/hscontrol/types/node.go b/hscontrol/types/node.go index 7aeef4c0..7f63d74f 100644 --- a/hscontrol/types/node.go +++ b/hscontrol/types/node.go @@ -335,9 +335,9 @@ func (node *Node) SubnetRoutes() []netip.Prefix { return routes } -// func (node *Node) String() string { -// return node.Hostname -// } +func (node *Node) String() string { + return node.Hostname +} // PeerChangeFromMapRequest takes a MapRequest and compares it to the node // to produce a PeerChange struct that can be used to updated the node and