Github/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-30 18:41:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

make linter happy

Browse Source 
Signed-off-by: Dmitri Dolguikh <dmitri.external@netbird.io>
This commit is contained in:
Dmitri Dolguikh
2026-08-27 15:44:50 +02:00
parent 9b510eb060
commit fd585b073f
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
management/internals/shared/grpc/peer_update_handler.go
View File

@@ -46,6 +46,11 @@ type PeerUpdateHandler struct {
cleanupFunc func()
}
func (pu *PeerUpdateHandler) WithMetrics(appMetrics telemetry.AppMetrics) *PeerUpdateHandler {
pu.appMetrics = appMetrics
return pu
}
//go:generate go tool mockgen -source=./peer_update_handler.go -destination=./sync_sender_mock.go -package=grpc
type syncSender interface {
Send(*proto.EncryptedMessage) error

12
management/internals/shared/grpc/peer_update_handler_test.go
View File

@@ -7,7 +7,7 @@ import (
"testing"
"time"
pb "github.com/golang/protobuf/proto"
pb "github.com/golang/protobuf/proto" //nolint
"github.com/netbirdio/netbird/management/internals/controllers/network_map"
"github.com/netbirdio/netbird/shared/management/proto"
"github.com/stretchr/testify/assert"
@@ -36,7 +36,7 @@ func TestSendPeerUpdates_FirstUpdate(t *testing.T) {
}
timeCh := make(chan time.Time)
srvCtx, _ := context.WithCancel(context.TODO())
srvCtx := context.TODO()
srvKey := mustGenerateKey(t)
// mock a first update, should send it right away
updateDebouncer.EXPECT().ProcessUpdate(gomock.Eq(&msg)).Return(true)
@@ -47,7 +47,7 @@ func TestSendPeerUpdates_FirstUpdate(t *testing.T) {
updateDebouncer.EXPECT().Stop()
var wg sync.WaitGroup
wg.Go(func() { pu.HandleUpdates(context.TODO()) })
wg.Go(func() { pu.HandleUpdates(context.TODO()) }) //nolint:errcheck
pu.updates <- &msg
close(pu.updates)
wg.Wait()
@@ -74,7 +74,7 @@ func TestSendPeerUpdates_TimerUpdate(t *testing.T) {
}
timeCh := make(chan time.Time)
srvCtx, _ := context.WithCancel(context.TODO())
srvCtx := context.TODO()
srvKey := mustGenerateKey(t)
updateDebouncer.EXPECT().GetPendingUpdates().Return([]*network_map.UpdateMessage{&msg})
updateDebouncer.EXPECT().TimerChannel().AnyTimes().Return(timeCh)
@@ -84,7 +84,7 @@ func TestSendPeerUpdates_TimerUpdate(t *testing.T) {
updateDebouncer.EXPECT().Stop()
var wg sync.WaitGroup
wg.Go(func() { pu.HandleUpdates(context.TODO()) })
wg.Go(func() { pu.HandleUpdates(context.TODO()) }) //nolint:errcheck
timeCh <- time.Now()
close(pu.updates)
wg.Wait()
@@ -113,7 +113,7 @@ func TestSendPeerUpdates_ServerContextDone(t *testing.T) {
updateDebouncer.EXPECT().Stop()
var wg sync.WaitGroup
wg.Go(func() { pu.HandleUpdates(context.TODO()) })
wg.Go(func() { pu.HandleUpdates(context.TODO()) }) //nolint:errcheck
cancel()
wg.Wait()
}

3
management/internals/shared/grpc/server.go
View File

@@ -346,7 +346,8 @@ func (s *Server) Sync(req *proto.EncryptedMessage, srv proto.ManagementService_S
s.syncSem.Add(-1)
return PeerUpdateHandlerFactory(peerKey, updates, s.secretsManager, srv, func() { s.cancelPeerRoutines(ctx, accountID, peer, syncStart) }).HandleUpdates(ctx)
return PeerUpdateHandlerFactory(peerKey, updates, s.secretsManager, srv, func() { s.cancelPeerRoutines(ctx, accountID, peer, syncStart) }).
WithMetrics(s.appMetrics).HandleUpdates(ctx)
}
func (s *Server) handleHandshake(ctx context.Context, srv proto.ManagementService_JobServer) (wgtypes.Key, error) {