extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-15 09:42:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix test compilation errors

Browse Source
This commit is contained in:
braginini
2024-04-17 17:27:23 +02:00
parent 38e10af2d9
commit 83dfe8e3a3
11 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
management/server/http/accounts_handler_test.go
View File

@ -54,7 +54,7 @@ func initAccountsTestData(account *server.Account, admin *server.User) *Accounts
func TestAccounts_AccountsHandler(t *testing.T) { func TestAccounts_AccountsHandler(t *testing.T) {
accountID := "test_account" accountID := "test_account"
adminUser := server.NewAdminUser("test_user") adminUser := server.NewAdminUser("test_user", "account_id")
sr := func(v string) *string { return &v } sr := func(v string) *string { return &v }
br := func(v bool) *bool { return &v } br := func(v bool) *bool { return &v }

2
management/server/http/dns_settings_handler_test.go
View File

@ -34,7 +34,7 @@ var testingDNSSettingsAccount = &server.Account{
Id: testDNSSettingsAccountID, Id: testDNSSettingsAccountID,
Domain: "hotmail.com", Domain: "hotmail.com",
Users: map[string]*server.User{ Users: map[string]*server.User{
testDNSSettingsUserID: server.NewAdminUser("test_user"), testDNSSettingsUserID: server.NewAdminUser("test_user", "account_id"),
}, },
DNSSettings: baseExistingDNSSettings, DNSSettings: baseExistingDNSSettings,
} }

2
management/server/http/events_handler_test.go
View File

@ -196,7 +196,7 @@ func TestEvents_GetEvents(t *testing.T) {
}, },
} }
accountID := "test_account" accountID := "test_account"
adminUser := server.NewAdminUser("test_user") adminUser := server.NewAdminUser("test_user", "account_id")
events := generateEvents(accountID, adminUser.Id) events := generateEvents(accountID, adminUser.Id)
handler := initEventsTestData(accountID, adminUser, events...) handler := initEventsTestData(accountID, adminUser, events...)

2
management/server/http/geolocation_handler_test.go
View File

@ -42,7 +42,7 @@ func initGeolocationTestData(t *testing.T) *GeolocationsHandler {
return &GeolocationsHandler{ return &GeolocationsHandler{
accountManager: &mock_server.MockAccountManager{ accountManager: &mock_server.MockAccountManager{
GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) { GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) {
user := server.NewAdminUser("test_user") user := server.NewAdminUser("test_user", "account_id")
return &server.Account{ return &server.Account{
Id: claims.AccountId, Id: claims.AccountId,
Users: map[string]*server.User{ Users: map[string]*server.User{

6
management/server/http/groups_handler_test.go
View File

@ -124,7 +124,7 @@ func TestGetGroup(t *testing.T) {
Name: "Group", Name: "Group",
} }
adminUser := server.NewAdminUser("test_user") adminUser := server.NewAdminUser("test_user", "account_id")
p := initGroupTestData(adminUser, group) p := initGroupTestData(adminUser, group)
for _, tc := range tt { for _, tc := range tt {
@ -246,7 +246,7 @@ func TestWriteGroup(t *testing.T) {
}, },
} }
adminUser := server.NewAdminUser("test_user") adminUser := server.NewAdminUser("test_user", "account_id")
p := initGroupTestData(adminUser) p := initGroupTestData(adminUser)
for _, tc := range tt { for _, tc := range tt {
@ -324,7 +324,7 @@ func TestDeleteGroup(t *testing.T) {
}, },
} }
adminUser := server.NewAdminUser("test_user") adminUser := server.NewAdminUser("test_user", "account_id")
p := initGroupTestData(adminUser) p := initGroupTestData(adminUser)
for _, tc := range tt { for _, tc := range tt {

2
management/server/http/nameservers_handler_test.go
View File

@ -32,7 +32,7 @@ var testingNSAccount = &server.Account{
Id: testNSGroupAccountID, Id: testNSGroupAccountID,
Domain: "hotmail.com", Domain: "hotmail.com",
Users: map[string]*server.User{ Users: map[string]*server.User{
"test_user": server.NewAdminUser("test_user"), "test_user": server.NewAdminUser("test_user", "account_id"),
}, },
} }

2
management/server/http/peers_handler_test.go
View File

@ -59,7 +59,7 @@ func initTestMetaData(peers ...*nbpeer.Peer) *PeersHandler {
return "netbird.selfhosted" return "netbird.selfhosted"
}, },
GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) { GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) {
user := server.NewAdminUser("test_user") user := server.NewAdminUser("test_user", "account_id")
return &server.Account{ return &server.Account{
Id: claims.AccountId, Id: claims.AccountId,
Domain: "hotmail.com", Domain: "hotmail.com",

2
management/server/http/policies_handler_test.go
View File

@ -45,7 +45,7 @@ func initPoliciesTestData(policies ...*server.Policy) *Policies {
return nil return nil
}, },
GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) { GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) {
user := server.NewAdminUser("test_user") user := server.NewAdminUser("test_user", "account_id")
return &server.Account{ return &server.Account{
Id: claims.AccountId, Id: claims.AccountId,
Domain: "hotmail.com", Domain: "hotmail.com",

2
management/server/http/posture_checks_handler_test.go
View File

@ -62,7 +62,7 @@ func initPostureChecksTestData(postureChecks ...*posture.Checks) *PostureChecksH
return accountPostureChecks, nil return accountPostureChecks, nil
}, },
GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) { GetAccountFromTokenFunc: func(claims jwtclaims.AuthorizationClaims) (*server.Account, *server.User, error) {
user := server.NewAdminUser("test_user") user := server.NewAdminUser("test_user", "account_id")
return &server.Account{ return &server.Account{
Id: claims.AccountId, Id: claims.AccountId,
Users: map[string]*server.User{ Users: map[string]*server.User{

2
management/server/http/routes_handler_test.go
View File

@ -75,7 +75,7 @@ var testingAccount = &server.Account{
}, },
}, },
Users: map[string]*server.User{ Users: map[string]*server.User{
"test_user": server.NewAdminUser("test_user"), "test_user": server.NewAdminUser("test_user", "account_id"),
}, },
} }

2
management/server/http/setupkeys_handler_test.go
View File

@ -97,7 +97,7 @@ func TestSetupKeysHandlers(t *testing.T) {
defaultSetupKey := server.GenerateDefaultSetupKey() defaultSetupKey := server.GenerateDefaultSetupKey()
defaultSetupKey.Id = existingSetupKeyID defaultSetupKey.Id = existingSetupKeyID
adminUser := server.NewAdminUser("test_user") adminUser := server.NewAdminUser("test_user", "account_id")
newSetupKey := server.GenerateSetupKey(newSetupKeyName, server.SetupKeyReusable, 0, []string{"group-1"}, newSetupKey := server.GenerateSetupKey(newSetupKeyName, server.SetupKeyReusable, 0, []string{"group-1"},
server.SetupKeyUnlimitedUsage, true) server.SetupKeyUnlimitedUsage, true)