From 4e54495b52cae1b37e536d2e0bd1dd177557cfe9 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Wed, 26 Feb 2025 17:51:06 +0100 Subject: [PATCH] move extra settings --- integrations/config.go | 4 ++-- integrations/extra_settings.go | 8 ++++---- integrations/go.mod | 2 +- integrations/go.sum | 2 ++ integrations/validator.go | 11 +++++------ 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/integrations/config.go b/integrations/config.go index fa227df..fdb84be 100644 --- a/integrations/config.go +++ b/integrations/config.go @@ -2,9 +2,9 @@ package integrations import ( "github.com/netbirdio/netbird/management/proto" - "github.com/netbirdio/netbird/management/server/account" + "github.com/netbirdio/netbird/management/server/types" ) -func ExtendNetBirdConfig(config *proto.NetbirdConfig, extraSettings *account.ExtraSettings) { +func ExtendNetBirdConfig(config *proto.NetbirdConfig, extraSettings *types.ExtraSettings) { return } diff --git a/integrations/extra_settings.go b/integrations/extra_settings.go index 3b4d79d..784625a 100644 --- a/integrations/extra_settings.go +++ b/integrations/extra_settings.go @@ -3,7 +3,7 @@ package integrations import ( "context" - "github.com/netbirdio/netbird/management/server/account" + "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/integrations/extra_settings" ) @@ -15,10 +15,10 @@ func NewManager() extra_settings.Manager { return &ManagerImpl{} } -func (m *ManagerImpl) GetExtraSettings(ctx context.Context, accountID string) (*account.ExtraSettings, error) { - return &account.ExtraSettings{}, nil +func (m *ManagerImpl) GetExtraSettings(ctx context.Context, accountID string) (*types.ExtraSettings, error) { + return &types.ExtraSettings{}, nil } -func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID string, accountExtraSettings *account.ExtraSettings) error { +func (m *ManagerImpl) UpdateExtraSettings(ctx context.Context, accountID string, accountExtraSettings *types.ExtraSettings) error { return nil } diff --git a/integrations/go.mod b/integrations/go.mod index 0d86eaa..c834409 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78 + github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9 github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel/metric v1.26.0 ) diff --git a/integrations/go.sum b/integrations/go.sum index 5fd2b29..9f53336 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -303,6 +303,8 @@ github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf h1:J1W0lfe7HF github.com/netbirdio/netbird v0.37.2-0.20250226105245-d8f246fbaeaf/go.mod h1:FiWFoWGn9BBIQXI8RZz8CWuhtHTOEvZagkw2B4SP1A4= github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78 h1:C3WNbntv1TdGLv5Z4G74+RHA2sHtAY/0i0c0l+QPRPo= github.com/netbirdio/netbird v0.37.2-0.20250226164009-e6c62c023b78/go.mod h1:LPzGSNMW+yl2cCVLOLGCM2gh00raxbuR/Q8g0q9rams= +github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9 h1:F51Z+pNSxhIvfDGJOeHGOFyh4JOv9mNdzOoiKEgjryo= +github.com/netbirdio/netbird v0.37.2-0.20250226164836-b90c10191ea9/go.mod h1:qbqfE9xtYEBW9loBBhqVV5PADHSfOlg45i9BO7gWD6c= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc= diff --git a/integrations/validator.go b/integrations/validator.go index eaf870e..a183787 100644 --- a/integrations/validator.go +++ b/integrations/validator.go @@ -3,7 +3,6 @@ package integrations import ( "context" - "github.com/netbirdio/netbird/management/server/account" "github.com/netbirdio/netbird/management/server/activity" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/types" @@ -16,23 +15,23 @@ func NewIntegratedValidator(_ context.Context, store activity.Store) (*Integrate return &IntegratedValidatorImpl{}, nil } -func (v *IntegratedValidatorImpl) ValidateExtraSettings(context.Context, *account.ExtraSettings, *account.ExtraSettings, map[string]*nbpeer.Peer, string, string) error { +func (v *IntegratedValidatorImpl) ValidateExtraSettings(context.Context, *types.ExtraSettings, *types.ExtraSettings, map[string]*nbpeer.Peer, string, string) error { return nil } -func (v *IntegratedValidatorImpl) ValidatePeer(_ context.Context, update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *account.ExtraSettings) (*nbpeer.Peer, bool, error) { +func (v *IntegratedValidatorImpl) ValidatePeer(_ context.Context, update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *types.ExtraSettings) (*nbpeer.Peer, bool, error) { return update, false, nil } -func (v *IntegratedValidatorImpl) PreparePeer(_ context.Context, _ string, peer *nbpeer.Peer, _ []string, _ *account.ExtraSettings) *nbpeer.Peer { +func (v *IntegratedValidatorImpl) PreparePeer(_ context.Context, _ string, peer *nbpeer.Peer, _ []string, _ *types.ExtraSettings) *nbpeer.Peer { return peer.Copy() } -func (v *IntegratedValidatorImpl) IsNotValidPeer(_ context.Context, _ string, _ *nbpeer.Peer, _ []string, _ *account.ExtraSettings) (bool, bool, error) { +func (v *IntegratedValidatorImpl) IsNotValidPeer(_ context.Context, _ string, _ *nbpeer.Peer, _ []string, _ *types.ExtraSettings) (bool, bool, error) { return false, false, nil } -func (v *IntegratedValidatorImpl) GetValidatedPeers(_ string, _ []*types.Group, peers []*nbpeer.Peer, _ *account.ExtraSettings) (map[string]struct{}, error) { +func (v *IntegratedValidatorImpl) GetValidatedPeers(_ string, _ []*types.Group, peers []*nbpeer.Peer, _ *types.ExtraSettings) (map[string]struct{}, error) { validatedPeers := make(map[string]struct{}) for _, p := range peers { validatedPeers[p.ID] = struct{}{}