From b1fe194fbc5c05f544608c05b05415d4e2a15685 Mon Sep 17 00:00:00 2001 From: Dmitri Dolguikh Date: Mon, 24 Aug 2026 14:24:07 +0200 Subject: [PATCH] replace golang.org mock with go.uber.org/mock/gomock Signed-off-by: Dmitri Dolguikh --- .../network_map_db/network_map_data_test.go | 2 +- .../integrated_validator_mock.go | 34 +++++++++++-------- .../integrated_validator/interface.go | 2 +- .../types/legacynmap/equivalence_test.go | 2 +- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/integration_tests/management/network_map_db/network_map_data_test.go b/integration_tests/management/network_map_db/network_map_data_test.go index 25c0c0e77..938cd757a 100644 --- a/integration_tests/management/network_map_db/network_map_data_test.go +++ b/integration_tests/management/network_map_db/network_map_data_test.go @@ -12,13 +12,13 @@ import ( "strings" "testing" - "github.com/golang/mock/gomock" networkmapdb "github.com/netbirdio/netbird/management/internals/network_map_db" "github.com/netbirdio/netbird/management/server/integrations/integrated_validator" "github.com/netbirdio/netbird/management/server/settings" "github.com/netbirdio/netbird/management/server/types" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) //go:embed network_map_data.sql diff --git a/management/server/integrations/integrated_validator/integrated_validator_mock.go b/management/server/integrations/integrated_validator/integrated_validator_mock.go index 2e25de4cb..73178a869 100644 --- a/management/server/integrations/integrated_validator/integrated_validator_mock.go +++ b/management/server/integrations/integrated_validator/integrated_validator_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ./interface.go +// +// Generated by this command: +// +// mockgen -package integrated_validator -destination=integrated_validator_mock.go -source=./interface.go -build_flags=-mod=mod +// // Package integrated_validator is a generated GoMock package. package integrated_validator @@ -8,17 +13,18 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" peer "github.com/netbirdio/netbird/management/server/peer" types "github.com/netbirdio/netbird/management/server/types" nmdata "github.com/netbirdio/netbird/shared/management/networkmap/nmdata" proto "github.com/netbirdio/netbird/shared/management/proto" + gomock "go.uber.org/mock/gomock" ) // MockIntegratedValidator is a mock of IntegratedValidator interface. type MockIntegratedValidator struct { ctrl *gomock.Controller recorder *MockIntegratedValidatorMockRecorder + isgomock struct{} } // MockIntegratedValidatorMockRecorder is the mock recorder for MockIntegratedValidator. @@ -48,7 +54,7 @@ func (m *MockIntegratedValidator) GetInvalidPeers(ctx context.Context, accountID } // GetInvalidPeers indicates an expected call of GetInvalidPeers. -func (mr *MockIntegratedValidatorMockRecorder) GetInvalidPeers(ctx, accountID, extraSettings interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) GetInvalidPeers(ctx, accountID, extraSettings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInvalidPeers", reflect.TypeOf((*MockIntegratedValidator)(nil).GetInvalidPeers), ctx, accountID, extraSettings) } @@ -63,15 +69,15 @@ func (m *MockIntegratedValidator) GetValidatedPeers(ctx context.Context, account } // GetValidatedPeers indicates an expected call of GetValidatedPeers. -func (mr *MockIntegratedValidatorMockRecorder) GetValidatedPeers(ctx, accountID, groups, peers, extraSettings interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) GetValidatedPeers(ctx, accountID, groups, peers, extraSettings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetValidatedPeers", reflect.TypeOf((*MockIntegratedValidator)(nil).GetValidatedPeers), ctx, accountID, groups, peers, extraSettings) } // IsNotValidPeer mocks base method. -func (m *MockIntegratedValidator) IsNotValidPeer(ctx context.Context, accountID string, peer *peer.Peer, peersGroup []string, extraSettings *types.ExtraSettings) (bool, bool, error) { +func (m *MockIntegratedValidator) IsNotValidPeer(ctx context.Context, accountID string, arg2 *peer.Peer, peersGroup []string, extraSettings *types.ExtraSettings) (bool, bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsNotValidPeer", ctx, accountID, peer, peersGroup, extraSettings) + ret := m.ctrl.Call(m, "IsNotValidPeer", ctx, accountID, arg2, peersGroup, extraSettings) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(bool) ret2, _ := ret[2].(error) @@ -79,9 +85,9 @@ func (m *MockIntegratedValidator) IsNotValidPeer(ctx context.Context, accountID } // IsNotValidPeer indicates an expected call of IsNotValidPeer. -func (mr *MockIntegratedValidatorMockRecorder) IsNotValidPeer(ctx, accountID, peer, peersGroup, extraSettings interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) IsNotValidPeer(ctx, accountID, arg2, peersGroup, extraSettings any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsNotValidPeer", reflect.TypeOf((*MockIntegratedValidator)(nil).IsNotValidPeer), ctx, accountID, peer, peersGroup, extraSettings) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsNotValidPeer", reflect.TypeOf((*MockIntegratedValidator)(nil).IsNotValidPeer), ctx, accountID, arg2, peersGroup, extraSettings) } // PeerDeleted mocks base method. @@ -93,7 +99,7 @@ func (m *MockIntegratedValidator) PeerDeleted(ctx context.Context, accountID, pe } // PeerDeleted indicates an expected call of PeerDeleted. -func (mr *MockIntegratedValidatorMockRecorder) PeerDeleted(ctx, accountID, peerID, extraSettings interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) PeerDeleted(ctx, accountID, peerID, extraSettings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerDeleted", reflect.TypeOf((*MockIntegratedValidator)(nil).PeerDeleted), ctx, accountID, peerID, extraSettings) } @@ -107,7 +113,7 @@ func (m *MockIntegratedValidator) PreparePeer(ctx context.Context, accountID str } // PreparePeer indicates an expected call of PreparePeer. -func (mr *MockIntegratedValidatorMockRecorder) PreparePeer(ctx, accountID, p, peersGroup, extraSettings, temporary interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) PreparePeer(ctx, accountID, p, peersGroup, extraSettings, temporary any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PreparePeer", reflect.TypeOf((*MockIntegratedValidator)(nil).PreparePeer), ctx, accountID, p, peersGroup, extraSettings, temporary) } @@ -119,7 +125,7 @@ func (m *MockIntegratedValidator) SetPeerInvalidationListener(fn func(string, [] } // SetPeerInvalidationListener indicates an expected call of SetPeerInvalidationListener. -func (mr *MockIntegratedValidatorMockRecorder) SetPeerInvalidationListener(fn interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) SetPeerInvalidationListener(fn any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetPeerInvalidationListener", reflect.TypeOf((*MockIntegratedValidator)(nil).SetPeerInvalidationListener), fn) } @@ -131,7 +137,7 @@ func (m *MockIntegratedValidator) Stop(ctx context.Context) { } // Stop indicates an expected call of Stop. -func (mr *MockIntegratedValidatorMockRecorder) Stop(ctx interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) Stop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockIntegratedValidator)(nil).Stop), ctx) } @@ -145,7 +151,7 @@ func (m *MockIntegratedValidator) ValidateExtraSettings(ctx context.Context, new } // ValidateExtraSettings indicates an expected call of ValidateExtraSettings. -func (mr *MockIntegratedValidatorMockRecorder) ValidateExtraSettings(ctx, newExtraSettings, oldExtraSettings, userID, accountID interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) ValidateExtraSettings(ctx, newExtraSettings, oldExtraSettings, userID, accountID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateExtraSettings", reflect.TypeOf((*MockIntegratedValidator)(nil).ValidateExtraSettings), ctx, newExtraSettings, oldExtraSettings, userID, accountID) } @@ -159,7 +165,7 @@ func (m *MockIntegratedValidator) ValidateFlowResponse(ctx context.Context, peer } // ValidateFlowResponse indicates an expected call of ValidateFlowResponse. -func (mr *MockIntegratedValidatorMockRecorder) ValidateFlowResponse(ctx, peerKey, flowResponse interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) ValidateFlowResponse(ctx, peerKey, flowResponse any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateFlowResponse", reflect.TypeOf((*MockIntegratedValidator)(nil).ValidateFlowResponse), ctx, peerKey, flowResponse) } @@ -175,7 +181,7 @@ func (m *MockIntegratedValidator) ValidatePeer(ctx context.Context, update, p *p } // ValidatePeer indicates an expected call of ValidatePeer. -func (mr *MockIntegratedValidatorMockRecorder) ValidatePeer(ctx, update, p, userID, accountID, dnsDomain, peersGroup, extraSettings interface{}) *gomock.Call { +func (mr *MockIntegratedValidatorMockRecorder) ValidatePeer(ctx, update, p, userID, accountID, dnsDomain, peersGroup, extraSettings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatePeer", reflect.TypeOf((*MockIntegratedValidator)(nil).ValidatePeer), ctx, update, p, userID, accountID, dnsDomain, peersGroup, extraSettings) } diff --git a/management/server/integrations/integrated_validator/interface.go b/management/server/integrations/integrated_validator/interface.go index a0928d8bc..dc3332177 100644 --- a/management/server/integrations/integrated_validator/interface.go +++ b/management/server/integrations/integrated_validator/interface.go @@ -9,7 +9,7 @@ import ( "github.com/netbirdio/netbird/shared/management/proto" ) -//go:generate go run github.com/golang/mock/mockgen -package integrated_validator -destination=integrated_validator_mock.go -source=./interface.go -build_flags=-mod=mod +//go:generate go tool mockgen -package integrated_validator -destination=integrated_validator_mock.go -source=./interface.go -build_flags=-mod=mod // IntegratedValidator interface exists to avoid the circle dependencies type IntegratedValidator interface { diff --git a/management/server/types/legacynmap/equivalence_test.go b/management/server/types/legacynmap/equivalence_test.go index 1be3c2539..66209d2be 100644 --- a/management/server/types/legacynmap/equivalence_test.go +++ b/management/server/types/legacynmap/equivalence_test.go @@ -42,8 +42,8 @@ import ( "strings" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "google.golang.org/protobuf/encoding/prototext" goproto "google.golang.org/protobuf/proto" "gorm.io/driver/postgres"