From 315837d4b49b245216c7e68f8183b72163991a78 Mon Sep 17 00:00:00 2001 From: Viktor Liu Date: Thu, 20 Aug 2026 21:38:11 +0200 Subject: [PATCH] Annotate legacy PeerIP usages in ACL tests and fix import formatting --- client/internal/acl/dispatch_test.go | 6 +++--- client/internal/acl/grouping_test.go | 8 ++++---- client/internal/acl/legacy_fallback_test.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/internal/acl/dispatch_test.go b/client/internal/acl/dispatch_test.go index 4e73b1a1a..be82e414f 100644 --- a/client/internal/acl/dispatch_test.go +++ b/client/internal/acl/dispatch_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "go.uber.org/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "github.com/netbirdio/netbird/client/firewall" fwmgr "github.com/netbirdio/netbird/client/firewall/manager" @@ -155,7 +155,7 @@ func TestDuplicateContentPoliciesShareOneRule(t *testing.T) { ruleA := &mgmProto.FirewallRule{ PolicyID: []byte("policy-A"), - PeerIP: "10.0.0.1", + PeerIP: "10.0.0.1", //nolint:staticcheck Direction: mgmProto.RuleDirection_IN, Action: mgmProto.RuleAction_ACCEPT, Protocol: mgmProto.RuleProtocol_TCP, @@ -163,7 +163,7 @@ func TestDuplicateContentPoliciesShareOneRule(t *testing.T) { } ruleB := &mgmProto.FirewallRule{ PolicyID: []byte("policy-B"), - PeerIP: "10.0.0.1", + PeerIP: "10.0.0.1", //nolint:staticcheck Direction: mgmProto.RuleDirection_IN, Action: mgmProto.RuleAction_ACCEPT, Protocol: mgmProto.RuleProtocol_TCP, diff --git a/client/internal/acl/grouping_test.go b/client/internal/acl/grouping_test.go index a4590509f..d6cf29b59 100644 --- a/client/internal/acl/grouping_test.go +++ b/client/internal/acl/grouping_test.go @@ -5,9 +5,9 @@ import ( "net/netip" "testing" - "go.uber.org/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "github.com/netbirdio/netbird/client/firewall" fwmgr "github.com/netbirdio/netbird/client/firewall/manager" @@ -134,7 +134,7 @@ func TestGroupPeerRulesMergesSameSelector(t *testing.T) { mk := func(peerIP string) *mgmProto.FirewallRule { return &mgmProto.FirewallRule{ PolicyID: []byte("policy-A"), - PeerIP: peerIP, + PeerIP: peerIP, //nolint:staticcheck Direction: mgmProto.RuleDirection_IN, Action: mgmProto.RuleAction_ACCEPT, Protocol: mgmProto.RuleProtocol_TCP, @@ -158,7 +158,7 @@ func TestGroupPeerRulesPortSeparates(t *testing.T) { mkPort := func(peerIP string, port uint32) *mgmProto.FirewallRule { return &mgmProto.FirewallRule{ PolicyID: []byte("policy-A"), - PeerIP: peerIP, + PeerIP: peerIP, //nolint:staticcheck Direction: mgmProto.RuleDirection_IN, Action: mgmProto.RuleAction_ACCEPT, Protocol: mgmProto.RuleProtocol_TCP, @@ -175,7 +175,7 @@ func TestGroupPeerRulesPortSeparates(t *testing.T) { rangeRule := &mgmProto.FirewallRule{ PolicyID: []byte("policy-A"), - PeerIP: "10.0.0.4", + PeerIP: "10.0.0.4", //nolint:staticcheck Direction: mgmProto.RuleDirection_IN, Action: mgmProto.RuleAction_ACCEPT, Protocol: mgmProto.RuleProtocol_TCP, diff --git a/client/internal/acl/legacy_fallback_test.go b/client/internal/acl/legacy_fallback_test.go index c22c0cf0a..00ca013f3 100644 --- a/client/internal/acl/legacy_fallback_test.go +++ b/client/internal/acl/legacy_fallback_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "go.uber.org/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "github.com/netbirdio/netbird/client/firewall" fwmgr "github.com/netbirdio/netbird/client/firewall/manager"