Skip to content

Commit

Permalink
use mock instead
Browse files Browse the repository at this point in the history
  • Loading branch information
@pascal-fischer
pascal-fischer committed Feb 1, 2025
1 parent 6347c08 commit ccba185
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 20 deletions.
2 changes: 1 addition & 1 deletion client/cmd/testutil_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func startManagement(t *testing.T, config *mgmt.Config, testFile string) (*grpc.
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
require.NoError(t, err)

accountManager, err := mgmt.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, iv, metrics, integrations.NewController(store))
accountManager, err := mgmt.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, iv, metrics, port_forwarding.NewControllerMock())

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, sqlite) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, postgres) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, postgres) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / test (386) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / test (amd64) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, mysql) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, sqlite) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, mysql) 

undefined: port_forwarding

Check failure on line 92 in client/cmd/testutil_test.go

View workflow job for this annotation

GitHub Actions / test (sqlite) 

undefined: port_forwarding
if err != nil {
t.Fatal(err)
}
Expand Down
2 changes: 1 addition & 1 deletion client/internal/engine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ func startManagement(t *testing.T, dataDir, testFile string) (*grpc.Server, stri
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
require.NoError(t, err)

accountManager, err := server.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, ia, metrics, integrations.NewController(store))
accountManager, err := server.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, ia, metrics, port_forwarding.NewControllerMock())

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / test_client_on_docker 

undefined: port_forwarding

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, sqlite) 

undefined: port_forwarding

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, postgres) 

undefined: port_forwarding

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, postgres) 

undefined: port_forwarding

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, mysql) 

undefined: port_forwarding

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, sqlite) 

undefined: port_forwarding

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, mysql) 

undefined: port_forwarding

Check failure on line 1223 in client/internal/engine_test.go

View workflow job for this annotation

GitHub Actions / test (sqlite) 

undefined: port_forwarding
if err != nil {
return nil, "", err
}
Expand Down
2 changes: 1 addition & 1 deletion client/server/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func startManagement(t *testing.T, signalAddr string, counter *int) (*grpc.Serve
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
require.NoError(t, err)

accountManager, err := server.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, ia, metrics, integrations.NewController(store))
accountManager, err := server.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, ia, metrics, port_forwarding.NewControllerMock())

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, sqlite) 

undefined: port_forwarding

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, postgres) 

undefined: port_forwarding

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, postgres) 

undefined: port_forwarding

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, mysql) 

undefined: port_forwarding

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, sqlite) 

undefined: port_forwarding

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, mysql) 

undefined: port_forwarding

Check failure on line 131 in client/server/server_test.go

View workflow job for this annotation

GitHub Actions / test (sqlite) 

