extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-12-13 10:21:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor group changes

Browse Source
This commit is contained in:
bcmmbaga 2024-07-19 10:51:05 +03:00
parent 3e76deaa87
commit a723c424f0
No known key found for this signature in database
GPG Key ID: 7249A19D20613553
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
management/server/group.go
View File

@ -165,7 +165,12 @@ func (am *DefaultAccountManager) SaveGroups(ctx context.Context, accountID, user
eventsToStore = append(eventsToStore, events...)
}
updateAccountPeers := areGroupChangesAffectPeers(account, newGroups)
newGroupIDs := make([]string, 0, len(newGroups))
for _, newGroup := range newGroups {
newGroupIDs = append(newGroupIDs, newGroup.ID)
}
updateAccountPeers := areGroupChangesAffectPeers(account, newGroupIDs)
if updateAccountPeers {
account.Network.IncSerial()
}
@ -324,7 +329,7 @@ func (am *DefaultAccountManager) GroupAddPeer(ctx context.Context, accountID, gr
group.Peers = append(group.Peers, peerID)
}
updateAccountPeers := areGroupChangesAffectPeers(account, []*nbgroup.Group{group})
updateAccountPeers := areGroupChangesAffectPeers(account, []string{group.ID})
if updateAccountPeers {
account.Network.IncSerial()
}
@ -355,7 +360,7 @@ func (am *DefaultAccountManager) GroupDeletePeer(ctx context.Context, accountID,
return status.Errorf(status.NotFound, "group with ID %s not found", groupID)
}
updateAccountPeers := areGroupChangesAffectPeers(account, []*nbgroup.Group{group})
updateAccountPeers := areGroupChangesAffectPeers(account, []string{group.ID})
if updateAccountPeers {
account.Network.IncSerial()
}
@ -376,15 +381,15 @@ func (am *DefaultAccountManager) GroupDeletePeer(ctx context.Context, accountID,
return nil
}
func areGroupChangesAffectPeers(account *Account, groups []*nbgroup.Group) bool {
for _, group := range groups {
if linked, _ := isGroupLinkedToDns(account.NameServerGroups, group.ID); linked {
func areGroupChangesAffectPeers(account *Account, groupIDs []string) bool {
for _, groupID := range groupIDs {
if linked, _ := isGroupLinkedToDns(account.NameServerGroups, groupID); linked {
return true
}
if linked, _ := isGroupLinkedToPolicy(account.Policies, group.ID); linked {
if linked, _ := isGroupLinkedToPolicy(account.Policies, groupID); linked {
return true
}
if linked, _ := isGroupLinkedToRoute(account.Routes, group.ID); linked {
if linked, _ := isGroupLinkedToRoute(account.Routes, groupID); linked {
return true
}
}