netbird/management-integrations
0
0
Fork 0
mirror of https://github.com/netbirdio/management-integrations.git synced 2026-05-22 17:09:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

move extra settings

Browse Source
This commit is contained in:
Pascal Fischer
2025-02-26 17:51:06 +01:00
parent 782907bdb8
commit 4e54495b52
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integrations/config.go
+2 -2
View File
@@ -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
}
integrations/extra_settings.go
+4 -4
View File
@@ -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
}
integrations/go.mod
+1 -1
View File
@@ -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
)
integrations/go.sum
+2
View File
@@ -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=
integrations/validator.go
+5 -6
View File
@@ -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{}{}