diff --git a/beszel/cmd/agent/agent_test.go b/beszel/cmd/agent/agent_test.go index 9f41563f..53054aa8 100644 --- a/beszel/cmd/agent/agent_test.go +++ b/beszel/cmd/agent/agent_test.go @@ -1,12 +1,13 @@ package main import ( - "beszel/internal/agent" "crypto/ed25519" "os" "path/filepath" "testing" + "github.com/henrygd/beszel/internal/agent" + "github.com/spf13/pflag" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/beszel/internal/agent/agent_cache.go b/beszel/internal/agent/agent_cache.go index c42d5c58..7425cd06 100644 --- a/beszel/internal/agent/agent_cache.go +++ b/beszel/internal/agent/agent_cache.go @@ -1,8 +1,9 @@ package agent import ( - "beszel/internal/entities/system" "time" + + "github.com/henrygd/beszel/internal/entities/system" ) // Not thread safe since we only access from gatherStats which is already locked diff --git a/beszel/internal/agent/agent_cache_test.go b/beszel/internal/agent/agent_cache_test.go index fa43f82b..87984c95 100644 --- a/beszel/internal/agent/agent_cache_test.go +++ b/beszel/internal/agent/agent_cache_test.go @@ -4,11 +4,12 @@ package agent import ( - "beszel/internal/entities/system" "testing" "testing/synctest" "time" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/beszel/internal/agent/client.go b/beszel/internal/agent/client.go index 601a7ded..19933c1f 100644 --- a/beszel/internal/agent/client.go +++ b/beszel/internal/agent/client.go @@ -1,8 +1,6 @@ package agent import ( - "beszel" - "beszel/internal/common" "crypto/tls" "errors" "fmt" @@ -15,6 +13,9 @@ import ( "strings" "time" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/internal/common" + "github.com/fxamacker/cbor/v2" "github.com/lxzan/gws" "golang.org/x/crypto/ssh" diff --git a/beszel/internal/agent/client_test.go b/beszel/internal/agent/client_test.go index bb5e2538..2edc2034 100644 --- a/beszel/internal/agent/client_test.go +++ b/beszel/internal/agent/client_test.go @@ -4,8 +4,6 @@ package agent import ( - "beszel" - "beszel/internal/common" "crypto/ed25519" "net/url" "os" @@ -13,6 +11,10 @@ import ( "testing" "time" + "github.com/henrygd/beszel" + + "github.com/henrygd/beszel/internal/common" + "github.com/fxamacker/cbor/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/beszel/internal/agent/connection_manager.go b/beszel/internal/agent/connection_manager.go index 9801e380..caa5cf84 100644 --- a/beszel/internal/agent/connection_manager.go +++ b/beszel/internal/agent/connection_manager.go @@ -1,13 +1,14 @@ package agent import ( - "beszel/internal/agent/health" "errors" "log/slog" "os" "os/signal" "syscall" "time" + + "github.com/henrygd/beszel/internal/agent/health" ) // ConnectionManager manages the connection state and events for the agent. diff --git a/beszel/internal/agent/gpu_test.go b/beszel/internal/agent/gpu_test.go index 7d64da47..6bf070ec 100644 --- a/beszel/internal/agent/gpu_test.go +++ b/beszel/internal/agent/gpu_test.go @@ -4,12 +4,13 @@ package agent import ( - "beszel/internal/entities/system" "os" "path/filepath" "testing" "time" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/beszel/internal/agent/sensors.go b/beszel/internal/agent/sensors.go index 8063c7e6..22b8e5a3 100644 --- a/beszel/internal/agent/sensors.go +++ b/beszel/internal/agent/sensors.go @@ -1,7 +1,6 @@ package agent import ( - "beszel/internal/entities/system" "context" "fmt" "log/slog" @@ -11,6 +10,8 @@ import ( "strings" "unicode/utf8" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/shirou/gopsutil/v4/common" "github.com/shirou/gopsutil/v4/sensors" ) diff --git a/beszel/internal/agent/sensors_test.go b/beszel/internal/agent/sensors_test.go index 32a05dcf..e1e67953 100644 --- a/beszel/internal/agent/sensors_test.go +++ b/beszel/internal/agent/sensors_test.go @@ -4,12 +4,13 @@ package agent import ( - "beszel/internal/entities/system" "context" "fmt" "os" "testing" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/shirou/gopsutil/v4/common" "github.com/shirou/gopsutil/v4/sensors" "github.com/stretchr/testify/assert" diff --git a/beszel/internal/agent/server.go b/beszel/internal/agent/server.go index 3b341221..58ac9a8e 100644 --- a/beszel/internal/agent/server.go +++ b/beszel/internal/agent/server.go @@ -1,9 +1,6 @@ package agent import ( - "beszel" - "beszel/internal/common" - "beszel/internal/entities/system" "encoding/json" "errors" "fmt" @@ -14,6 +11,10 @@ import ( "strings" "time" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/internal/common" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/blang/semver" "github.com/fxamacker/cbor/v2" "github.com/gliderlabs/ssh" diff --git a/beszel/internal/agent/server_test.go b/beszel/internal/agent/server_test.go index 2a0f78b6..bfee84e5 100644 --- a/beszel/internal/agent/server_test.go +++ b/beszel/internal/agent/server_test.go @@ -1,8 +1,6 @@ package agent import ( - "beszel/internal/entities/container" - "beszel/internal/entities/system" "context" "crypto/ed25519" "encoding/json" @@ -15,6 +13,9 @@ import ( "testing" "time" + "github.com/henrygd/beszel/internal/entities/container" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/blang/semver" "github.com/fxamacker/cbor/v2" "github.com/gliderlabs/ssh" diff --git a/beszel/internal/alerts/alerts_system.go b/beszel/internal/alerts/alerts_system.go index efd2d73d..c554a36c 100644 --- a/beszel/internal/alerts/alerts_system.go +++ b/beszel/internal/alerts/alerts_system.go @@ -1,12 +1,13 @@ package alerts import ( - "beszel/internal/entities/system" "encoding/json" "fmt" "strings" "time" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/types" diff --git a/beszel/internal/alerts/alerts_test.go b/beszel/internal/alerts/alerts_test.go index 742bd1b0..d14722fa 100644 --- a/beszel/internal/alerts/alerts_test.go +++ b/beszel/internal/alerts/alerts_test.go @@ -13,7 +13,7 @@ import ( "testing/synctest" "time" - beszelTests "beszel/internal/tests" + beszelTests "github.com/henrygd/beszel/internal/tests" "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" diff --git a/beszel/internal/ghupdate/ghupdate.go b/beszel/internal/ghupdate/ghupdate.go index 575fe9ab..5cf9a175 100644 --- a/beszel/internal/ghupdate/ghupdate.go +++ b/beszel/internal/ghupdate/ghupdate.go @@ -4,7 +4,6 @@ package ghupdate import ( - "beszel" "context" "encoding/json" "fmt" @@ -16,6 +15,8 @@ import ( "runtime" "strings" + "github.com/henrygd/beszel" + "github.com/blang/semver" ) diff --git a/beszel/internal/hub/agent_connect.go b/beszel/internal/hub/agent_connect.go index 83a64aa0..25e8c883 100644 --- a/beszel/internal/hub/agent_connect.go +++ b/beszel/internal/hub/agent_connect.go @@ -1,9 +1,6 @@ package hub import ( - "beszel/internal/common" - "beszel/internal/hub/expirymap" - "beszel/internal/hub/ws" "errors" "net" "net/http" @@ -11,6 +8,10 @@ import ( "sync" "time" + "github.com/henrygd/beszel/internal/common" + "github.com/henrygd/beszel/internal/hub/expirymap" + "github.com/henrygd/beszel/internal/hub/ws" + "github.com/blang/semver" "github.com/lxzan/gws" "github.com/pocketbase/dbx" diff --git a/beszel/internal/hub/agent_connect_test.go b/beszel/internal/hub/agent_connect_test.go index b84bb8a7..7ca3f599 100644 --- a/beszel/internal/hub/agent_connect_test.go +++ b/beszel/internal/hub/agent_connect_test.go @@ -4,9 +4,6 @@ package hub import ( - "beszel/internal/agent" - "beszel/internal/common" - "beszel/internal/hub/ws" "crypto/ed25519" "fmt" "net/http" @@ -17,6 +14,10 @@ import ( "testing" "time" + "github.com/henrygd/beszel/internal/agent" + "github.com/henrygd/beszel/internal/common" + "github.com/henrygd/beszel/internal/hub/ws" + "github.com/pocketbase/pocketbase/core" pbtests "github.com/pocketbase/pocketbase/tests" "github.com/stretchr/testify/assert" diff --git a/beszel/internal/hub/config/config_test.go b/beszel/internal/hub/config/config_test.go index 8c1377c1..b04eeada 100644 --- a/beszel/internal/hub/config/config_test.go +++ b/beszel/internal/hub/config/config_test.go @@ -4,12 +4,14 @@ package config_test import ( - "beszel/internal/hub/config" - "beszel/internal/tests" "os" "path/filepath" "testing" + "github.com/henrygd/beszel/internal/tests" + + "github.com/henrygd/beszel/internal/hub/config" + "github.com/pocketbase/pocketbase/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/beszel/internal/hub/hub.go b/beszel/internal/hub/hub.go index 2ca742f0..0d93ea29 100644 --- a/beszel/internal/hub/hub.go +++ b/beszel/internal/hub/hub.go @@ -14,6 +14,8 @@ import ( "github.com/henrygd/beszel" "github.com/henrygd/beszel/internal/alerts" + "github.com/henrygd/beszel/internal/hub/config" + "github.com/henrygd/beszel/internal/hub/systems" "github.com/henrygd/beszel/internal/records" "github.com/henrygd/beszel/internal/users" diff --git a/beszel/internal/hub/hub_test.go b/beszel/internal/hub/hub_test.go index b686f69c..2c93ee10 100644 --- a/beszel/internal/hub/hub_test.go +++ b/beszel/internal/hub/hub_test.go @@ -4,10 +4,6 @@ package hub_test import ( - beszelTests "beszel/internal/tests" - "beszel/migrations" - "testing" - "bytes" "crypto/ed25519" "encoding/json" @@ -17,6 +13,11 @@ import ( "os" "path/filepath" "strings" + "testing" + + "github.com/henrygd/beszel/migrations" + + beszelTests "github.com/henrygd/beszel/internal/tests" "github.com/pocketbase/pocketbase/core" pbTests "github.com/pocketbase/pocketbase/tests" diff --git a/beszel/internal/hub/hub_test_helpers.go b/beszel/internal/hub/hub_test_helpers.go index 62263d1f..2171c881 100644 --- a/beszel/internal/hub/hub_test_helpers.go +++ b/beszel/internal/hub/hub_test_helpers.go @@ -3,7 +3,7 @@ package hub -import "beszel/internal/hub/systems" +import "github.com/henrygd/beszel/internal/hub/systems" // TESTING ONLY: GetSystemManager returns the system manager func (h *Hub) GetSystemManager() *systems.SystemManager { diff --git a/beszel/internal/hub/server_development.go b/beszel/internal/hub/server_development.go index fd8cc199..0a39df7a 100644 --- a/beszel/internal/hub/server_development.go +++ b/beszel/internal/hub/server_development.go @@ -3,7 +3,6 @@ package hub import ( - "beszel" "fmt" "io" "log/slog" @@ -12,6 +11,8 @@ import ( "net/url" "strings" + "github.com/henrygd/beszel" + "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/osutils" ) diff --git a/beszel/internal/hub/server_production.go b/beszel/internal/hub/server_production.go index 0161f3fe..00cbf3c0 100644 --- a/beszel/internal/hub/server_production.go +++ b/beszel/internal/hub/server_production.go @@ -3,13 +3,14 @@ package hub import ( - "beszel" - "beszel/site" "io/fs" "net/http" "net/url" "strings" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/site" + "github.com/pocketbase/pocketbase/apis" "github.com/pocketbase/pocketbase/core" ) diff --git a/beszel/internal/hub/systems/system.go b/beszel/internal/hub/systems/system.go index 0ee415cc..03c6a557 100644 --- a/beszel/internal/hub/systems/system.go +++ b/beszel/internal/hub/systems/system.go @@ -1,9 +1,6 @@ package systems import ( - "beszel" - "beszel/internal/entities/system" - "beszel/internal/hub/ws" "context" "encoding/json" "errors" @@ -13,6 +10,12 @@ import ( "strings" "time" + "github.com/henrygd/beszel/internal/hub/ws" + + "github.com/henrygd/beszel/internal/entities/system" + + "github.com/henrygd/beszel" + "github.com/blang/semver" "github.com/fxamacker/cbor/v2" "github.com/pocketbase/pocketbase/core" diff --git a/beszel/internal/hub/systems/system_manager.go b/beszel/internal/hub/systems/system_manager.go index 89b96dc5..4211a030 100644 --- a/beszel/internal/hub/systems/system_manager.go +++ b/beszel/internal/hub/systems/system_manager.go @@ -1,14 +1,18 @@ package systems import ( - "beszel" - "beszel/internal/common" - "beszel/internal/entities/system" - "beszel/internal/hub/ws" "errors" "fmt" "time" + "github.com/henrygd/beszel/internal/hub/ws" + + "github.com/henrygd/beszel/internal/entities/system" + + "github.com/henrygd/beszel/internal/common" + + "github.com/henrygd/beszel" + "github.com/blang/semver" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/store" @@ -30,10 +34,8 @@ const ( sessionTimeout = 4 * time.Second ) -var ( - // errSystemExists is returned when attempting to add a system that already exists - errSystemExists = errors.New("system exists") -) +// errSystemExists is returned when attempting to add a system that already exists +var errSystemExists = errors.New("system exists") // SystemManager manages a collection of monitored systems and their connections. // It handles system lifecycle, status updates, and maintains both SSH and WebSocket connections. diff --git a/beszel/internal/hub/systems/systems_test.go b/beszel/internal/hub/systems/systems_test.go index 04a2c51f..5f362b23 100644 --- a/beszel/internal/hub/systems/systems_test.go +++ b/beszel/internal/hub/systems/systems_test.go @@ -4,16 +4,17 @@ package systems_test import ( - "beszel/internal/entities/container" - "beszel/internal/entities/system" - "beszel/internal/hub/systems" - "beszel/internal/tests" "fmt" "sync" "testing" "testing/synctest" "time" + "github.com/henrygd/beszel/internal/entities/container" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/henrygd/beszel/internal/hub/systems" + "github.com/henrygd/beszel/internal/tests" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/beszel/internal/hub/systems/systems_test_helpers.go b/beszel/internal/hub/systems/systems_test_helpers.go index 55df6fcc..b49d8369 100644 --- a/beszel/internal/hub/systems/systems_test_helpers.go +++ b/beszel/internal/hub/systems/systems_test_helpers.go @@ -4,9 +4,10 @@ package systems import ( - entities "beszel/internal/entities/system" "context" "fmt" + + entities "github.com/henrygd/beszel/internal/entities/system" ) // TESTING ONLY: GetSystemCount returns the number of systems in the store diff --git a/beszel/internal/hub/ws/ws.go b/beszel/internal/hub/ws/ws.go index b960be02..412bee1a 100644 --- a/beszel/internal/hub/ws/ws.go +++ b/beszel/internal/hub/ws/ws.go @@ -1,12 +1,14 @@ package ws import ( - "beszel/internal/common" - "beszel/internal/entities/system" "errors" "time" "weak" + "github.com/henrygd/beszel/internal/entities/system" + + "github.com/henrygd/beszel/internal/common" + "github.com/fxamacker/cbor/v2" "github.com/lxzan/gws" "golang.org/x/crypto/ssh" diff --git a/beszel/internal/hub/ws/ws_test.go b/beszel/internal/hub/ws/ws_test.go index 935ac7c8..c6a74c34 100644 --- a/beszel/internal/hub/ws/ws_test.go +++ b/beszel/internal/hub/ws/ws_test.go @@ -4,11 +4,12 @@ package ws import ( - "beszel/internal/common" "crypto/ed25519" "testing" "time" + "github.com/henrygd/beszel/internal/common" + "github.com/fxamacker/cbor/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/beszel/internal/records/records_test.go b/beszel/internal/records/records_test.go index 24e91fd8..b4056a30 100644 --- a/beszel/internal/records/records_test.go +++ b/beszel/internal/records/records_test.go @@ -4,12 +4,13 @@ package records_test import ( - "beszel/internal/records" - "beszel/internal/tests" "fmt" "testing" "time" + "github.com/henrygd/beszel/internal/records" + "github.com/henrygd/beszel/internal/tests" + "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/types" diff --git a/beszel/internal/tests/hub.go b/beszel/internal/tests/hub.go index 1e0421ef..a4b8c17e 100644 --- a/beszel/internal/tests/hub.go +++ b/beszel/internal/tests/hub.go @@ -5,10 +5,11 @@ package tests import ( - "beszel/internal/hub" "fmt" "testing" + "github.com/henrygd/beszel/internal/hub" + "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tests" "github.com/stretchr/testify/assert"