From f0672b87bc7440d921c8a66f24bfc3a2c6fe3e16 Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Mon, 18 Mar 2024 12:25:01 +0100 Subject: [PATCH] Add missing dns domain to tests to avoid verbose test logs (#1724) --- client/cmd/testutil.go | 2 +- client/internal/engine_test.go | 10 +++++----- client/server/server_test.go | 2 +- management/client/client_test.go | 2 +- management/server/http/peers_handler_test.go | 3 +++ management/server/management_proto_test.go | 2 +- management/server/management_test.go | 2 +- management/server/nameserver_test.go | 2 +- management/server/route_test.go | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/client/cmd/testutil.go b/client/cmd/testutil.go index cba47326f..2cfc93415 100644 --- a/client/cmd/testutil.go +++ b/client/cmd/testutil.go @@ -78,7 +78,7 @@ func startManagement(t *testing.T, config *mgmt.Config) (*grpc.Server, net.Liste if err != nil { return nil, nil } - accountManager, err := mgmt.BuildManager(store, peersUpdateManager, nil, "", "", eventStore, nil, false) + accountManager, err := mgmt.BuildManager(store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false) if err != nil { t.Fatal(err) } diff --git a/client/internal/engine_test.go b/client/internal/engine_test.go index ee0380db7..952b3c90c 100644 --- a/client/internal/engine_test.go +++ b/client/internal/engine_test.go @@ -70,10 +70,10 @@ func TestEngine_SSH(t *testing.T) { defer cancel() engine := NewEngine(ctx, cancel, &signal.MockClient{}, &mgmt.MockClient{}, &EngineConfig{ - WgIfaceName: "utun101", - WgAddr: "100.64.0.1/24", - WgPrivateKey: key, - WgPort: 33100, + WgIfaceName: "utun101", + WgAddr: "100.64.0.1/24", + WgPrivateKey: key, + WgPort: 33100, ServerSSHAllowed: true, }, MobileDependency{}, peer.NewRecorder("https://mgm")) @@ -1050,7 +1050,7 @@ func startManagement(dataDir string) (*grpc.Server, string, error) { if err != nil { return nil, "", err } - accountManager, err := server.BuildManager(store, peersUpdateManager, nil, "", "", eventStore, nil, false) + accountManager, err := server.BuildManager(store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false) if err != nil { return nil, "", err } diff --git a/client/server/server_test.go b/client/server/server_test.go index 79a220023..7f8310c90 100644 --- a/client/server/server_test.go +++ b/client/server/server_test.go @@ -114,7 +114,7 @@ func startManagement(t *testing.T, signalAddr string, counter *int) (*grpc.Serve if err != nil { return nil, "", err } - accountManager, err := server.BuildManager(store, peersUpdateManager, nil, "", "", eventStore, nil, false) + accountManager, err := server.BuildManager(store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false) if err != nil { return nil, "", err } diff --git a/management/client/client_test.go b/management/client/client_test.go index 0a57fda72..f30ae0cfd 100644 --- a/management/client/client_test.go +++ b/management/client/client_test.go @@ -60,7 +60,7 @@ func startManagement(t *testing.T) (*grpc.Server, net.Listener) { peersUpdateManager := mgmt.NewPeersUpdateManager(nil) eventStore := &activity.InMemoryEventStore{} - accountManager, err := mgmt.BuildManager(store, peersUpdateManager, nil, "", "", eventStore, nil, false) + accountManager, err := mgmt.BuildManager(store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false) if err != nil { t.Fatal(err) } diff --git a/management/server/http/peers_handler_test.go b/management/server/http/peers_handler_test.go index 27978c487..e43c4375e 100644 --- a/management/server/http/peers_handler_test.go +++ b/management/server/http/peers_handler_test.go @@ -55,6 +55,9 @@ func initTestMetaData(peers ...*nbpeer.Peer) *PeersHandler { GetPeersFunc: func(accountID, userID string) ([]*nbpeer.Peer, error) { return peers, nil }, + GetDNSDomainFunc: func() string { + return "netbird.selfhosted" + }, GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) { user := server.NewAdminUser("test_user") return &server.Account{ diff --git a/management/server/management_proto_test.go b/management/server/management_proto_test.go index e5457db02..6ea902003 100644 --- a/management/server/management_proto_test.go +++ b/management/server/management_proto_test.go @@ -412,7 +412,7 @@ func startManagement(t *testing.T, config *Config) (*grpc.Server, string, error) } peersUpdateManager := NewPeersUpdateManager(nil) eventStore := &activity.InMemoryEventStore{} - accountManager, err := BuildManager(store, peersUpdateManager, nil, "", "", + accountManager, err := BuildManager(store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false) if err != nil { return nil, "", err diff --git a/management/server/management_test.go b/management/server/management_test.go index f45354877..fb3f74cb9 100644 --- a/management/server/management_test.go +++ b/management/server/management_test.go @@ -503,7 +503,7 @@ func startServer(config *server.Config) (*grpc.Server, net.Listener) { } peersUpdateManager := server.NewPeersUpdateManager(nil) eventStore := &activity.InMemoryEventStore{} - accountManager, err := server.BuildManager(store, peersUpdateManager, nil, "", "", + accountManager, err := server.BuildManager(store, peersUpdateManager, nil, "", "netbird.selfhosted", eventStore, nil, false) if err != nil { log.Fatalf("failed creating a manager: %v", err) diff --git a/management/server/nameserver_test.go b/management/server/nameserver_test.go index 3327869b4..d04ac1a20 100644 --- a/management/server/nameserver_test.go +++ b/management/server/nameserver_test.go @@ -759,7 +759,7 @@ func createNSManager(t *testing.T) (*DefaultAccountManager, error) { return nil, err } eventStore := &activity.InMemoryEventStore{} - return BuildManager(store, NewPeersUpdateManager(nil), nil, "", "", eventStore, nil, false) + return BuildManager(store, NewPeersUpdateManager(nil), nil, "", "netbird.selfhosted", eventStore, nil, false) } func createNSStore(t *testing.T) (Store, error) { diff --git a/management/server/route_test.go b/management/server/route_test.go index a5db2ca07..5a56eaa8b 100644 --- a/management/server/route_test.go +++ b/management/server/route_test.go @@ -1014,7 +1014,7 @@ func createRouterManager(t *testing.T) (*DefaultAccountManager, error) { return nil, err } eventStore := &activity.InMemoryEventStore{} - return BuildManager(store, NewPeersUpdateManager(nil), nil, "", "", eventStore, nil, false) + return BuildManager(store, NewPeersUpdateManager(nil), nil, "", "netbird.selfhosted", eventStore, nil, false) } func createRouterStore(t *testing.T) (Store, error) {