sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-19 15:01:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Pascal Fischer
2025-07-03 18:10:00 +02:00
parent dfb47d5545
commit f2990e2fbc
4 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
management/server/account_test.go
View File

@@ -1240,9 +1240,10 @@ func TestAccountManager_NetworkUpdates_SavePolicy(t *testing.T) {
manager, account, peer1, peer2, _ := setupNetworkMapTest(t)
group := types.Group{
ID: "groupA",
Name: "GroupA",
Peers: []string{peer1.ID, peer2.ID},
AccountID: account.Id,
ID: "groupA",
Name: "GroupA",
Peers: []string{peer1.ID, peer2.ID},
}
if err := manager.SaveGroup(context.Background(), account.Id, userID, &group, true); err != nil {
t.Errorf("save group: %v", err)

79
management/server/peer_test.go
View File

@@ -1459,7 +1459,6 @@ func Test_RegisterPeerBySetupKey(t *testing.T) {
}
func Test_RegisterPeerRollbackOnFailure(t *testing.T) {
t.Setenv("NETBIRD_STORE_ENGINE", "postgres")
engine := os.Getenv("NETBIRD_STORE_ENGINE")
if engine == "sqlite" || engine == "" {
t.Skip("Skipping test because sqlite test store is not respecting foreign keys")
@@ -1766,47 +1765,47 @@ func TestPeerAccountPeersUpdate(t *testing.T) {
})
// Adding peer to unlinked group should not update account peers and not send peer update
// t.Run("adding peer to unlinked group", func(t *testing.T) {
// done := make(chan struct{})
// go func() {
// peerShouldNotReceiveUpdate(t, updMsg)
// close(done)
// }()
//
// key, err := wgtypes.GeneratePrivateKey()
// require.NoError(t, err)
//
// expectedPeerKey := key.PublicKey().String()
// peer4, _, _, err = manager.AddPeer(context.Background(), "", "regularUser1", &nbpeer.Peer{
// Key: expectedPeerKey,
// Meta: nbpeer.PeerSystemMeta{Hostname: expectedPeerKey},
// })
// require.NoError(t, err)
//
// select {
// case <-done:
// case <-time.After(time.Second):
// t.Error("timeout waiting for peerShouldNotReceiveUpdate")
// }
// })
t.Run("adding peer to unlinked group", func(t *testing.T) {
done := make(chan struct{})
go func() {
peerShouldReceiveUpdate(t, updMsg) //
close(done)
}()
key, err := wgtypes.GeneratePrivateKey()
require.NoError(t, err)
expectedPeerKey := key.PublicKey().String()
peer4, _, _, err = manager.AddPeer(context.Background(), "", "regularUser1", &nbpeer.Peer{
Key: expectedPeerKey,
Meta: nbpeer.PeerSystemMeta{Hostname: expectedPeerKey},
})
require.NoError(t, err)
select {
case <-done:
case <-time.After(time.Second):
t.Error("timeout waiting for peerShouldNotReceiveUpdate")
}
})
// Deleting peer with unlinked group should not update account peers and not send peer update
// t.Run("deleting peer with unlinked group", func(t *testing.T) {
// done := make(chan struct{})
// go func() {
// peerShouldNotReceiveUpdate(t, updMsg)
// close(done)
// }()
//
// err = manager.DeletePeer(context.Background(), account.Id, peer4.ID, userID)
// require.NoError(t, err)
//
// select {
// case <-done:
// case <-time.After(time.Second):
// t.Error("timeout waiting for peerShouldNotReceiveUpdate")
// }
// })
t.Run("deleting peer with unlinked group", func(t *testing.T) {
done := make(chan struct{})
go func() {
peerShouldNotReceiveUpdate(t, updMsg)
close(done)
}()
err = manager.DeletePeer(context.Background(), account.Id, peer4.ID, userID)
require.NoError(t, err)
select {
case <-done:
case <-time.After(time.Second):
t.Error("timeout waiting for peerShouldNotReceiveUpdate")
}
})
// Updating peer label should update account peers and send peer update
t.Run("updating peer label", func(t *testing.T) {

15
management/server/store/sql_store.go
View File

@@ -208,7 +208,7 @@ func (s *SqlStore) SaveAccount(ctx context.Context, account *types.Account) erro
result = tx.
Session(&gorm.Session{FullSaveAssociations: true}).
// Clauses(clause.OnConflict{UpdateAll: true}).
Clauses(clause.OnConflict{UpdateAll: true}).
Create(account)
if result.Error != nil {
return result.Error
@@ -459,6 +459,10 @@ func (s *SqlStore) SaveGroups(ctx context.Context, lockStrength LockingStrength,
return nil
}
for _, g := range groups {
g.StoreGroupPeers()
}
return s.db.Transaction(func(tx *gorm.DB) error {
result := tx.
Clauses(
@@ -1773,6 +1777,15 @@ func (s *SqlStore) GetGroupByName(ctx context.Context, lockStrength LockingStren
// we may need to reconsider changing the types.
query := tx.Preload(clause.Associations)
switch s.storeEngine {
case types.PostgresStoreEngine:
query = query.Order("json_array_length(peers::json) DESC")
case types.MysqlStoreEngine:
query = query.Order("JSON_LENGTH(JSON_EXTRACT(peers, \"$\")) DESC")
default:
query = query.Order("json_array_length(peers) DESC")
}
result := query.First(&group, "account_id = ? AND name = ?", accountID, groupName)
if err := result.Error; err != nil {
if errors.Is(result.Error, gorm.ErrRecordNotFound) {

1
management/server/store/sql_store_test.go
View File

@@ -2615,7 +2615,6 @@ func TestSqlStore_AddPeerToAccount(t *testing.T) {
}
func TestSqlStore_GetPeerGroups(t *testing.T) {
t.Setenv("NETBIRD_STORE_ENGINE", "postgres")
store, cleanup, err := NewTestStoreFromSQL(context.Background(), "../testdata/store_policy_migrate.sql", t.TempDir())
t.Cleanup(cleanup)
require.NoError(t, err)