From e40cb14945eb81a43c1b7870b4ee91d33ea67d5a Mon Sep 17 00:00:00 2001 From: Fimeg Date: Wed, 29 Oct 2025 11:53:20 -0400 Subject: [PATCH] Fix module paths for GitHub repository structure - Update go.mod files to use github.com/Fimeg/RedFlag module path - Fix all import statements across server and agent code - Resolves build errors when cloning from GitHub - Utils package (version comparison) is actually needed and working --- aggregator-agent/cmd/agent/main.go | 14 +++++++------- aggregator-agent/go.mod | 4 ++-- aggregator-agent/internal/cache/local.go | 2 +- aggregator-agent/internal/display/terminal.go | 2 +- aggregator-agent/internal/scanner/apt.go | 2 +- aggregator-agent/internal/scanner/dnf.go | 2 +- aggregator-agent/internal/scanner/docker.go | 2 +- aggregator-agent/internal/scanner/windows.go | 2 +- aggregator-agent/internal/scanner/windows_wua.go | 4 ++-- aggregator-agent/internal/scanner/winget.go | 2 +- aggregator-server/cmd/server/main.go | 12 ++++++------ aggregator-server/go.mod | 4 ++-- aggregator-server/internal/api/handlers/agents.go | 8 ++++---- aggregator-server/internal/api/handlers/docker.go | 4 ++-- .../internal/api/handlers/rate_limits.go | 2 +- .../internal/api/handlers/registration_tokens.go | 4 ++-- .../internal/api/handlers/settings.go | 2 +- aggregator-server/internal/api/handlers/stats.go | 2 +- aggregator-server/internal/api/handlers/updates.go | 4 ++-- .../internal/database/queries/agents.go | 2 +- .../internal/database/queries/commands.go | 2 +- .../internal/database/queries/updates.go | 2 +- aggregator-server/internal/services/timeout.go | 4 ++-- aggregator-server/internal/services/timezone.go | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/aggregator-agent/cmd/agent/main.go b/aggregator-agent/cmd/agent/main.go index 51d039f..2b8df87 100644 --- a/aggregator-agent/cmd/agent/main.go +++ b/aggregator-agent/cmd/agent/main.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/aggregator-project/aggregator-agent/internal/cache" - "github.com/aggregator-project/aggregator-agent/internal/client" - "github.com/aggregator-project/aggregator-agent/internal/config" - "github.com/aggregator-project/aggregator-agent/internal/display" - "github.com/aggregator-project/aggregator-agent/internal/installer" - "github.com/aggregator-project/aggregator-agent/internal/scanner" - "github.com/aggregator-project/aggregator-agent/internal/system" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/cache" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/config" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/display" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/installer" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/scanner" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/system" "github.com/google/uuid" ) diff --git a/aggregator-agent/go.mod b/aggregator-agent/go.mod index d669714..b61c112 100644 --- a/aggregator-agent/go.mod +++ b/aggregator-agent/go.mod @@ -1,6 +1,6 @@ -module github.com/aggregator-project/aggregator-agent +module github.com/Fimeg/RedFlag/aggregator-agent -go 1.25 +go 1.21 require ( github.com/docker/docker v27.4.1+incompatible diff --git a/aggregator-agent/internal/cache/local.go b/aggregator-agent/internal/cache/local.go index 8fc7373..e4a2ff6 100644 --- a/aggregator-agent/internal/cache/local.go +++ b/aggregator-agent/internal/cache/local.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "github.com/aggregator-project/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" "github.com/google/uuid" ) diff --git a/aggregator-agent/internal/display/terminal.go b/aggregator-agent/internal/display/terminal.go index 9154d55..7e56f1e 100644 --- a/aggregator-agent/internal/display/terminal.go +++ b/aggregator-agent/internal/display/terminal.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/aggregator-project/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" ) // Color codes for terminal output diff --git a/aggregator-agent/internal/scanner/apt.go b/aggregator-agent/internal/scanner/apt.go index c0ee5ae..005e493 100644 --- a/aggregator-agent/internal/scanner/apt.go +++ b/aggregator-agent/internal/scanner/apt.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/aggregator-project/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" ) // APTScanner scans for APT package updates diff --git a/aggregator-agent/internal/scanner/dnf.go b/aggregator-agent/internal/scanner/dnf.go index d6b3c53..b5144ae 100644 --- a/aggregator-agent/internal/scanner/dnf.go +++ b/aggregator-agent/internal/scanner/dnf.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/aggregator-project/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" ) // DNFScanner scans for DNF/RPM package updates diff --git a/aggregator-agent/internal/scanner/docker.go b/aggregator-agent/internal/scanner/docker.go index 151528c..39b32e0 100644 --- a/aggregator-agent/internal/scanner/docker.go +++ b/aggregator-agent/internal/scanner/docker.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/aggregator-project/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" "github.com/docker/docker/api/types/container" dockerclient "github.com/docker/docker/client" ) diff --git a/aggregator-agent/internal/scanner/windows.go b/aggregator-agent/internal/scanner/windows.go index 39f80d5..1704406 100644 --- a/aggregator-agent/internal/scanner/windows.go +++ b/aggregator-agent/internal/scanner/windows.go @@ -3,7 +3,7 @@ package scanner -import "github.com/aggregator-project/aggregator-agent/internal/client" +import "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" // WindowsUpdateScanner stub for non-Windows platforms type WindowsUpdateScanner struct{} diff --git a/aggregator-agent/internal/scanner/windows_wua.go b/aggregator-agent/internal/scanner/windows_wua.go index c14b660..45af35f 100644 --- a/aggregator-agent/internal/scanner/windows_wua.go +++ b/aggregator-agent/internal/scanner/windows_wua.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/aggregator-project/aggregator-agent/internal/client" - "github.com/aggregator-project/aggregator-agent/pkg/windowsupdate" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/pkg/windowsupdate" "github.com/go-ole/go-ole" "github.com/scjalliance/comshim" ) diff --git a/aggregator-agent/internal/scanner/winget.go b/aggregator-agent/internal/scanner/winget.go index a7a06a3..7ed0004 100644 --- a/aggregator-agent/internal/scanner/winget.go +++ b/aggregator-agent/internal/scanner/winget.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/aggregator-project/aggregator-agent/internal/client" + "github.com/Fimeg/RedFlag/aggregator-agent/internal/client" ) // WingetPackage represents a single package from winget output diff --git a/aggregator-server/cmd/server/main.go b/aggregator-server/cmd/server/main.go index b3a9980..d458f95 100644 --- a/aggregator-server/cmd/server/main.go +++ b/aggregator-server/cmd/server/main.go @@ -7,12 +7,12 @@ import ( "path/filepath" "time" - "github.com/aggregator-project/aggregator-server/internal/api/handlers" - "github.com/aggregator-project/aggregator-server/internal/api/middleware" - "github.com/aggregator-project/aggregator-server/internal/config" - "github.com/aggregator-project/aggregator-server/internal/database" - "github.com/aggregator-project/aggregator-server/internal/database/queries" - "github.com/aggregator-project/aggregator-server/internal/services" + "github.com/Fimeg/RedFlag/aggregator-server/internal/api/handlers" + "github.com/Fimeg/RedFlag/aggregator-server/internal/api/middleware" + "github.com/Fimeg/RedFlag/aggregator-server/internal/config" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database/queries" + "github.com/Fimeg/RedFlag/aggregator-server/internal/services" "github.com/gin-gonic/gin" ) diff --git a/aggregator-server/go.mod b/aggregator-server/go.mod index 6a81298..1cc0593 100644 --- a/aggregator-server/go.mod +++ b/aggregator-server/go.mod @@ -1,6 +1,6 @@ -module github.com/aggregator-project/aggregator-server +module github.com/Fimeg/RedFlag/aggregator-server -go 1.25 +go 1.21 require ( github.com/gin-gonic/gin v1.11.0 diff --git a/aggregator-server/internal/api/handlers/agents.go b/aggregator-server/internal/api/handlers/agents.go index 2d6dc28..636c192 100644 --- a/aggregator-server/internal/api/handlers/agents.go +++ b/aggregator-server/internal/api/handlers/agents.go @@ -6,10 +6,10 @@ import ( "net/http" "time" - "github.com/aggregator-project/aggregator-server/internal/api/middleware" - "github.com/aggregator-project/aggregator-server/internal/database/queries" - "github.com/aggregator-project/aggregator-server/internal/models" - "github.com/aggregator-project/aggregator-server/internal/utils" + "github.com/Fimeg/RedFlag/aggregator-server/internal/api/middleware" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database/queries" + "github.com/Fimeg/RedFlag/aggregator-server/internal/models" + "github.com/Fimeg/RedFlag/aggregator-server/internal/utils" "github.com/gin-gonic/gin" "github.com/google/uuid" ) diff --git a/aggregator-server/internal/api/handlers/docker.go b/aggregator-server/internal/api/handlers/docker.go index effbff9..cd8c692 100644 --- a/aggregator-server/internal/api/handlers/docker.go +++ b/aggregator-server/internal/api/handlers/docker.go @@ -4,8 +4,8 @@ import ( "net/http" "strconv" - "github.com/aggregator-project/aggregator-server/internal/database/queries" - "github.com/aggregator-project/aggregator-server/internal/models" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database/queries" + "github.com/Fimeg/RedFlag/aggregator-server/internal/models" "github.com/gin-gonic/gin" "github.com/google/uuid" ) diff --git a/aggregator-server/internal/api/handlers/rate_limits.go b/aggregator-server/internal/api/handlers/rate_limits.go index b1aa920..946ad2f 100644 --- a/aggregator-server/internal/api/handlers/rate_limits.go +++ b/aggregator-server/internal/api/handlers/rate_limits.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/aggregator-project/aggregator-server/internal/api/middleware" + "github.com/Fimeg/RedFlag/aggregator-server/internal/api/middleware" "github.com/gin-gonic/gin" ) diff --git a/aggregator-server/internal/api/handlers/registration_tokens.go b/aggregator-server/internal/api/handlers/registration_tokens.go index 9c48da7..0a1f362 100644 --- a/aggregator-server/internal/api/handlers/registration_tokens.go +++ b/aggregator-server/internal/api/handlers/registration_tokens.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/aggregator-project/aggregator-server/internal/config" - "github.com/aggregator-project/aggregator-server/internal/database/queries" + "github.com/Fimeg/RedFlag/aggregator-server/internal/config" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database/queries" "github.com/gin-gonic/gin" ) diff --git a/aggregator-server/internal/api/handlers/settings.go b/aggregator-server/internal/api/handlers/settings.go index 38b3036..620e4be 100644 --- a/aggregator-server/internal/api/handlers/settings.go +++ b/aggregator-server/internal/api/handlers/settings.go @@ -3,7 +3,7 @@ package handlers import ( "net/http" - "github.com/aggregator-project/aggregator-server/internal/services" + "github.com/Fimeg/RedFlag/aggregator-server/internal/services" "github.com/gin-gonic/gin" ) diff --git a/aggregator-server/internal/api/handlers/stats.go b/aggregator-server/internal/api/handlers/stats.go index e456687..2d35fd6 100644 --- a/aggregator-server/internal/api/handlers/stats.go +++ b/aggregator-server/internal/api/handlers/stats.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/aggregator-project/aggregator-server/internal/database/queries" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database/queries" "github.com/gin-gonic/gin" ) diff --git a/aggregator-server/internal/api/handlers/updates.go b/aggregator-server/internal/api/handlers/updates.go index 2037e71..48d4fcc 100644 --- a/aggregator-server/internal/api/handlers/updates.go +++ b/aggregator-server/internal/api/handlers/updates.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/aggregator-project/aggregator-server/internal/database/queries" - "github.com/aggregator-project/aggregator-server/internal/models" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database/queries" + "github.com/Fimeg/RedFlag/aggregator-server/internal/models" "github.com/gin-gonic/gin" "github.com/google/uuid" ) diff --git a/aggregator-server/internal/database/queries/agents.go b/aggregator-server/internal/database/queries/agents.go index 1626869..7a4fc2b 100644 --- a/aggregator-server/internal/database/queries/agents.go +++ b/aggregator-server/internal/database/queries/agents.go @@ -3,7 +3,7 @@ package queries import ( "time" - "github.com/aggregator-project/aggregator-server/internal/models" + "github.com/Fimeg/RedFlag/aggregator-server/internal/models" "github.com/google/uuid" "github.com/jmoiron/sqlx" ) diff --git a/aggregator-server/internal/database/queries/commands.go b/aggregator-server/internal/database/queries/commands.go index a8d1dcc..e65818f 100644 --- a/aggregator-server/internal/database/queries/commands.go +++ b/aggregator-server/internal/database/queries/commands.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/aggregator-project/aggregator-server/internal/models" + "github.com/Fimeg/RedFlag/aggregator-server/internal/models" "github.com/google/uuid" "github.com/jmoiron/sqlx" ) diff --git a/aggregator-server/internal/database/queries/updates.go b/aggregator-server/internal/database/queries/updates.go index a2955ba..ff6128f 100644 --- a/aggregator-server/internal/database/queries/updates.go +++ b/aggregator-server/internal/database/queries/updates.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/aggregator-project/aggregator-server/internal/models" + "github.com/Fimeg/RedFlag/aggregator-server/internal/models" "github.com/google/uuid" "github.com/jmoiron/sqlx" ) diff --git a/aggregator-server/internal/services/timeout.go b/aggregator-server/internal/services/timeout.go index a28727f..6da33e8 100644 --- a/aggregator-server/internal/services/timeout.go +++ b/aggregator-server/internal/services/timeout.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/aggregator-project/aggregator-server/internal/database/queries" - "github.com/aggregator-project/aggregator-server/internal/models" + "github.com/Fimeg/RedFlag/aggregator-server/internal/database/queries" + "github.com/Fimeg/RedFlag/aggregator-server/internal/models" "github.com/google/uuid" ) diff --git a/aggregator-server/internal/services/timezone.go b/aggregator-server/internal/services/timezone.go index 449520f..7860c41 100644 --- a/aggregator-server/internal/services/timezone.go +++ b/aggregator-server/internal/services/timezone.go @@ -3,7 +3,7 @@ package services import ( "time" - "github.com/aggregator-project/aggregator-server/internal/config" + "github.com/Fimeg/RedFlag/aggregator-server/internal/config" ) type TimezoneService struct {