diff --git a/integrations/go.mod b/integrations/go.mod index 5e0496a..c884e63 100644 --- a/integrations/go.mod +++ b/integrations/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.1 require ( github.com/gorilla/mux v1.8.0 - github.com/netbirdio/netbird v0.27.11-0.20240619130514-90db190b7357 + github.com/netbirdio/netbird v0.27.11-0.20240628133012-fb597a40bd18 ) require ( diff --git a/integrations/go.sum b/integrations/go.sum index 0e6d95b..b0a599a 100644 --- a/integrations/go.sum +++ b/integrations/go.sum @@ -356,6 +356,8 @@ github.com/netbirdio/netbird v0.27.11-0.20240618113904-7642964818db h1:cty8l/csb github.com/netbirdio/netbird v0.27.11-0.20240618113904-7642964818db/go.mod h1:ubG5QLXPA8lNaurZ4/87WniVqwWAzGmzIw32eGfexeQ= github.com/netbirdio/netbird v0.27.11-0.20240619130514-90db190b7357 h1:nAvymEB9KhcjTlAD1hBBqZYA1UVF9Ia+nwF7ehsvzaw= github.com/netbirdio/netbird v0.27.11-0.20240619130514-90db190b7357/go.mod h1:ubG5QLXPA8lNaurZ4/87WniVqwWAzGmzIw32eGfexeQ= +github.com/netbirdio/netbird v0.27.11-0.20240628133012-fb597a40bd18 h1:tQN94PisJndrEBJU5rJY+rTJ58B0xlo/ol+IHOStIn4= +github.com/netbirdio/netbird v0.27.11-0.20240628133012-fb597a40bd18/go.mod h1:O1RI0ZjFgD87mzOgrsqy6/dFOGzkssLcLJVGnTxdFMs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= diff --git a/integrations/validator.go b/integrations/validator.go index 0f5c2ee..1b19483 100644 --- a/integrations/validator.go +++ b/integrations/validator.go @@ -1,6 +1,8 @@ package integrations import ( + "context" + "github.com/netbirdio/netbird/management/server/account" "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/group" @@ -10,23 +12,23 @@ import ( type IntegratedValidatorImpl struct { } -func NewIntegratedValidator(activity.Store) (*IntegratedValidatorImpl, error) { +func NewIntegratedValidator(_ context.Context, store activity.Store) (*IntegratedValidatorImpl, error) { return &IntegratedValidatorImpl{}, nil } -func (v *IntegratedValidatorImpl) ValidateExtraSettings(*account.ExtraSettings, *account.ExtraSettings, map[string]*nbpeer.Peer, string, string) error { +func (v *IntegratedValidatorImpl) ValidateExtraSettings(context.Context, *account.ExtraSettings, *account.ExtraSettings, map[string]*nbpeer.Peer, string, string) error { return nil } -func (v *IntegratedValidatorImpl) ValidatePeer(update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *account.ExtraSettings) (*nbpeer.Peer, error) { +func (v *IntegratedValidatorImpl) ValidatePeer(_ context.Context, update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *account.ExtraSettings) (*nbpeer.Peer, error) { return update, nil } -func (v *IntegratedValidatorImpl) PreparePeer(_ string, peer *nbpeer.Peer, _ []string, _ *account.ExtraSettings) *nbpeer.Peer { +func (v *IntegratedValidatorImpl) PreparePeer(_ context.Context, _ string, peer *nbpeer.Peer, _ []string, _ *account.ExtraSettings) *nbpeer.Peer { return peer.Copy() } -func (v *IntegratedValidatorImpl) IsNotValidPeer(_ string, _ *nbpeer.Peer, _ []string, _ *account.ExtraSettings) (bool, bool, error) { +func (v *IntegratedValidatorImpl) IsNotValidPeer(_ context.Context, _ string, _ *nbpeer.Peer, _ []string, _ *account.ExtraSettings) (bool, bool, error) { return false, false, nil } @@ -38,7 +40,7 @@ func (v *IntegratedValidatorImpl) GetValidatedPeers(_ string, _ map[string]*grou return validatedPeers, nil } -func (v *IntegratedValidatorImpl) PeerDeleted(_, _ string) error { +func (v *IntegratedValidatorImpl) PeerDeleted(ctx context.Context, _, _ string) error { return nil } @@ -46,5 +48,5 @@ func (v *IntegratedValidatorImpl) SetPeerInvalidationListener(_ func(accountID s } -func (v *IntegratedValidatorImpl) Stop() { +func (v *IntegratedValidatorImpl) Stop(ctx context.Context) { }