From 04600d83cc01b1c009f4f8dccb60d4c7754a7bde Mon Sep 17 00:00:00 2001 From: henrygd Date: Thu, 19 Feb 2026 17:57:06 -0500 Subject: [PATCH] refactor: small go 1.26 updates and `go fix` changes --- agent/agent_cache_test.go | 1 - agent/agent_test_helpers.go | 1 - agent/client_test.go | 1 - agent/connection_manager.go | 10 +++++----- agent/connection_manager_test.go | 1 - agent/cpu.go | 5 +---- agent/data_dir_test.go | 1 - agent/disk.go | 2 +- agent/disk_test.go | 1 - agent/docker_test.go | 1 - agent/fingerprint_test.go | 1 - agent/gpu_test.go | 1 - agent/handlers_test.go | 1 - agent/health/health_test.go | 1 - agent/sensors_test.go | 1 - agent/server_test.go | 1 - agent/smart.go | 2 +- agent/smart_test.go | 1 - internal/alerts/alerts_battery_test.go | 1 - internal/alerts/alerts_quiet_hours_test.go | 1 - internal/alerts/alerts_smart_test.go | 1 - internal/alerts/alerts_test.go | 1 - internal/alerts/alerts_test_helpers.go | 1 - internal/ghupdate/ghupdate.go | 2 +- internal/hub/agent_connect_test.go | 1 - internal/hub/config/config_test.go | 1 - internal/hub/expirymap/expirymap_test.go | 1 - internal/hub/heartbeat/heartbeat_test.go | 1 - internal/hub/hub_test.go | 1 - internal/hub/hub_test_helpers.go | 1 - internal/hub/systems/systems_production.go | 1 - internal/hub/systems/systems_test.go | 1 - internal/hub/systems/systems_test_helpers.go | 1 - internal/hub/ws/request_manager_test.go | 1 - internal/hub/ws/ws_test.go | 1 - internal/hub/ws/ws_test_helpers.go | 1 - internal/records/records_test.go | 1 - internal/records/records_test_helpers.go | 1 - internal/tests/hub.go | 1 - 39 files changed, 9 insertions(+), 46 deletions(-) diff --git a/agent/agent_cache_test.go b/agent/agent_cache_test.go index db7d5d78..9720ed06 100644 --- a/agent/agent_cache_test.go +++ b/agent/agent_cache_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/agent_test_helpers.go b/agent/agent_test_helpers.go index 7b3fffa8..6340586b 100644 --- a/agent/agent_test_helpers.go +++ b/agent/agent_test_helpers.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/client_test.go b/agent/client_test.go index 5b712827..09d6fb4f 100644 --- a/agent/client_test.go +++ b/agent/client_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/connection_manager.go b/agent/connection_manager.go index 47e1779a..fc91a9b1 100644 --- a/agent/connection_manager.go +++ b/agent/connection_manager.go @@ -1,9 +1,9 @@ package agent import ( + "context" "errors" "log/slog" - "os" "os/signal" "syscall" "time" @@ -91,8 +91,8 @@ func (c *ConnectionManager) Start(serverOptions ServerOptions) error { c.eventChan = make(chan ConnectionEvent, 1) // signal handling for shutdown - sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + sigCtx, stopSignals := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) + defer stopSignals() c.startWsTicker() c.connect() @@ -109,8 +109,8 @@ func (c *ConnectionManager) Start(serverOptions ServerOptions) error { _ = c.startWebSocketConnection() case <-healthTicker: _ = health.Update() - case <-sigChan: - slog.Info("Shutting down") + case <-sigCtx.Done(): + slog.Info("Shutting down", "cause", context.Cause(sigCtx)) _ = c.agent.StopServer() c.closeWebSocket() return health.CleanUp() diff --git a/agent/connection_manager_test.go b/agent/connection_manager_test.go index 3224f8c4..8a848772 100644 --- a/agent/connection_manager_test.go +++ b/agent/connection_manager_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/cpu.go b/agent/cpu.go index 4ed52f7d..6f2133c8 100644 --- a/agent/cpu.go +++ b/agent/cpu.go @@ -89,10 +89,7 @@ func getPerCoreCpuUsage(cacheTimeMs uint16) (system.Uint8Slice, error) { lastTimes := lastPerCoreCpuTimes[cacheTimeMs] // Limit to the number of cores available in both samples - length := len(perCoreTimes) - if len(lastTimes) < length { - length = len(lastTimes) - } + length := min(len(lastTimes), len(perCoreTimes)) usage := make([]uint8, length) for i := 0; i < length; i++ { diff --git a/agent/data_dir_test.go b/agent/data_dir_test.go index f5612ccc..66f97b8d 100644 --- a/agent/data_dir_test.go +++ b/agent/data_dir_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/disk.go b/agent/disk.go index 8e36fad7..5a30bb6b 100644 --- a/agent/disk.go +++ b/agent/disk.go @@ -127,7 +127,7 @@ func (a *Agent) initializeDiskInfo() { // Add EXTRA_FILESYSTEMS env var values to fsStats if extraFilesystems, exists := GetEnv("EXTRA_FILESYSTEMS"); exists { - for _, fsEntry := range strings.Split(extraFilesystems, ",") { + for fsEntry := range strings.SplitSeq(extraFilesystems, ",") { // Parse custom name from format: device__customname fs, customName := parseFilesystemEntry(fsEntry) diff --git a/agent/disk_test.go b/agent/disk_test.go index f180c9e8..7ca58cae 100644 --- a/agent/disk_test.go +++ b/agent/disk_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/docker_test.go b/agent/docker_test.go index d31159f0..f38ca92a 100644 --- a/agent/docker_test.go +++ b/agent/docker_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/fingerprint_test.go b/agent/fingerprint_test.go index a45c92c4..9d404f6b 100644 --- a/agent/fingerprint_test.go +++ b/agent/fingerprint_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/gpu_test.go b/agent/gpu_test.go index 7f4febfe..3562b5d9 100644 --- a/agent/gpu_test.go +++ b/agent/gpu_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/handlers_test.go b/agent/handlers_test.go index 6a40c618..5df132b4 100644 --- a/agent/handlers_test.go +++ b/agent/handlers_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/health/health_test.go b/agent/health/health_test.go index f820b629..2e9c48df 100644 --- a/agent/health/health_test.go +++ b/agent/health/health_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package health diff --git a/agent/sensors_test.go b/agent/sensors_test.go index e1e67953..a055e5e6 100644 --- a/agent/sensors_test.go +++ b/agent/sensors_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/server_test.go b/agent/server_test.go index de18b710..acdeffa7 100644 --- a/agent/server_test.go +++ b/agent/server_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/agent/smart.go b/agent/smart.go index 6bffea07..2a779589 100644 --- a/agent/smart.go +++ b/agent/smart.go @@ -476,7 +476,7 @@ func (sm *SmartManager) CollectSmart(deviceInfo *DeviceInfo) error { output, err := cmd.CombinedOutput() // Check if device is in standby (exit status 2) - if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 2 { + if exitErr, ok := errors.AsType[*exec.ExitError](err); ok && exitErr.ExitCode() == 2 { if hasExistingData { // Device is in standby and we have cached data, keep using cache return nil diff --git a/agent/smart_test.go b/agent/smart_test.go index 594c5fcc..14add02f 100644 --- a/agent/smart_test.go +++ b/agent/smart_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package agent diff --git a/internal/alerts/alerts_battery_test.go b/internal/alerts/alerts_battery_test.go index 3baeb417..5361d151 100644 --- a/internal/alerts/alerts_battery_test.go +++ b/internal/alerts/alerts_battery_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package alerts_test diff --git a/internal/alerts/alerts_quiet_hours_test.go b/internal/alerts/alerts_quiet_hours_test.go index 4f4217d4..78d2c667 100644 --- a/internal/alerts/alerts_quiet_hours_test.go +++ b/internal/alerts/alerts_quiet_hours_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package alerts_test diff --git a/internal/alerts/alerts_smart_test.go b/internal/alerts/alerts_smart_test.go index 6a2ecd15..34cb6358 100644 --- a/internal/alerts/alerts_smart_test.go +++ b/internal/alerts/alerts_smart_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package alerts_test diff --git a/internal/alerts/alerts_test.go b/internal/alerts/alerts_test.go index ee1b5bf5..07412904 100644 --- a/internal/alerts/alerts_test.go +++ b/internal/alerts/alerts_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package alerts_test diff --git a/internal/alerts/alerts_test_helpers.go b/internal/alerts/alerts_test_helpers.go index 6161f570..8894e3cb 100644 --- a/internal/alerts/alerts_test_helpers.go +++ b/internal/alerts/alerts_test_helpers.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package alerts diff --git a/internal/ghupdate/ghupdate.go b/internal/ghupdate/ghupdate.go index 8020583e..6a068a2b 100644 --- a/internal/ghupdate/ghupdate.go +++ b/internal/ghupdate/ghupdate.go @@ -34,7 +34,7 @@ func ColorPrint(color, text string) { fmt.Println(color + text + colorReset) } -func ColorPrintf(color, format string, args ...interface{}) { +func ColorPrintf(color, format string, args ...any) { fmt.Printf(color+format+colorReset+"\n", args...) } diff --git a/internal/hub/agent_connect_test.go b/internal/hub/agent_connect_test.go index 40f66224..1fa87b2d 100644 --- a/internal/hub/agent_connect_test.go +++ b/internal/hub/agent_connect_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package hub diff --git a/internal/hub/config/config_test.go b/internal/hub/config/config_test.go index b04eeada..e38cd0f4 100644 --- a/internal/hub/config/config_test.go +++ b/internal/hub/config/config_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package config_test diff --git a/internal/hub/expirymap/expirymap_test.go b/internal/hub/expirymap/expirymap_test.go index 81272edf..6ac09c43 100644 --- a/internal/hub/expirymap/expirymap_test.go +++ b/internal/hub/expirymap/expirymap_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package expirymap diff --git a/internal/hub/heartbeat/heartbeat_test.go b/internal/hub/heartbeat/heartbeat_test.go index d76bcfc5..b78143c7 100644 --- a/internal/hub/heartbeat/heartbeat_test.go +++ b/internal/hub/heartbeat/heartbeat_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package heartbeat_test diff --git a/internal/hub/hub_test.go b/internal/hub/hub_test.go index 3bdf6ac0..dc7058c3 100644 --- a/internal/hub/hub_test.go +++ b/internal/hub/hub_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package hub_test diff --git a/internal/hub/hub_test_helpers.go b/internal/hub/hub_test_helpers.go index 2171c881..4527970f 100644 --- a/internal/hub/hub_test_helpers.go +++ b/internal/hub/hub_test_helpers.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package hub diff --git a/internal/hub/systems/systems_production.go b/internal/hub/systems/systems_production.go index bca88dc6..754c555b 100644 --- a/internal/hub/systems/systems_production.go +++ b/internal/hub/systems/systems_production.go @@ -1,5 +1,4 @@ //go:build !testing -// +build !testing package systems diff --git a/internal/hub/systems/systems_test.go b/internal/hub/systems/systems_test.go index db7e6bb3..b734edda 100644 --- a/internal/hub/systems/systems_test.go +++ b/internal/hub/systems/systems_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package systems_test diff --git a/internal/hub/systems/systems_test_helpers.go b/internal/hub/systems/systems_test_helpers.go index 204ed486..8599bca3 100644 --- a/internal/hub/systems/systems_test_helpers.go +++ b/internal/hub/systems/systems_test_helpers.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package systems diff --git a/internal/hub/ws/request_manager_test.go b/internal/hub/ws/request_manager_test.go index b5140f04..06c72f83 100644 --- a/internal/hub/ws/request_manager_test.go +++ b/internal/hub/ws/request_manager_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package ws diff --git a/internal/hub/ws/ws_test.go b/internal/hub/ws/ws_test.go index 5efcfe8c..bdbc4cb2 100644 --- a/internal/hub/ws/ws_test.go +++ b/internal/hub/ws/ws_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package ws diff --git a/internal/hub/ws/ws_test_helpers.go b/internal/hub/ws/ws_test_helpers.go index daf84741..ac52c779 100644 --- a/internal/hub/ws/ws_test_helpers.go +++ b/internal/hub/ws/ws_test_helpers.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package ws diff --git a/internal/records/records_test.go b/internal/records/records_test.go index b93ecf75..7d4446e5 100644 --- a/internal/records/records_test.go +++ b/internal/records/records_test.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package records_test diff --git a/internal/records/records_test_helpers.go b/internal/records/records_test_helpers.go index dfc3bffe..ce813ea3 100644 --- a/internal/records/records_test_helpers.go +++ b/internal/records/records_test_helpers.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing package records diff --git a/internal/tests/hub.go b/internal/tests/hub.go index e1f4d0a6..598d774d 100644 --- a/internal/tests/hub.go +++ b/internal/tests/hub.go @@ -1,5 +1,4 @@ //go:build testing -// +build testing // Package tests provides helpers for testing the application. package tests