From e2d5ee0927df90ba1ec38ce0726bd3043fa7c372 Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@dalby.cc>
Date: Wed, 23 Oct 2024 10:45:59 -0500
Subject: [PATCH] cleanup linter warnings (#2206)

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
---
 hscontrol/mapper/mapper.go      |  9 +--------
 hscontrol/mapper/mapper_test.go | 12 ------------
 hscontrol/noise.go              |  7 -------
 integration/route_test.go       | 12 +++++++-----
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/hscontrol/mapper/mapper.go b/hscontrol/mapper/mapper.go
index 20aa674d..3db1e159 100644
--- a/hscontrol/mapper/mapper.go
+++ b/hscontrol/mapper/mapper.go
@@ -111,9 +111,7 @@ func generateUserProfiles(
 
 func generateDNSConfig(
 	cfg *types.Config,
-	baseDomain string,
 	node *types.Node,
-	peers types.Nodes,
 ) *tailcfg.DNSConfig {
 	if cfg.DNSConfig == nil {
 		return nil
@@ -532,12 +530,7 @@ func appendPeerChanges(
 
 	profiles := generateUserProfiles(node, changed)
 
-	dnsConfig := generateDNSConfig(
-		cfg,
-		cfg.BaseDomain,
-		node,
-		peers,
-	)
+	dnsConfig := generateDNSConfig(cfg, node)
 
 	tailPeers, err := tailNodes(changed, capVer, pol, cfg)
 	if err != nil {
diff --git a/hscontrol/mapper/mapper_test.go b/hscontrol/mapper/mapper_test.go
index 32ea5352..37ed5c42 100644
--- a/hscontrol/mapper/mapper_test.go
+++ b/hscontrol/mapper/mapper_test.go
@@ -114,24 +114,12 @@ func TestDNSConfigMapResponse(t *testing.T) {
 			}
 
 			nodeInShared1 := mach("test_get_shared_nodes_1", "shared1", 1)
-			nodeInShared2 := mach("test_get_shared_nodes_2", "shared2", 2)
-			nodeInShared3 := mach("test_get_shared_nodes_3", "shared3", 3)
-			node2InShared1 := mach("test_get_shared_nodes_4", "shared1", 1)
-
-			peersOfNodeInShared1 := types.Nodes{
-				nodeInShared1,
-				nodeInShared2,
-				nodeInShared3,
-				node2InShared1,
-			}
 
 			got := generateDNSConfig(
 				&types.Config{
 					DNSConfig: &dnsConfigOrig,
 				},
-				baseDomain,
 				nodeInShared1,
-				peersOfNodeInShared1,
 			)
 
 			if diff := cmp.Diff(tt.want, got, cmpopts.EquateEmpty()); diff != "" {
diff --git a/hscontrol/noise.go b/hscontrol/noise.go
index 35450809..444a8073 100644
--- a/hscontrol/noise.go
+++ b/hscontrol/noise.go
@@ -10,7 +10,6 @@ import (
 	"github.com/juanfont/headscale/hscontrol/types"
 	"github.com/rs/zerolog/log"
 	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/h2c"
 	"tailscale.com/control/controlbase"
 	"tailscale.com/control/controlhttp"
 	"tailscale.com/tailcfg"
@@ -101,18 +100,12 @@ func (h *Headscale) NoiseUpgradeHandler(
 		Methods(http.MethodPost)
 	router.HandleFunc("/machine/map", noiseServer.NoisePollNetMapHandler)
 
-	server := http.Server{
-		ReadTimeout: types.HTTPTimeout,
-	}
-
 	noiseServer.httpBaseConfig = &http.Server{
 		Handler:           router,
 		ReadHeaderTimeout: types.HTTPTimeout,
 	}
 	noiseServer.http2Server = &http2.Server{}
 
-	server.Handler = h2c.NewHandler(router, noiseServer.http2Server)
-
 	noiseServer.http2Server.ServeConn(
 		noiseConn,
 		&http2.ServeConnOpts{
diff --git a/integration/route_test.go b/integration/route_test.go
index ca37b99a..f163fa14 100644
--- a/integration/route_test.go
+++ b/integration/route_test.go
@@ -22,6 +22,8 @@ import (
 	"tailscale.com/wgengine/filter"
 )
 
+var allPorts = filter.PortRange{First: 0, Last: 0xffff}
+
 // This test is both testing the routes command and the propagation of
 // routes.
 func TestEnablingRoutes(t *testing.T) {
@@ -1249,11 +1251,11 @@ func TestSubnetRouteACL(t *testing.T) {
 			Dsts: []filter.NetPortRange{
 				{
 					Net:   netip.MustParsePrefix("100.64.0.2/32"),
-					Ports: filter.PortRange{0, 0xffff},
+					Ports: allPorts,
 				},
 				{
 					Net:   netip.MustParsePrefix("fd7a:115c:a1e0::2/128"),
-					Ports: filter.PortRange{0, 0xffff},
+					Ports: allPorts,
 				},
 			},
 			Caps: []filter.CapMatch{},
@@ -1281,11 +1283,11 @@ func TestSubnetRouteACL(t *testing.T) {
 			Dsts: []filter.NetPortRange{
 				{
 					Net:   netip.MustParsePrefix("100.64.0.1/32"),
-					Ports: filter.PortRange{0, 0xffff},
+					Ports: allPorts,
 				},
 				{
 					Net:   netip.MustParsePrefix("fd7a:115c:a1e0::1/128"),
-					Ports: filter.PortRange{0, 0xffff},
+					Ports: allPorts,
 				},
 			},
 			Caps: []filter.CapMatch{},
@@ -1303,7 +1305,7 @@ func TestSubnetRouteACL(t *testing.T) {
 			Dsts: []filter.NetPortRange{
 				{
 					Net:   netip.MustParsePrefix("10.33.0.0/16"),
-					Ports: filter.PortRange{0, 0xffff},
+					Ports: allPorts,
 				},
 			},
 			Caps: []filter.CapMatch{},