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

fix get account equal

Browse Source
This commit is contained in:
pascal
2026-01-08 23:49:12 +01:00
parent 794976263e
commit cdfe0f3d41
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/server/store/sqlstore_bench_test.go
+14 -5
View File
@@ -90,6 +90,9 @@ func (s *SqlStore) GetAccountSlow(ctx context.Context, accountID string) (*types
account.Groups = make(map[string]*types.Group, len(account.GroupsG)) account.Groups = make(map[string]*types.Group, len(account.GroupsG))
for _, group := range account.GroupsG { for _, group := range account.GroupsG {
account.Groups[group.ID] = group.Copy() account.Groups[group.ID] = group.Copy()
if len(group.GroupUsers) == 0 {
account.Groups[group.ID] = nil
}
} }
account.GroupsG = nil account.GroupsG = nil
@@ -176,7 +179,8 @@ func (s *SqlStore) GetAccountGormOpt(ctx context.Context, accountID string) (*ty
pat.UserID = "" pat.UserID = ""
user.PATs[pat.ID] = &pat user.PATs[pat.ID] = &pat
} }
if user.AutoGroups == nil { user.LoadAutoGroups()
if len(user.AutoGroups) == 0 {
user.AutoGroups = []string{} user.AutoGroups = []string{}
user.Groups = []*types.GroupUser{} user.Groups = []*types.GroupUser{}
} }
@@ -193,6 +197,9 @@ func (s *SqlStore) GetAccountGormOpt(ctx context.Context, accountID string) (*ty
if group.Resources == nil { if group.Resources == nil {
group.Resources = []types.Resource{} group.Resources = []types.Resource{}
} }
if group.GroupUsers == nil {
group.GroupUsers = []types.GroupUser{}
}
account.Groups[group.ID] = group account.Groups[group.ID] = group
} }
account.GroupsG = nil account.GroupsG = nil
@@ -261,7 +268,7 @@ func setupBenchmarkDB(b testing.TB) (*SqlStore, func(), string) {
models := []interface{}{ models := []interface{}{
&types.Account{}, &types.SetupKey{}, &nbpeer.Peer{}, &types.User{}, &types.Account{}, &types.SetupKey{}, &nbpeer.Peer{}, &types.User{},
&types.PersonalAccessToken{}, &types.Group{}, &types.GroupPeer{}, &types.PersonalAccessToken{}, &types.Group{}, &types.GroupPeer{}, &types.GroupUser{},
&types.Policy{}, &types.PolicyRule{}, &route.Route{}, &types.Policy{}, &types.PolicyRule{}, &route.Route{},
&nbdns.NameServerGroup{}, &posture.Checks{}, &networkTypes.Network{}, &nbdns.NameServerGroup{}, &posture.Checks{}, &networkTypes.Network{},
&routerTypes.NetworkRouter{}, &resourceTypes.NetworkResource{}, &routerTypes.NetworkRouter{}, &resourceTypes.NetworkResource{},
@@ -611,10 +618,12 @@ func testAccountEquivalence(t *testing.T, expected, actual *types.Account) {
assert.Len(t, actual.Groups, len(expected.Groups), "Groups maps should have the same number of elements") assert.Len(t, actual.Groups, len(expected.Groups), "Groups maps should have the same number of elements")
for key, oldVal := range expected.Groups { for key, oldVal := range expected.Groups {
newVal, ok := actual.Groups[key] newVal, ok := actual.Groups[key]
if oldVal != nil && newVal != nil {
sort.Strings(oldVal.Peers)
sort.Strings(newVal.Peers)
assert.Equal(t, *oldVal, *newVal, "Group with ID '%s' should be equal", key)
}
assert.True(t, ok, "Group with ID '%s' should exist in new account", key) assert.True(t, ok, "Group with ID '%s' should exist in new account", key)
sort.Strings(oldVal.Peers)
sort.Strings(newVal.Peers)
assert.Equal(t, *oldVal, *newVal, "Group with ID '%s' should be equal", key)
} }
assert.Len(t, actual.Routes, len(expected.Routes), "Routes maps should have the same number of elements") assert.Len(t, actual.Routes, len(expected.Routes), "Routes maps should have the same number of elements")