From 668af0dc4fe58d6a24e84dd69a77941c6eb795ff Mon Sep 17 00:00:00 2001 From: mlsmaycon Date: Sat, 27 Jun 2026 02:58:21 +0200 Subject: [PATCH] [agent-network] Co-locate HTTP handlers in the module (RegisterEndpoints) Move the agent-network HTTP handlers from server/http/handlers/agentnetwork into the module at internals/modules/agentnetwork/handlers (package handlers) and rename the entrypoint AddEndpoints -> RegisterEndpoints, matching the reverse-proxy module convention. Wiring in http/handler.go updated accordingly. --- .../modules/agentnetwork/handlers}/access_log_handler.go | 2 +- .../modules/agentnetwork/handlers}/budget_handler.go | 2 +- .../modules/agentnetwork/handlers}/budget_handler_test.go | 2 +- .../modules/agentnetwork/handlers}/consumption_handler.go | 2 +- .../modules/agentnetwork/handlers}/guardrails_handler.go | 2 +- .../modules/agentnetwork/handlers}/handlers_test.go | 2 +- .../modules/agentnetwork/handlers}/policies_handler.go | 2 +- .../modules/agentnetwork/handlers}/providers_handler.go | 8 ++++---- .../modules/agentnetwork/handlers}/settings_handler.go | 2 +- management/server/http/handler.go | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/access_log_handler.go (99%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/budget_handler.go (99%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/budget_handler_test.go (99%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/consumption_handler.go (98%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/guardrails_handler.go (99%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/handlers_test.go (99%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/policies_handler.go (99%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/providers_handler.go (97%) rename management/{server/http/handlers/agentnetwork => internals/modules/agentnetwork/handlers}/settings_handler.go (99%) diff --git a/management/server/http/handlers/agentnetwork/access_log_handler.go b/management/internals/modules/agentnetwork/handlers/access_log_handler.go similarity index 99% rename from management/server/http/handlers/agentnetwork/access_log_handler.go rename to management/internals/modules/agentnetwork/handlers/access_log_handler.go index e0b4e9e0b..cf33d6435 100644 --- a/management/server/http/handlers/agentnetwork/access_log_handler.go +++ b/management/internals/modules/agentnetwork/handlers/access_log_handler.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "net/http" diff --git a/management/server/http/handlers/agentnetwork/budget_handler.go b/management/internals/modules/agentnetwork/handlers/budget_handler.go similarity index 99% rename from management/server/http/handlers/agentnetwork/budget_handler.go rename to management/internals/modules/agentnetwork/handlers/budget_handler.go index 9fb02d07c..5630de17f 100644 --- a/management/server/http/handlers/agentnetwork/budget_handler.go +++ b/management/internals/modules/agentnetwork/handlers/budget_handler.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "encoding/json" diff --git a/management/server/http/handlers/agentnetwork/budget_handler_test.go b/management/internals/modules/agentnetwork/handlers/budget_handler_test.go similarity index 99% rename from management/server/http/handlers/agentnetwork/budget_handler_test.go rename to management/internals/modules/agentnetwork/handlers/budget_handler_test.go index ff9974b3e..4038761c5 100644 --- a/management/server/http/handlers/agentnetwork/budget_handler_test.go +++ b/management/internals/modules/agentnetwork/handlers/budget_handler_test.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "context" diff --git a/management/server/http/handlers/agentnetwork/consumption_handler.go b/management/internals/modules/agentnetwork/handlers/consumption_handler.go similarity index 98% rename from management/server/http/handlers/agentnetwork/consumption_handler.go rename to management/internals/modules/agentnetwork/handlers/consumption_handler.go index 135d27e62..654f23109 100644 --- a/management/server/http/handlers/agentnetwork/consumption_handler.go +++ b/management/internals/modules/agentnetwork/handlers/consumption_handler.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "net/http" diff --git a/management/server/http/handlers/agentnetwork/guardrails_handler.go b/management/internals/modules/agentnetwork/handlers/guardrails_handler.go similarity index 99% rename from management/server/http/handlers/agentnetwork/guardrails_handler.go rename to management/internals/modules/agentnetwork/handlers/guardrails_handler.go index 5e0b01bc7..81f19b9f1 100644 --- a/management/server/http/handlers/agentnetwork/guardrails_handler.go +++ b/management/internals/modules/agentnetwork/handlers/guardrails_handler.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "encoding/json" diff --git a/management/server/http/handlers/agentnetwork/handlers_test.go b/management/internals/modules/agentnetwork/handlers/handlers_test.go similarity index 99% rename from management/server/http/handlers/agentnetwork/handlers_test.go rename to management/internals/modules/agentnetwork/handlers/handlers_test.go index 6f847dafd..27ebea5dd 100644 --- a/management/server/http/handlers/agentnetwork/handlers_test.go +++ b/management/internals/modules/agentnetwork/handlers/handlers_test.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "context" diff --git a/management/server/http/handlers/agentnetwork/policies_handler.go b/management/internals/modules/agentnetwork/handlers/policies_handler.go similarity index 99% rename from management/server/http/handlers/agentnetwork/policies_handler.go rename to management/internals/modules/agentnetwork/handlers/policies_handler.go index fce852e42..b821a5295 100644 --- a/management/server/http/handlers/agentnetwork/policies_handler.go +++ b/management/internals/modules/agentnetwork/handlers/policies_handler.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "encoding/json" diff --git a/management/server/http/handlers/agentnetwork/providers_handler.go b/management/internals/modules/agentnetwork/handlers/providers_handler.go similarity index 97% rename from management/server/http/handlers/agentnetwork/providers_handler.go rename to management/internals/modules/agentnetwork/handlers/providers_handler.go index e550400d5..13da137d5 100644 --- a/management/server/http/handlers/agentnetwork/providers_handler.go +++ b/management/internals/modules/agentnetwork/handlers/providers_handler.go @@ -1,9 +1,9 @@ -// Package agentnetwork serves the Agent Network HTTP API. +// Package handlers serves the Agent Network HTTP API. // // All persistence is delegated to agentnetwork.Manager so this layer only // translates between the wire format (api.AgentNetworkProvider*) and the // domain types. -package agentnetwork +package handlers import ( "encoding/json" @@ -26,8 +26,8 @@ type handler struct { manager agentnetwork.Manager } -// AddEndpoints registers all Agent Network routes. -func AddEndpoints(manager agentnetwork.Manager, router *mux.Router) { +// RegisterEndpoints registers all Agent Network routes. +func RegisterEndpoints(manager agentnetwork.Manager, router *mux.Router) { h := &handler{manager: manager} router.HandleFunc("/agent-network/catalog/providers", h.getCatalogProviders).Methods("GET", "OPTIONS") router.HandleFunc("/agent-network/providers", h.getAllProviders).Methods("GET", "OPTIONS") diff --git a/management/server/http/handlers/agentnetwork/settings_handler.go b/management/internals/modules/agentnetwork/handlers/settings_handler.go similarity index 99% rename from management/server/http/handlers/agentnetwork/settings_handler.go rename to management/internals/modules/agentnetwork/handlers/settings_handler.go index 407ca48cb..c65efad0f 100644 --- a/management/server/http/handlers/agentnetwork/settings_handler.go +++ b/management/internals/modules/agentnetwork/handlers/settings_handler.go @@ -1,4 +1,4 @@ -package agentnetwork +package handlers import ( "encoding/json" diff --git a/management/server/http/handler.go b/management/server/http/handler.go index af49be29d..a57f44b3c 100644 --- a/management/server/http/handler.go +++ b/management/server/http/handler.go @@ -23,13 +23,13 @@ import ( idpmanager "github.com/netbirdio/netbird/management/server/idp" "github.com/netbirdio/netbird/management/internals/controllers/network_map" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + agentnetworkhandlers "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/handlers" "github.com/netbirdio/netbird/management/internals/modules/zones" zonesManager "github.com/netbirdio/netbird/management/internals/modules/zones/manager" "github.com/netbirdio/netbird/management/internals/modules/zones/records" recordsManager "github.com/netbirdio/netbird/management/internals/modules/zones/records/manager" "github.com/netbirdio/netbird/management/server/account" - "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" - agentnetworkhandlers "github.com/netbirdio/netbird/management/server/http/handlers/agentnetwork" "github.com/netbirdio/netbird/management/server/settings" "github.com/netbirdio/netbird/management/server/permissions" @@ -127,7 +127,7 @@ func NewAPIHandler(ctx context.Context, router *mux.Router, accountManager accou recordsManager.RegisterEndpoints(router, rManager) idp.AddEndpoints(accountManager, router) if agentNetworkManager != nil { - agentnetworkhandlers.AddEndpoints(agentNetworkManager, router) + agentnetworkhandlers.RegisterEndpoints(agentNetworkManager, router) } instance.AddEndpoints(instanceManager, accountManager, router) instance.AddVersionEndpoint(instanceManager, router)