mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-26 22:39:07 +01:00
[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.
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
+4
-4
@@ -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
|
// All persistence is delegated to agentnetwork.Manager so this layer only
|
||||||
// translates between the wire format (api.AgentNetworkProvider*) and the
|
// translates between the wire format (api.AgentNetworkProvider*) and the
|
||||||
// domain types.
|
// domain types.
|
||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
@@ -26,8 +26,8 @@ type handler struct {
|
|||||||
manager agentnetwork.Manager
|
manager agentnetwork.Manager
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddEndpoints registers all Agent Network routes.
|
// RegisterEndpoints registers all Agent Network routes.
|
||||||
func AddEndpoints(manager agentnetwork.Manager, router *mux.Router) {
|
func RegisterEndpoints(manager agentnetwork.Manager, router *mux.Router) {
|
||||||
h := &handler{manager: manager}
|
h := &handler{manager: manager}
|
||||||
router.HandleFunc("/agent-network/catalog/providers", h.getCatalogProviders).Methods("GET", "OPTIONS")
|
router.HandleFunc("/agent-network/catalog/providers", h.getCatalogProviders).Methods("GET", "OPTIONS")
|
||||||
router.HandleFunc("/agent-network/providers", h.getAllProviders).Methods("GET", "OPTIONS")
|
router.HandleFunc("/agent-network/providers", h.getAllProviders).Methods("GET", "OPTIONS")
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package agentnetwork
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
@@ -23,13 +23,13 @@ import (
|
|||||||
idpmanager "github.com/netbirdio/netbird/management/server/idp"
|
idpmanager "github.com/netbirdio/netbird/management/server/idp"
|
||||||
|
|
||||||
"github.com/netbirdio/netbird/management/internals/controllers/network_map"
|
"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"
|
"github.com/netbirdio/netbird/management/internals/modules/zones"
|
||||||
zonesManager "github.com/netbirdio/netbird/management/internals/modules/zones/manager"
|
zonesManager "github.com/netbirdio/netbird/management/internals/modules/zones/manager"
|
||||||
"github.com/netbirdio/netbird/management/internals/modules/zones/records"
|
"github.com/netbirdio/netbird/management/internals/modules/zones/records"
|
||||||
recordsManager "github.com/netbirdio/netbird/management/internals/modules/zones/records/manager"
|
recordsManager "github.com/netbirdio/netbird/management/internals/modules/zones/records/manager"
|
||||||
"github.com/netbirdio/netbird/management/server/account"
|
"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/settings"
|
||||||
|
|
||||||
"github.com/netbirdio/netbird/management/server/permissions"
|
"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)
|
recordsManager.RegisterEndpoints(router, rManager)
|
||||||
idp.AddEndpoints(accountManager, router)
|
idp.AddEndpoints(accountManager, router)
|
||||||
if agentNetworkManager != nil {
|
if agentNetworkManager != nil {
|
||||||
agentnetworkhandlers.AddEndpoints(agentNetworkManager, router)
|
agentnetworkhandlers.RegisterEndpoints(agentNetworkManager, router)
|
||||||
}
|
}
|
||||||
instance.AddEndpoints(instanceManager, accountManager, router)
|
instance.AddEndpoints(instanceManager, accountManager, router)
|
||||||
instance.AddVersionEndpoint(instanceManager, router)
|
instance.AddVersionEndpoint(instanceManager, router)
|
||||||
|
|||||||
Reference in New Issue
Block a user