fix merge

netbirdio · Dec 11, 2024 · cbb3ffa · cbb3ffa
1 parent f3ad7e6
commit cbb3ffa
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 79 deletions.
diff --git a/management/server/account.go b/management/server/account.go
@@ -19,9 +19,6 @@ import (
 
 	"github.com/eko/gocache/v3/cache"
 	cacheStore "github.com/eko/gocache/v3/store"
-	"github.com/hashicorp/go-multierror"
-	"github.com/miekg/dns"
-	"github.com/netbirdio/netbird/management/server/networks"
 	gocache "github.com/patrickmn/go-cache"
 	"github.com/rs/xid"
 	log "github.com/sirupsen/logrus"

diff --git a/management/server/account_test.go b/management/server/account_test.go
@@ -16,7 +16,11 @@ import (
 	"time"
 
 	"github.com/golang-jwt/jwt"
-	"github.com/netbirdio/netbird/management/server/networks"
+
+	resourceTypes "github.com/netbirdio/netbird/management/server/networks/resources/types"
+	routerTypes "github.com/netbirdio/netbird/management/server/networks/routers/types"
+	networkTypes "github.com/netbirdio/netbird/management/server/networks/types"
+
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -1790,12 +1794,12 @@ func TestAccount_Copy(t *testing.T) {
 			},
 		},
 		Settings: &types.Settings{},
-		Networks: []*networks.Network{
+		Networks: []*networkTypes.Network{
 			{
 				ID: "network1",
 			},
 		},
-		NetworkRouters: []*networks.NetworkRouter{
+		NetworkRouters: []*routerTypes.NetworkRouter{
 			{
 				ID:         "router1",
 				NetworkID:  "network1",
@@ -1804,7 +1808,7 @@ func TestAccount_Copy(t *testing.T) {
 				Metric:     0,
 			},
 		},
-		NetworkResources: []*networks.NetworkResource{
+		NetworkResources: []*resourceTypes.NetworkResource{
 			{
 				ID:        "resource1",
 				NetworkID: "network1",

diff --git a/management/server/http/handlers/networks/handler.go b/management/server/http/handlers/networks/handler.go
@@ -12,6 +12,7 @@ import (
 	"github.com/netbirdio/netbird/management/server/http/util"
 	"github.com/netbirdio/netbird/management/server/jwtclaims"
 	"github.com/netbirdio/netbird/management/server/networks"
+	"github.com/netbirdio/netbird/management/server/networks/types"
 	"github.com/netbirdio/netbird/management/server/status"
 )
 
@@ -81,7 +82,7 @@ func (h *handler) createNetwork(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	network := &networks.Network{}
+	network := &types.Network{}
 	network.FromAPIRequest(&req)
 
 	network.AccountID = accountID
@@ -140,7 +141,7 @@ func (h *handler) updateNetwork(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	network := &networks.Network{}
+	network := &types.Network{}
 	network.FromAPIRequest(&req)
 
 	network.ID = networkID

diff --git a/management/server/http/handlers/networks/resources_handler.go b/management/server/http/handlers/networks/resources_handler.go
@@ -12,6 +12,7 @@ import (
 	"github.com/netbirdio/netbird/management/server/http/util"
 	"github.com/netbirdio/netbird/management/server/jwtclaims"
 	"github.com/netbirdio/netbird/management/server/networks/resources"
+	"github.com/netbirdio/netbird/management/server/networks/resources/types"
 )
 
 type resourceHandler struct {
@@ -78,7 +79,7 @@ func (h *resourceHandler) createResource(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	resource := &resources.NetworkResource{}
+	resource := &types.NetworkResource{}
 	resource.FromAPIRequest(&req)
 
 	resource.NetworkID = mux.Vars(r)["networkId"]
@@ -126,7 +127,7 @@ func (h *resourceHandler) updateResource(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	resource := &resources.NetworkResource{}
+	resource := &types.NetworkResource{}
 	resource.FromAPIRequest(&req)
 
 	resource.ID = mux.Vars(r)["resourceId"]

diff --git a/management/server/http/handlers/networks/routers_handler.go b/management/server/http/handlers/networks/routers_handler.go
@@ -12,6 +12,7 @@ import (
 	"github.com/netbirdio/netbird/management/server/http/util"
 	"github.com/netbirdio/netbird/management/server/jwtclaims"
 	"github.com/netbirdio/netbird/management/server/networks/routers"
+	"github.com/netbirdio/netbird/management/server/networks/routers/types"
 )
 
 type routersHandler struct {
@@ -79,7 +80,7 @@ func (h *routersHandler) createRouter(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	router := &routers.NetworkRouter{}
+	router := &types.NetworkRouter{}
 	router.FromAPIRequest(&req)
 
 	router.NetworkID = networkID
@@ -128,7 +129,7 @@ func (h *routersHandler) updateRouter(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	router := &routers.NetworkRouter{}
+	router := &types.NetworkRouter{}
 	router.FromAPIRequest(&req)
 
 	router.NetworkID = mux.Vars(r)["networkId"]

diff --git a/management/server/networks/manager.go b/management/server/networks/manager.go
@@ -6,14 +6,15 @@ import (
 
 	"github.com/netbirdio/netbird/management/server/networks/resources"
 	"github.com/netbirdio/netbird/management/server/networks/routers"
+	"github.com/netbirdio/netbird/management/server/networks/types"
 	"github.com/netbirdio/netbird/management/server/store"
 )
 
 type Manager interface {
-	GetAllNetworks(ctx context.Context, accountID, userID string) ([]*Network, error)
-	CreateNetwork(ctx context.Context, userID string, network *Network) (*Network, error)
-	GetNetwork(ctx context.Context, accountID, userID, networkID string) (*Network, error)
-	UpdateNetwork(ctx context.Context, userID string, network *Network) (*Network, error)
+	GetAllNetworks(ctx context.Context, accountID, userID string) ([]*types.Network, error)
+	CreateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error)
+	GetNetwork(ctx context.Context, accountID, userID, networkID string) (*types.Network, error)
+	UpdateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error)
 	DeleteNetwork(ctx context.Context, accountID, userID, networkID string) error
 	GetResourceManager() resources.Manager
 	GetRouterManager() routers.Manager
@@ -33,19 +34,19 @@ func NewManager(store store.Store) Manager {
 	}
 }
 
-func (m *managerImpl) GetAllNetworks(ctx context.Context, accountID, userID string) ([]*Network, error) {
+func (m *managerImpl) GetAllNetworks(ctx context.Context, accountID, userID string) ([]*types.Network, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) CreateNetwork(ctx context.Context, userID string, network *Network) (*Network, error) {
+func (m *managerImpl) CreateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) GetNetwork(ctx context.Context, accountID, userID, networkID string) (*Network, error) {
+func (m *managerImpl) GetNetwork(ctx context.Context, accountID, userID, networkID string) (*types.Network, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) UpdateNetwork(ctx context.Context, userID string, network *Network) (*Network, error) {
+func (m *managerImpl) UpdateNetwork(ctx context.Context, userID string, network *types.Network) (*types.Network, error) {
 	return nil, errors.New("not implemented")
 }
 

diff --git a/management/server/networks/resources/manager.go b/management/server/networks/resources/manager.go
@@ -4,14 +4,15 @@ import (
 	"context"
 	"errors"
 
+	"github.com/netbirdio/netbird/management/server/networks/resources/types"
 	"github.com/netbirdio/netbird/management/server/store"
 )
 
 type Manager interface {
-	GetAllResources(ctx context.Context, accountID, userID, networkID string) ([]*NetworkResource, error)
-	CreateResource(ctx context.Context, accountID string, resource *NetworkResource) (*NetworkResource, error)
-	GetResource(ctx context.Context, accountID, userID, networkID, resourceID string) (*NetworkResource, error)
-	UpdateResource(ctx context.Context, userID string, resource *NetworkResource) (*NetworkResource, error)
+	GetAllResources(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkResource, error)
+	CreateResource(ctx context.Context, accountID string, resource *types.NetworkResource) (*types.NetworkResource, error)
+	GetResource(ctx context.Context, accountID, userID, networkID, resourceID string) (*types.NetworkResource, error)
+	UpdateResource(ctx context.Context, userID string, resource *types.NetworkResource) (*types.NetworkResource, error)
 	DeleteResource(ctx context.Context, accountID, userID, networkID, resourceID string) error
 }
 
@@ -25,19 +26,19 @@ func NewManager(store store.Store) Manager {
 	}
 }
 
-func (m *managerImpl) GetAllResources(ctx context.Context, accountID, userID, networkID string) ([]*NetworkResource, error) {
+func (m *managerImpl) GetAllResources(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkResource, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) CreateResource(ctx context.Context, accountID string, resource *NetworkResource) (*NetworkResource, error) {
+func (m *managerImpl) CreateResource(ctx context.Context, accountID string, resource *types.NetworkResource) (*types.NetworkResource, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) GetResource(ctx context.Context, accountID, userID, networkID, resourceID string) (*NetworkResource, error) {
+func (m *managerImpl) GetResource(ctx context.Context, accountID, userID, networkID, resourceID string) (*types.NetworkResource, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) UpdateResource(ctx context.Context, userID string, resource *NetworkResource) (*NetworkResource, error) {
+func (m *managerImpl) UpdateResource(ctx context.Context, userID string, resource *types.NetworkResource) (*types.NetworkResource, error) {
 	return nil, errors.New("not implemented")
 }
 

diff --git a/...ent/server/networks/resources/resource.go → ...rver/networks/resources/types/resource.go b/...ent/server/networks/resources/resource.go → ...rver/networks/resources/types/resource.go
@@ -1,4 +1,4 @@
-package resources
+package types
 
 import (
 	"errors"

diff --git a/...erver/networks/resources/resource_test.go → ...networks/resources/types/resource_test.go b/...erver/networks/resources/resource_test.go → ...networks/resources/types/resource_test.go
@@ -1,4 +1,4 @@
-package resources
+package types
 
 import (
 	"testing"

diff --git a/management/server/networks/routers/manager.go b/management/server/networks/routers/manager.go
@@ -4,14 +4,15 @@ import (
 	"context"
 	"errors"
 
+	"github.com/netbirdio/netbird/management/server/networks/routers/types"
 	"github.com/netbirdio/netbird/management/server/store"
 )
 
 type Manager interface {
-	GetAllRouters(ctx context.Context, accountID, userID, networkID string) ([]*NetworkRouter, error)
-	CreateRouter(ctx context.Context, userID string, router *NetworkRouter) (*NetworkRouter, error)
-	GetRouter(ctx context.Context, accountID, userID, networkID, routerID string) (*NetworkRouter, error)
-	UpdateRouter(ctx context.Context, userID string, router *NetworkRouter) (*NetworkRouter, error)
+	GetAllRouters(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkRouter, error)
+	CreateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error)
+	GetRouter(ctx context.Context, accountID, userID, networkID, routerID string) (*types.NetworkRouter, error)
+	UpdateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error)
 	DeleteRouter(ctx context.Context, accountID, userID, networkID, routerID string) error
 }
 
@@ -25,19 +26,19 @@ func NewManager(store store.Store) Manager {
 	}
 }
 
-func (m *managerImpl) GetAllRouters(ctx context.Context, accountID, userID, networkID string) ([]*NetworkRouter, error) {
+func (m *managerImpl) GetAllRouters(ctx context.Context, accountID, userID, networkID string) ([]*types.NetworkRouter, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) CreateRouter(ctx context.Context, userID string, router *NetworkRouter) (*NetworkRouter, error) {
+func (m *managerImpl) CreateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) GetRouter(ctx context.Context, accountID, userID, networkID, routerID string) (*NetworkRouter, error) {
+func (m *managerImpl) GetRouter(ctx context.Context, accountID, userID, networkID, routerID string) (*types.NetworkRouter, error) {
 	return nil, errors.New("not implemented")
 }
 
-func (m *managerImpl) UpdateRouter(ctx context.Context, userID string, router *NetworkRouter) (*NetworkRouter, error) {
+func (m *managerImpl) UpdateRouter(ctx context.Context, userID string, router *types.NetworkRouter) (*types.NetworkRouter, error) {
 	return nil, errors.New("not implemented")
 }
 

diff --git a/management/server/networks/routers/router.go → ...t/server/networks/routers/types/router.go b/management/server/networks/routers/router.go → ...t/server/networks/routers/types/router.go
@@ -1,4 +1,4 @@
-package routers
+package types
 
 import (
 	"errors"

diff --git a/...nt/server/networks/routers/router_test.go → ...ver/networks/routers/types/router_test.go b/...nt/server/networks/routers/router_test.go → ...ver/networks/routers/types/router_test.go
@@ -1,4 +1,4 @@
-package routers
+package types
 
 import "testing"
 

diff --git a/management/server/networks/network.go → management/server/networks/types/network.go b/management/server/networks/network.go → management/server/networks/types/network.go
@@ -1,4 +1,4 @@
-package networks
+package types
 
 import (
 	"github.com/rs/xid"