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:41:49 +02:00
parent f2990e2fbc
commit 982b9604ee
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,11 +479,14 @@ func (s *SqlStore) SaveGroups(ctx context.Context, lockStrength LockingStrength,
}
for _, g := range groups {
if err := tx.Model(&g).
Association("GroupPeers").
Replace(g.GroupPeers); err != nil {
log.WithContext(ctx).Errorf("failed to save group peers to store: %s", err)
return status.Errorf(status.Internal, "failed to save group peers to store")
if len(g.GroupPeers) == 0 {
if err := tx.Model(&g).Association("GroupPeers").Clear(); err != nil {
return status.Errorf(status.Internal, "failed to clear group peers: %s", err)
}
} else {
if err := tx.Model(&g).Association("GroupPeers").Replace(g.GroupPeers); err != nil {
return status.Errorf(status.Internal, "failed to save group peers: %s", err)
}
}
}
@@ -1834,9 +1837,14 @@ func (s *SqlStore) SaveGroup(ctx context.Context, lockStrength LockingStrength,
return status.Errorf(status.Internal, "failed to save group to store")
}
if err := s.db.Model(group).Association("GroupPeers").Replace(group.GroupPeers); err != nil {
log.WithContext(ctx).Errorf("failed to replace peers for group %s: %v", group.ID, err)
return status.Errorf(status.Internal, "failed to sync group peers")
if len(group.GroupPeers) == 0 {
if err := s.db.Model(&group).Association("GroupPeers").Clear(); err != nil {
return status.Errorf(status.Internal, "failed to clear group peers: %s", err)
}
} else {
if err := s.db.Model(&group).Association("GroupPeers").Replace(group.GroupPeers); err != nil {
return status.Errorf(status.Internal, "failed to save group peers: %s", err)
}
}
return nil

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

@@ -1340,11 +1340,12 @@ func TestSqlStore_SaveGroup(t *testing.T) {
accountID := "bf1c8084-ba50-4ce7-9439-34653001fc3b"
group := &types.Group{
ID: "group-id",
AccountID: accountID,
Issued: "api",
Peers: []string{"peer1", "peer2"},
Resources: []types.Resource{},
ID: "group-id",
AccountID: accountID,
Issued: "api",
Peers: []string{"peer1", "peer2"},
Resources: []types.Resource{},
GroupPeers: []types.GroupPeer{},
}
err = store.SaveGroup(context.Background(), LockingStrengthUpdate, group)
require.NoError(t, err)