fix lint and clarify comments

spikecurtis · spikecurtis · commit 68b0375bd0ee · 2025-06-02T12:27:58.000Z
diff --git a/tailnet/test/integration/integration.go b/tailnet/test/integration/integration.go
@@ -474,13 +474,15 @@ func (UDPEchoService) StartService(t *testing.T, logger slog.Logger, _ *tailnet.
 				logger.Info(context.Background(), "error reading UDPEcho listener", slog.Error(readErr))
 				return
 			}
-			logger.Info(context.Background(), "received UDP packet",
+			logger.Info(context.Background(), "received UDPEcho packet",
 				slog.F("len", n), slog.F("remote", remote))
 			n, writeErr := l.WriteToUDP(buf[:n], remote)
 			if writeErr != nil {
 				logger.Info(context.Background(), "error writing UDPEcho listener", slog.Error(writeErr))
 				return
 			}
+			logger.Info(context.Background(), "wrote UDPEcho packet",
+				slog.F("len", n), slog.F("remote", remote))
 		}
 	}()
 }
diff --git a/tailnet/test/integration/network.go b/tailnet/test/integration/network.go
@@ -512,8 +512,8 @@ func (n TriangleNetwork) SetupNetworking(t *testing.T, l slog.Logger) TestNetwor
 	for _, iface := range interfaces {
 		err = setInterfaceUp(iface.netNS, iface.ifaceName)
 		require.NoErrorf(t, err, "bring up interface %q", iface.ifaceName)
-		// Note: routes are not needed as the interfaces are defined as /24, and we are fully connected, so nothing
-		// needs to forward IP to a further destination.
+		// Note: routes are not needed as we are fully connected, so nothing needs to forward IP to a further
+		// destination.
 	}
 
 	return TestNetworking{
@@ -616,8 +616,8 @@ func createNetNS(t *testing.T, name string) *os.File {
 	})
 
 	// Open /run/netns/$name to get a file descriptor to the network namespace.
-	path := fmt.Sprintf("/run/netns/%s", name)
-	file, err := os.OpenFile(path, os.O_RDONLY, 0)
+	netnsPath := fmt.Sprintf("/run/netns/%s", name)
+	file, err := os.OpenFile(netnsPath, os.O_RDONLY, 0)
 	require.NoError(t, err, "open network namespace file")
 	t.Cleanup(func() {
 		_ = file.Close()
@@ -717,8 +717,8 @@ func setInterfaceIP(netNS *os.File, ifaceName, ip string) error {
 	return nil
 }
 
-// setInterfaceIP sets the IP address on the given interface. It automatically
-// adds a /24 subnet mask.
+// setInterfaceIP6 sets the IPv6 address on the given interface. It automatically
+// adds a /64 subnet mask.
 func setInterfaceIP6(netNS *os.File, ifaceName, ip string) error {
 	_, err := commandInNetNS(netNS, "ip", []string{"addr", "add", ip + "/64", "dev", ifaceName}).Output()
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -474,13 +474,15 @@ func (UDPEchoService) StartService(t testing.T, logger slog.Logger, _ tailnet.`
`474`	`474`	`logger.Info(context.Background(), "error reading UDPEcho listener", slog.Error(readErr))`
`475`	`475`	`return`
`476`	`476`	`}`
`477`		`- logger.Info(context.Background(), "received UDP packet",`
	`477`	`+ logger.Info(context.Background(), "received UDPEcho packet",`
`478`	`478`	`slog.F("len", n), slog.F("remote", remote))`
`479`	`479`	`n, writeErr := l.WriteToUDP(buf[:n], remote)`
`480`	`480`	`if writeErr != nil {`
`481`	`481`	`logger.Info(context.Background(), "error writing UDPEcho listener", slog.Error(writeErr))`
`482`	`482`	`return`
`483`	`483`	`}`
	`484`	`+ logger.Info(context.Background(), "wrote UDPEcho packet",`
	`485`	`+ slog.F("len", n), slog.F("remote", remote))`
`484`	`486`	`}`
`485`	`487`	`}()`
`486`	`488`	`}`