diff --git a/cmd/management.go b/cmd/management.go index 52e4849..a2941e2 100644 --- a/cmd/management.go +++ b/cmd/management.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "management/internal/server" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/internals/server" + "github.com/netbirdio/management-refactor/pkg/logging" ) var log = logging.LoggerForThisPackage() diff --git a/internals/controllers/network_map/controller.go b/internals/controllers/network_map/controller.go index 58649e7..e8a7c6d 100644 --- a/internals/controllers/network_map/controller.go +++ b/internals/controllers/network_map/controller.go @@ -5,8 +5,8 @@ import ( log "github.com/sirupsen/logrus" - "management/internal/shared/db" - appmetrics "management/internal/shared/metrics" + "github.com/netbirdio/management-refactor/internals/shared/db" + appmetrics "github.com/netbirdio/management-refactor/internals/shared/metrics" ) type Controller struct { diff --git a/internals/controllers/network_map/repository.go b/internals/controllers/network_map/repository.go index 0ecbaac..eec9852 100644 --- a/internals/controllers/network_map/repository.go +++ b/internals/controllers/network_map/repository.go @@ -5,13 +5,13 @@ import ( nbpeer "github.com/netbirdio/netbird/management/server/peer" - "management/internal/modules/accounts" - "management/internal/modules/groups" - "management/internal/modules/networks" - "management/internal/modules/networks/resources" - "management/internal/modules/networks/routers" - "management/internal/modules/policies" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/accounts" + "github.com/netbirdio/management-refactor/internals/modules/groups" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/modules/networks/resources" + "github.com/netbirdio/management-refactor/internals/modules/networks/routers" + "github.com/netbirdio/management-refactor/internals/modules/policies" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type NetworkMapData struct { diff --git a/internals/modules/accounts/manager/api.go b/internals/modules/accounts/manager/api.go index c8e1dd3..0f46771 100644 --- a/internals/modules/accounts/manager/api.go +++ b/internals/modules/accounts/manager/api.go @@ -8,11 +8,11 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/http/util" - "management/internal/shared/db" - "management/internal/shared/errors" - "management/internal/shared/permissions" - "management/internal/shared/permissions/modules" - "management/internal/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/errors" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/internals/shared/permissions/modules" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" ) type handler struct { diff --git a/internals/modules/accounts/manager/manager.go b/internals/modules/accounts/manager/manager.go index c07f9df..ce60f44 100644 --- a/internals/modules/accounts/manager/manager.go +++ b/internals/modules/accounts/manager/manager.go @@ -1,6 +1,6 @@ package manager -import "management/pkg/logging" +import "github.com/netbirdio/management-refactor/pkg/logging" var log = logging.LoggerForThisPackage() diff --git a/internals/modules/accounts/manager/repository.go b/internals/modules/accounts/manager/repository.go index 4f401a3..bfa42ac 100644 --- a/internals/modules/accounts/manager/repository.go +++ b/internals/modules/accounts/manager/repository.go @@ -1,6 +1,6 @@ package manager -import "management/internal/shared/db" +import "github.com/netbirdio/management-refactor/internals/shared/db" type Repository interface { RunInTx(fn func(tx db.Transaction) error) error diff --git a/internals/modules/accounts/settings/manager/api.go b/internals/modules/accounts/settings/manager/api.go index 3c0050e..4c2146c 100644 --- a/internals/modules/accounts/settings/manager/api.go +++ b/internals/modules/accounts/settings/manager/api.go @@ -8,11 +8,11 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/http/util" - "management/internal/shared/db" - "management/internal/shared/errors" - "management/internal/shared/permissions" - "management/internal/shared/permissions/modules" - "management/internal/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/errors" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/internals/shared/permissions/modules" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" ) type handler struct { diff --git a/internals/modules/accounts/settings/manager/manager.go b/internals/modules/accounts/settings/manager/manager.go index 1527c3b..4374055 100644 --- a/internals/modules/accounts/settings/manager/manager.go +++ b/internals/modules/accounts/settings/manager/manager.go @@ -8,12 +8,12 @@ import ( "github.com/netbirdio/netbird/management/server/integrations/extra_settings" types2 "github.com/netbirdio/netbird/management/server/types" - "management/internal/modules/accounts/settings/types" - "management/internal/modules/users" - "management/internal/shared/activity" - "management/internal/shared/db" - "management/internal/shared/permissions" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/internals/modules/accounts/settings/types" + "github.com/netbirdio/management-refactor/internals/modules/users" + "github.com/netbirdio/management-refactor/internals/shared/activity" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/pkg/logging" ) var log = logging.LoggerForThisPackage() diff --git a/internals/modules/accounts/settings/manager/repository.go b/internals/modules/accounts/settings/manager/repository.go index 8320f9b..c859280 100644 --- a/internals/modules/accounts/settings/manager/repository.go +++ b/internals/modules/accounts/settings/manager/repository.go @@ -1,8 +1,8 @@ package manager import ( - "management/internal/modules/accounts/settings/types" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/accounts/settings/types" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Repository interface { diff --git a/internals/modules/groups/manager/api.go b/internals/modules/groups/manager/api.go index 7b46e7c..3d2f3e7 100644 --- a/internals/modules/groups/manager/api.go +++ b/internals/modules/groups/manager/api.go @@ -8,11 +8,11 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/http/util" - "management/internal/shared/db" - "management/internal/shared/errors" - "management/internal/shared/permissions" - "management/internal/shared/permissions/modules" - "management/internal/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/errors" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/internals/shared/permissions/modules" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" ) type handler struct { diff --git a/internals/modules/groups/manager/manager.go b/internals/modules/groups/manager/manager.go index 0ed2f58..094dd39 100644 --- a/internals/modules/groups/manager/manager.go +++ b/internals/modules/groups/manager/manager.go @@ -9,8 +9,8 @@ import ( "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" - "management/internal/shared/db" - "management/internal/shared/permissions" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/permissions" ) type Manager struct { diff --git a/internals/modules/groups/manager/repository.go b/internals/modules/groups/manager/repository.go index f8e342f..25c139d 100644 --- a/internals/modules/groups/manager/repository.go +++ b/internals/modules/groups/manager/repository.go @@ -1,7 +1,7 @@ package manager import ( - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Repository interface { diff --git a/internals/modules/networks/interface.go b/internals/modules/networks/interface.go index 17c47c8..e9f5485 100644 --- a/internals/modules/networks/interface.go +++ b/internals/modules/networks/interface.go @@ -3,8 +3,8 @@ package networks import ( "context" - "management/internal/shared/db" - "management/internal/shared/hook" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/hook" ) type Manager interface { diff --git a/internals/modules/networks/manager/api.go b/internals/modules/networks/manager/api.go index f4bceac..62310d8 100644 --- a/internals/modules/networks/manager/api.go +++ b/internals/modules/networks/manager/api.go @@ -7,11 +7,11 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/http/util" - "management/internal/modules/networks" - "management/internal/shared/errors" - "management/internal/shared/permissions" - "management/internal/shared/permissions/modules" - "management/internal/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/shared/errors" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/internals/shared/permissions/modules" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" ) type handler struct { diff --git a/internals/modules/networks/manager/events.go b/internals/modules/networks/manager/events.go index a512f67..fad0ac9 100644 --- a/internals/modules/networks/manager/events.go +++ b/internals/modules/networks/manager/events.go @@ -1,8 +1,8 @@ package manager import ( - "management/internal/modules/networks" - "management/internal/shared/hook" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/shared/hook" ) func (m *managerImpl) OnNetworkDelete() *hook.Hook[*networks.NetworkEvent] { diff --git a/internals/modules/networks/manager/manager.go b/internals/modules/networks/manager/manager.go index 3554c98..13308da 100644 --- a/internals/modules/networks/manager/manager.go +++ b/internals/modules/networks/manager/manager.go @@ -7,10 +7,10 @@ import ( "github.com/gorilla/mux" "github.com/rs/xid" - "management/internal/modules/networks" - "management/internal/shared/db" - "management/internal/shared/hook" - "management/internal/shared/permissions" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/hook" + "github.com/netbirdio/management-refactor/internals/shared/permissions" ) type managerImpl struct { diff --git a/internals/modules/networks/manager/repository.go b/internals/modules/networks/manager/repository.go index 8e3e775..d6c0e3e 100644 --- a/internals/modules/networks/manager/repository.go +++ b/internals/modules/networks/manager/repository.go @@ -1,8 +1,8 @@ package manager import ( - "management/internal/modules/networks" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Repository interface { diff --git a/internals/modules/networks/networkevent.go b/internals/modules/networks/networkevent.go index 55b31ae..aa465e6 100644 --- a/internals/modules/networks/networkevent.go +++ b/internals/modules/networks/networkevent.go @@ -2,8 +2,8 @@ package networks import ( "context" - "management/internal/shared/db" - "management/internal/shared/hook" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/hook" ) type NetworkEvent struct { diff --git a/internals/modules/networks/resources/manager.go b/internals/modules/networks/resources/manager.go index 146b5e2..8bf489e 100644 --- a/internals/modules/networks/resources/manager.go +++ b/internals/modules/networks/resources/manager.go @@ -3,8 +3,8 @@ package resources import ( "context" - "management/internal/modules/networks" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Manager interface { diff --git a/internals/modules/networks/resources/manager/manager.go b/internals/modules/networks/resources/manager/manager.go index f1e1a97..777487b 100644 --- a/internals/modules/networks/resources/manager/manager.go +++ b/internals/modules/networks/resources/manager/manager.go @@ -6,9 +6,9 @@ import ( "github.com/gorilla/mux" - "management/internal/modules/networks" - "management/internal/modules/networks/resources" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/modules/networks/resources" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type managerImpl struct { diff --git a/internals/modules/networks/resources/manager/repository.go b/internals/modules/networks/resources/manager/repository.go index 68ada59..62b180c 100644 --- a/internals/modules/networks/resources/manager/repository.go +++ b/internals/modules/networks/resources/manager/repository.go @@ -1,8 +1,8 @@ package manager import ( - "management/internal/modules/networks/resources" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/networks/resources" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Repository interface { diff --git a/internals/modules/networks/resources/types.go b/internals/modules/networks/resources/types.go index 2aaa378..283b784 100644 --- a/internals/modules/networks/resources/types.go +++ b/internals/modules/networks/resources/types.go @@ -11,8 +11,8 @@ import ( "github.com/netbirdio/netbird/route" "github.com/rs/xid" - "management/internal/modules/networks" - "management/internal/modules/networks/routers" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/modules/networks/routers" ) type NetworkResourceType string diff --git a/internals/modules/networks/routers/interface.go b/internals/modules/networks/routers/interface.go index c8edf76..6169263 100644 --- a/internals/modules/networks/routers/interface.go +++ b/internals/modules/networks/routers/interface.go @@ -3,7 +3,7 @@ package routers import ( "context" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Manager interface { diff --git a/internals/modules/networks/routers/types.go b/internals/modules/networks/routers/types.go index da73742..d0bc721 100644 --- a/internals/modules/networks/routers/types.go +++ b/internals/modules/networks/routers/types.go @@ -6,7 +6,7 @@ import ( "github.com/netbirdio/netbird/management/server/http/api" "github.com/rs/xid" - "management/internal/modules/networks" + "github.com/netbirdio/management-refactor/internals/modules/networks" ) type NetworkRouter struct { diff --git a/internals/modules/peers/api.go b/internals/modules/peers/api.go index 9d054a5..85e6ae8 100644 --- a/internals/modules/peers/api.go +++ b/internals/modules/peers/api.go @@ -10,8 +10,8 @@ import ( "github.com/netbirdio/netbird/management/server/http/api" "github.com/netbirdio/netbird/management/server/http/util" - "management/internal/shared/db" - "management/internal/shared/permissions" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/permissions" ) type handler struct { diff --git a/internals/modules/peers/manager.go b/internals/modules/peers/manager.go index 6179904..caae619 100644 --- a/internals/modules/peers/manager.go +++ b/internals/modules/peers/manager.go @@ -5,11 +5,11 @@ import ( "github.com/gorilla/mux" - "management/internal/modules/peers/types" - "management/internal/shared/activity" - "management/internal/shared/db" - "management/internal/shared/permissions" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/internals/modules/peers/types" + "github.com/netbirdio/management-refactor/internals/shared/activity" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/pkg/logging" ) var log = logging.LoggerForThisPackage() diff --git a/internals/modules/peers/repository.go b/internals/modules/peers/repository.go index d333da3..cf68463 100644 --- a/internals/modules/peers/repository.go +++ b/internals/modules/peers/repository.go @@ -1,8 +1,8 @@ package peers import ( - "management/internal/modules/peers/types" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/peers/types" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Repository interface { diff --git a/internals/modules/policies/policyrule.go b/internals/modules/policies/policyrule.go index c3193e1..8e9dae5 100644 --- a/internals/modules/policies/policyrule.go +++ b/internals/modules/policies/policyrule.go @@ -3,7 +3,7 @@ package policies import ( "github.com/netbirdio/netbird/management/proto" - "management/internal/modules/groups" + "github.com/netbirdio/management-refactor/internals/modules/groups" ) // PolicyUpdateOperationType operation type diff --git a/internals/modules/template/manager/manager.go b/internals/modules/template/manager/manager.go index a6aeb1f..9bf66be 100644 --- a/internals/modules/template/manager/manager.go +++ b/internals/modules/template/manager/manager.go @@ -6,10 +6,10 @@ package manager import ( "github.com/gorilla/mux" - "management/internal/modules/template" - "management/internal/shared/db" - appmetrics "management/internal/shared/metrics" - "management/internal/shared/permissions" + "github.com/netbirdio/management-refactor/internals/modules/template" + "github.com/netbirdio/management-refactor/internals/shared/db" + appmetrics "github.com/netbirdio/management-refactor/internals/shared/metrics" + "github.com/netbirdio/management-refactor/internals/shared/permissions" ) type managerImpl struct { diff --git a/internals/modules/users/api.go b/internals/modules/users/api.go index a0c42bb..3a2f972 100644 --- a/internals/modules/users/api.go +++ b/internals/modules/users/api.go @@ -8,11 +8,11 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/http/util" - "management/internal/shared/db" - "management/internal/shared/errors" - "management/internal/shared/permissions" - "management/internal/shared/permissions/modules" - "management/internal/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/errors" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/internals/shared/permissions/modules" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" ) type handler struct { diff --git a/internals/modules/users/manager.go b/internals/modules/users/manager.go index 44c6d7e..c9f2d4b 100644 --- a/internals/modules/users/manager.go +++ b/internals/modules/users/manager.go @@ -5,10 +5,10 @@ import ( "github.com/gorilla/mux" - "management/internal/modules/users/types" - "management/internal/shared/db" - "management/internal/shared/permissions" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/internals/modules/users/types" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/permissions" + "github.com/netbirdio/management-refactor/pkg/logging" ) var log = logging.LoggerForThisPackage() diff --git a/internals/modules/users/repository.go b/internals/modules/users/repository.go index a33c4f5..887f93b 100644 --- a/internals/modules/users/repository.go +++ b/internals/modules/users/repository.go @@ -1,8 +1,8 @@ package users import ( - "management/internal/modules/users/types" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/users/types" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type Repository interface { diff --git a/internals/modules/users/types/user.go b/internals/modules/users/types/user.go index dcbd2f7..f53cbe7 100644 --- a/internals/modules/users/types/user.go +++ b/internals/modules/users/types/user.go @@ -8,8 +8,8 @@ import ( "github.com/netbirdio/netbird/management/server/idp" "github.com/netbirdio/netbird/management/server/integration_reference" - "management/internal/modules/accounts/settings" - "management/internal/modules/users/pats/types" + "github.com/netbirdio/management-refactor/internals/modules/accounts/settings" + "github.com/netbirdio/management-refactor/internals/modules/users/pats/types" ) const ( diff --git a/internals/server/boot.go b/internals/server/boot.go index 5435376..c36fcff 100644 --- a/internals/server/boot.go +++ b/internals/server/boot.go @@ -8,11 +8,11 @@ import ( "github.com/gorilla/mux" - "management/internal/shared/activity" - "management/internal/shared/activity/sqlite" - "management/internal/shared/api/rest" - "management/internal/shared/db" - "management/internal/shared/metrics" + "github.com/netbirdio/management-refactor/internals/shared/activity" + "github.com/netbirdio/management-refactor/internals/shared/activity/sqlite" + "github.com/netbirdio/management-refactor/internals/shared/api/rest" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/metrics" ) func (s *server) Store() *db.Store { diff --git a/internals/server/config.go b/internals/server/config.go index 6bb0e7b..1226a84 100644 --- a/internals/server/config.go +++ b/internals/server/config.go @@ -6,7 +6,7 @@ import ( "github.com/netbirdio/netbird/management/server/idp" "github.com/netbirdio/netbird/util" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/db" ) type ( diff --git a/internals/server/controllers.go b/internals/server/controllers.go index e3f9df1..726aa87 100644 --- a/internals/server/controllers.go +++ b/internals/server/controllers.go @@ -1,6 +1,6 @@ package server -import "management/internal/controllers/network_map" +import "github.com/netbirdio/management-refactor/internals/controllers/network_map" func (s *server) NetworkMapController() *network_map.Controller { return Create(s, func() *network_map.Controller { diff --git a/internals/server/modules.go b/internals/server/modules.go index 5696871..298f356 100644 --- a/internals/server/modules.go +++ b/internals/server/modules.go @@ -1,12 +1,12 @@ package server import ( - "management/internal/modules/networks" - "management/internal/modules/networks/manager" - "management/internal/modules/networks/resources" - resourcesManager "management/internal/modules/networks/resources/manager" - "management/internal/modules/peers" - "management/internal/shared/permissions" + "github.com/netbirdio/management-refactor/internals/modules/networks" + "github.com/netbirdio/management-refactor/internals/modules/networks/manager" + "github.com/netbirdio/management-refactor/internals/modules/networks/resources" + resourcesManager "github.com/netbirdio/management-refactor/internals/modules/networks/resources/manager" + "github.com/netbirdio/management-refactor/internals/modules/peers" + "github.com/netbirdio/management-refactor/internals/shared/permissions" ) func (s *server) NetworksManager() networks.Manager { diff --git a/internals/server/server.go b/internals/server/server.go index d13c421..c119fba 100644 --- a/internals/server/server.go +++ b/internals/server/server.go @@ -4,7 +4,7 @@ import ( "context" "time" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/pkg/logging" ) type Server interface { diff --git a/internals/shared/activity/manager.go b/internals/shared/activity/manager.go index 255067e..84b3a46 100644 --- a/internals/shared/activity/manager.go +++ b/internals/shared/activity/manager.go @@ -4,8 +4,8 @@ import ( "context" "time" - "management/pkg/configuration" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/pkg/configuration" + "github.com/netbirdio/management-refactor/pkg/logging" ) var log = logging.LoggerForThisPackage() diff --git a/internals/shared/activity/sqlite/sqlite.go b/internals/shared/activity/sqlite/sqlite.go index 9eb8df0..e09a539 100644 --- a/internals/shared/activity/sqlite/sqlite.go +++ b/internals/shared/activity/sqlite/sqlite.go @@ -12,7 +12,7 @@ import ( _ "github.com/mattn/go-sqlite3" log "github.com/sirupsen/logrus" - "management/internal/shared/activity" + "github.com/netbirdio/management-refactor/internals/shared/activity" ) const ( diff --git a/internals/shared/api/rest/middleware/auth_middleware.go b/internals/shared/api/rest/middleware/auth_middleware.go index e12a98f..3520b02 100644 --- a/internals/shared/api/rest/middleware/auth_middleware.go +++ b/internals/shared/api/rest/middleware/auth_middleware.go @@ -17,7 +17,7 @@ import ( "github.com/netbirdio/netbird/management/server/http/util" "github.com/netbirdio/netbird/management/server/status" - "management/pkg/logging/hook" + "github.com/netbirdio/management-refactor/pkg/logging/hook" ) type EnsureAccountFunc func(ctx context.Context, userAuth nbcontext.UserAuth) (string, string, error) diff --git a/internals/shared/api/rest/router.go b/internals/shared/api/rest/router.go index 55b7d9d..c95d91e 100644 --- a/internals/shared/api/rest/router.go +++ b/internals/shared/api/rest/router.go @@ -3,7 +3,7 @@ package rest import ( "github.com/gorilla/mux" - "management/internal/shared/api/rest/middleware" + "github.com/netbirdio/management-refactor/internals/shared/api/rest/middleware" ) // NewRouter creates and returns a mux.Router configured with default middleware diff --git a/internals/shared/auth/manager.go b/internals/shared/auth/manager.go index daa8f9d..db6ece6 100644 --- a/internals/shared/auth/manager.go +++ b/internals/shared/auth/manager.go @@ -13,11 +13,11 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/store" - "management/internal/modules/accounts/settings" - "management/internal/modules/users" - pattypes "management/internal/modules/users/pats/types" - "management/internal/modules/users/types" - "management/internal/shared/db" + "github.com/netbirdio/management-refactor/internals/modules/accounts/settings" + "github.com/netbirdio/management-refactor/internals/modules/users" + pattypes "github.com/netbirdio/management-refactor/internals/modules/users/pats/types" + "github.com/netbirdio/management-refactor/internals/modules/users/types" + "github.com/netbirdio/management-refactor/internals/shared/db" ) var _ Manager = (*manager)(nil) diff --git a/internals/shared/db/database_connection.go b/internals/shared/db/database_connection.go index 68d0a63..c361ee7 100644 --- a/internals/shared/db/database_connection.go +++ b/internals/shared/db/database_connection.go @@ -11,8 +11,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "management/internal/shared/errors" - "management/pkg/configuration" + "github.com/netbirdio/management-refactor/internals/shared/errors" + "github.com/netbirdio/management-refactor/pkg/configuration" ) const ( diff --git a/internals/shared/db/store.go b/internals/shared/db/store.go index ed553d5..5d00e87 100644 --- a/internals/shared/db/store.go +++ b/internals/shared/db/store.go @@ -6,7 +6,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/pkg/logging" ) var log = logging.LoggerForThisPackage() diff --git a/internals/shared/permissions/manager.go b/internals/shared/permissions/manager.go index 198fcd3..3eebcdc 100644 --- a/internals/shared/permissions/manager.go +++ b/internals/shared/permissions/manager.go @@ -7,13 +7,13 @@ import ( "github.com/netbirdio/netbird/management/server/status" - "management/internal/modules/users/types" - "management/internal/shared/activity" - "management/internal/shared/db" - "management/internal/shared/permissions/modules" - "management/internal/shared/permissions/operations" - "management/internal/shared/permissions/roles" - "management/pkg/logging" + "github.com/netbirdio/management-refactor/internals/modules/users/types" + "github.com/netbirdio/management-refactor/internals/shared/activity" + "github.com/netbirdio/management-refactor/internals/shared/db" + "github.com/netbirdio/management-refactor/internals/shared/permissions/modules" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/shared/permissions/roles" + "github.com/netbirdio/management-refactor/pkg/logging" ) var log = logging.LoggerForThisPackage() diff --git a/internals/shared/permissions/roles/role_permissions.go b/internals/shared/permissions/roles/role_permissions.go index 9995740..85ede1b 100644 --- a/internals/shared/permissions/roles/role_permissions.go +++ b/internals/shared/permissions/roles/role_permissions.go @@ -1,9 +1,9 @@ package roles import ( - "management/internal/modules/users/types" - "management/internal/shared/permissions/modules" - "management/internal/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/modules/users/types" + "github.com/netbirdio/management-refactor/internals/shared/permissions/modules" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" ) type RolePermissions struct { diff --git a/internals/shared/permissions/roles/user.go b/internals/shared/permissions/roles/user.go index 8796b7d..d93cca1 100644 --- a/internals/shared/permissions/roles/user.go +++ b/internals/shared/permissions/roles/user.go @@ -3,7 +3,7 @@ package roles import ( "github.com/netbirdio/netbird/management/server/types" - "management/internal/shared/permissions/operations" + "github.com/netbirdio/management-refactor/internals/shared/permissions/operations" ) var User = RolePermissions{ diff --git a/pkg/logging/set.go b/pkg/logging/set.go index 5c38ee3..6484a1a 100644 --- a/pkg/logging/set.go +++ b/pkg/logging/set.go @@ -3,10 +3,10 @@ package logging import ( "github.com/sirupsen/logrus" - "management/pkg/logging/hook" - "management/pkg/logging/logcat" - "management/pkg/logging/syslog" - "management/pkg/logging/txt" + "github.com/netbirdio/management-refactor/pkg/logging/hook" + "github.com/netbirdio/management-refactor/pkg/logging/logcat" + "github.com/netbirdio/management-refactor/pkg/logging/syslog" + "github.com/netbirdio/management-refactor/pkg/logging/txt" ) // SetTextFormatter set the text formatter for given logger.