undefined: port_forwarding
if err != nil {
return nil, "", err
}
Expand Down
2 changes: 1 addition & 1 deletion management/client/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func startManagement(t *testing.T) (*grpc.Server, net.Listener) {
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
require.NoError(t, err)

accountManager, err := mgmt.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, ia, metrics, integrations.NewController(store))
accountManager, err := mgmt.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, ia, metrics, port_forwarding.NewControllerMock())

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: port_forwarding (typecheck)

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / test_management (amd64, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / test_management (386, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_integration_test (amd64, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / test_management (386, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / test_management (amd64, mysql) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_benchmark (386, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, mysql) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_integration_test (386, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_benchmark (amd64, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / benchmark (386, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_benchmark (386, sqlite) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / benchmark (amd64, mysql) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / test_management (amd64, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_benchmark (amd64, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_integration_test (386, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / api_integration_test (amd64, postgres) 

undefined: port_forwarding

Check failure on line 75 in management/client/client_test.go

View workflow job for this annotation

GitHub Actions / test_management (386, mysql) 

undefined: port_forwarding
if err != nil {
t.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions management/server/account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"time"

"github.com/golang-jwt/jwt"
"github.com/netbirdio/management-integrations/integrations"

"github.com/netbirdio/netbird/management/server/integrations/port_forwarding"
"github.com/netbirdio/netbird/management/server/util"

resourceTypes "github.com/netbirdio/netbird/management/server/networks/resources/types"
Expand Down Expand Up @@ -2901,7 +2901,7 @@ func createManager(t TB) (*DefaultAccountManager, error) {
return nil, err
}

manager, err := BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(store))
manager, err := BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions management/server/dns_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"testing"
"time"

"github.com/netbirdio/management-integrations/integrations"
"github.com/stretchr/testify/assert"

nbdns "github.com/netbirdio/netbird/dns"
"github.com/netbirdio/netbird/management/server/integrations/port_forwarding"
"github.com/netbirdio/netbird/management/server/store"
"github.com/netbirdio/netbird/management/server/telemetry"
"github.com/netbirdio/netbird/management/server/types"
Expand Down Expand Up @@ -209,7 +209,7 @@ func createDNSManager(t *testing.T) (*DefaultAccountManager, error) {
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
require.NoError(t, err)

return BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.test", eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(store))
return BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.test", eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
}

func createDNSStore(t *testing.T) (store.Store, error) {
Expand Down
15 changes: 15 additions & 0 deletions management/server/integrations/port_forwarding/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,18 @@ type Controller interface {
SendUpdate(ctx context.Context, accountID string, affectedProxyID string, affectedPeerIDs []string)
GetProxyNetworkMaps(ctx context.Context, accountID string) (map[string]*nbtypes.NetworkMap, error)
}

type ControllerMock struct {
}

func NewControllerMock() *ControllerMock {
return &ControllerMock{}
}

func (c *ControllerMock) SendUpdate(ctx context.Context, accountID string, affectedProxyID string, affectedPeerIDs []string) {
// noop
}

func (c *ControllerMock) GetProxyNetworkMaps(ctx context.Context, accountID string) (map[string]*nbtypes.NetworkMap, error) {
return make(map[string]*nbtypes.NetworkMap), nil
}
4 changes: 2 additions & 2 deletions management/server/management_proto_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"testing"
"time"

"github.com/netbirdio/management-integrations/integrations"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
Expand All @@ -24,6 +23,7 @@ import (
"github.com/netbirdio/netbird/formatter"
mgmtProto "github.com/netbirdio/netbird/management/proto"
"github.com/netbirdio/netbird/management/server/activity"
"github.com/netbirdio/netbird/management/server/integrations/port_forwarding"
"github.com/netbirdio/netbird/management/server/settings"
"github.com/netbirdio/netbird/management/server/store"
"github.com/netbirdio/netbird/management/server/telemetry"
Expand Down Expand Up @@ -431,7 +431,7 @@ func startManagementForTest(t *testing.T, testFile string, config *Config) (*grp
require.NoError(t, err)

accountManager, err := BuildManager(ctx, store, peersUpdateManager, nil, "", "netbird.selfhosted",
eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(store))
eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())

if err != nil {
cleanup()
Expand Down
4 changes: 2 additions & 2 deletions management/server/management_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"time"

pb "github.com/golang/protobuf/proto" //nolint
"github.com/netbirdio/management-integrations/integrations"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
log "github.com/sirupsen/logrus"
Expand All @@ -23,6 +22,7 @@ import (
mgmtProto "github.com/netbirdio/netbird/management/proto"
"github.com/netbirdio/netbird/management/server"
"github.com/netbirdio/netbird/management/server/activity"
"github.com/netbirdio/netbird/management/server/integrations/port_forwarding"
"github.com/netbirdio/netbird/management/server/settings"
"github.com/netbirdio/netbird/management/server/store"
"github.com/netbirdio/netbird/management/server/telemetry"
Expand Down Expand Up @@ -508,7 +508,7 @@ func startServer(config *server.Config, dataDir string, testFile string) (*grpc.
log.Fatalf("failed creating metrics: %v", err)
}

accountManager, err := server.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, server.MocIntegratedValidator{}, metrics, integrations.NewController(store))
accountManager, err := server.BuildManager(context.Background(), store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false, server.MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
if err != nil {
log.Fatalf("failed creating a manager: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions management/server/nameserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"testing"
"time"

"github.com/netbirdio/management-integrations/integrations"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

nbdns "github.com/netbirdio/netbird/dns"
"github.com/netbirdio/netbird/management/server/activity"
"github.com/netbirdio/netbird/management/server/integrations/port_forwarding"
nbpeer "github.com/netbirdio/netbird/management/server/peer"
"github.com/netbirdio/netbird/management/server/store"
"github.com/netbirdio/netbird/management/server/telemetry"
Expand Down Expand Up @@ -771,7 +771,7 @@ func createNSManager(t *testing.T) (*DefaultAccountManager, error) {
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
require.NoError(t, err)

return BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.selfhosted", eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(store))
return BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.selfhosted", eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
}

func createNSStore(t *testing.T) (store.Store, error) {
Expand Down
8 changes: 4 additions & 4 deletions management/server/peer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"testing"
"time"

"github.com/netbirdio/management-integrations/integrations"
"github.com/rs/xid"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"

"github.com/netbirdio/netbird/management/server/integrations/port_forwarding"
"github.com/netbirdio/netbird/management/server/util"

resourceTypes "github.com/netbirdio/netbird/management/server/networks/resources/types"
Expand Down Expand Up @@ -1211,7 +1211,7 @@ func Test_RegisterPeerByUser(t *testing.T) {
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
assert.NoError(t, err)

am, err := BuildManager(context.Background(), s, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(s))
am, err := BuildManager(context.Background(), s, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
assert.NoError(t, err)

existingAccountID := "bf1c8084-ba50-4ce7-9439-34653001fc3b"
Expand Down Expand Up @@ -1275,7 +1275,7 @@ func Test_RegisterPeerBySetupKey(t *testing.T) {
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
assert.NoError(t, err)

am, err := BuildManager(context.Background(), s, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(s))
am, err := BuildManager(context.Background(), s, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
assert.NoError(t, err)

existingAccountID := "bf1c8084-ba50-4ce7-9439-34653001fc3b"
Expand Down Expand Up @@ -1342,7 +1342,7 @@ func Test_RegisterPeerRollbackOnFailure(t *testing.T) {
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
assert.NoError(t, err)

am, err := BuildManager(context.Background(), s, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(s))
am, err := BuildManager(context.Background(), s, NewPeersUpdateManager(nil), nil, "", "netbird.cloud", eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
assert.NoError(t, err)

existingAccountID := "bf1c8084-ba50-4ce7-9439-34653001fc3b"
Expand Down
4 changes: 2 additions & 2 deletions management/server/route_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"testing"
"time"

"github.com/netbirdio/management-integrations/integrations"
"github.com/rs/xid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/netbirdio/netbird/management/server/integrations/port_forwarding"
resourceTypes "github.com/netbirdio/netbird/management/server/networks/resources/types"
routerTypes "github.com/netbirdio/netbird/management/server/networks/routers/types"
networkTypes "github.com/netbirdio/netbird/management/server/networks/types"
Expand Down Expand Up @@ -1258,7 +1258,7 @@ func createRouterManager(t *testing.T) (*DefaultAccountManager, error) {
metrics, err := telemetry.NewDefaultAppMetrics(context.Background())
require.NoError(t, err)

return BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.selfhosted", eventStore, nil, false, MocIntegratedValidator{}, metrics, integrations.NewController(store))
return BuildManager(context.Background(), store, NewPeersUpdateManager(nil), nil, "", "netbird.selfhosted", eventStore, nil, false, MocIntegratedValidator{}, metrics, port_forwarding.NewControllerMock())
}

func createRouterStore(t *testing.T) (store.Store, error) {
Expand Down

0 comments on commit ccba185

Please sign in to comment.