From ec3edde9cbe17e9c1855e6959651c0a5bb2adbb4 Mon Sep 17 00:00:00 2001
From: pascal <pascal@netbird.io>
Date: Tue, 9 Jun 2026 21:04:08 +0200
Subject: [PATCH] fix linter issues

---
 management/server/affectedpeers/resolver.go | 52 ++++++++++++++-------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/management/server/affectedpeers/resolver.go b/management/server/affectedpeers/resolver.go
index 7309de37b..4ef986345 100644
--- a/management/server/affectedpeers/resolver.go
+++ b/management/server/affectedpeers/resolver.go
@@ -66,37 +66,57 @@ func (snap *Snapshot) loadCollections(ctx context.Context, s store.Store, accoun
 	// the resource<->router bridge can fire for any of these
 	needsRoutersResources := hasGroupOrPeerChange || len(c.PostureCheckIDs) > 0 || len(c.Policies) > 0 || hasNetworkObject
 
-	var err error
 	if needsRoutersResources {
-		if snap.policies, err = s.GetAccountPolicies(ctx, store.LockingStrengthNone, accountID); err != nil {
-			return err
-		}
-		if snap.routers, err = s.GetNetworkRoutersByAccountID(ctx, store.LockingStrengthNone, accountID); err != nil {
-			return err
-		}
-		if snap.resources, err = s.GetNetworkResourcesByAccountID(ctx, store.LockingStrengthNone, accountID); err != nil {
+		if err := snap.loadPolicyRoutersResources(ctx, s, accountID); err != nil {
 			return err
 		}
 	}
 	if hasGroupOrPeerChange {
-		if snap.routes, err = s.GetAccountRoutes(ctx, store.LockingStrengthNone, accountID); err != nil {
-			return err
-		}
-		if err = snap.loadProxyServices(ctx, s, accountID); err != nil {
+		if err := snap.loadRoutesAndProxy(ctx, s, accountID); err != nil {
 			return err
 		}
 	}
 	if len(c.ChangedGroupIDs) > 0 || len(c.ChangedPeerIDs) > 0 {
-		if snap.nsGroups, err = s.GetAccountNameServerGroups(ctx, store.LockingStrengthNone, accountID); err != nil {
-			return err
-		}
-		if snap.dnsSettings, err = s.GetAccountDNSSettings(ctx, store.LockingStrengthNone, accountID); err != nil {
+		if err := snap.loadDNS(ctx, s, accountID); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
+// loadPolicyRoutersResources loads the policies plus the routers and resources
+// the resource<->router bridge walks.
+func (snap *Snapshot) loadPolicyRoutersResources(ctx context.Context, s store.Store, accountID string) error {
+	var err error
+	if snap.policies, err = s.GetAccountPolicies(ctx, store.LockingStrengthNone, accountID); err != nil {
+		return err
+	}
+	if snap.routers, err = s.GetNetworkRoutersByAccountID(ctx, store.LockingStrengthNone, accountID); err != nil {
+		return err
+	}
+	snap.resources, err = s.GetNetworkResourcesByAccountID(ctx, store.LockingStrengthNone, accountID)
+	return err
+}
+
+// loadRoutesAndProxy loads the routes and the embedded-proxy services index.
+func (snap *Snapshot) loadRoutesAndProxy(ctx context.Context, s store.Store, accountID string) error {
+	var err error
+	if snap.routes, err = s.GetAccountRoutes(ctx, store.LockingStrengthNone, accountID); err != nil {
+		return err
+	}
+	return snap.loadProxyServices(ctx, s, accountID)
+}
+
+// loadDNS loads the nameserver groups and account DNS settings.
+func (snap *Snapshot) loadDNS(ctx context.Context, s store.Store, accountID string) error {
+	var err error
+	if snap.nsGroups, err = s.GetAccountNameServerGroups(ctx, store.LockingStrengthNone, accountID); err != nil {
+		return err
+	}
+	snap.dnsSettings, err = s.GetAccountDNSSettings(ctx, store.LockingStrengthNone, accountID)
+	return err
+}
+
 // loadProxyServices loads the embedded-proxy cluster index, and the services only
 // when the account actually has embedded proxy peers.
 func (snap *Snapshot) loadProxyServices(ctx context.Context, s store.Store, accountID string) error {