sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-14 17:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

[management] Emit activity events for batch group ops (#8180)

Browse Source
This commit is contained in:
Bethuel Mmbaga
2026-10-13 13:04:10 +03:00
committed by GitHub
parent 10e34090fa
commit 49ec0e2699
2 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/server/group_test.go
+37 -2
View File
@@ -20,6 +20,7 @@ import (
nbdns "github.com/netbirdio/netbird/dns"
agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types"
rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service"
"github.com/netbirdio/netbird/management/server/activity"
"github.com/netbirdio/netbird/management/server/groups"
"github.com/netbirdio/netbird/management/server/networks"
"github.com/netbirdio/netbird/management/server/networks/resources"
@@ -77,6 +78,42 @@ func TestDefaultAccountManager_CreateGroup(t *testing.T) {
}
}
func TestDefaultAccountManager_BatchGroupChangesStoreEvents(t *testing.T) {
t.Setenv("NB_EVENT_ACTIVITY_LOG_ENABLED", "true")
am, _, err := createManager(t)
require.NoError(t, err)
_, account, err := initTestGroupAccount(am)
require.NoError(t, err)
group := &types.Group{ID: "grp-batch", Name: "Batch group", Issued: types.GroupIssuedAPI}
err = am.CreateGroups(context.Background(), account.Id, groupAdminUserID, []*types.Group{group})
require.NoError(t, err)
renamed := &types.Group{ID: group.ID, Name: "Batch group renamed", Issued: types.GroupIssuedAPI}
err = am.UpdateGroups(context.Background(), account.Id, groupAdminUserID, []*types.Group{renamed})
require.NoError(t, err)
hasEvent := func(code activity.Activity) bool {
events, err := am.eventStore.Get(context.Background(), account.Id, 0, 100, true)
if err != nil {
return false
}
for _, event := range events {
if event.Activity == code && event.TargetID == group.ID {
return true
}
}
return false
}
assert.Eventually(t, func() bool { return hasEvent(activity.GroupCreated) }, time.Second, 10*time.Millisecond,
"CreateGroups should store a group created event")
assert.Eventually(t, func() bool { return hasEvent(activity.GroupUpdated) }, time.Second, 10*time.Millisecond,
"UpdateGroups should store a group updated event on rename")
}
func TestDefaultAccountManager_DeleteGroup(t *testing.T) {
am, _, err := createManager(t)
if err != nil {
@@ -1085,7 +1122,6 @@ func Test_AddPeerToGroup(t *testing.T) {
errs <- fmt.Errorf("AddPeer failed for peer %d: %w", i, err)
return
}
}(i)
}
startTime := time.Now()
@@ -1142,7 +1178,6 @@ func Test_AddPeerToAll(t *testing.T) {
errs <- fmt.Errorf("AddPeer failed for peer %d: %w", i, err)
return
}
}(i)
}
startTime := time.Now()