lint

Author: AshleyDumaine

internal/controller/linodefirewall_controller_helpers.go

@@ -37,7 +37,7 @@ var (
 
 func findObjectsForAddressSet(logger logr.Logger, tracedClient client.Client) handler.MapFunc {
 	logger = logger.WithName("LinodeFirewallReconciler").WithName("findObjectsForAddressSet")
-	return func(ctx context.Context, o client.Object) []ctrl.Request {
+	return func(ctx context.Context, obj client.Object) []ctrl.Request {
 		ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout)
 		defer cancel()
 
@@ -62,7 +62,7 @@ func findObjectsForAddressSet(logger logr.Logger, tracedClient client.Client) ha
 		for _, item := range firewalls.Items {
 			for _, inboundRule := range item.Spec.InboundRules {
 				for _, addrSetRef := range inboundRule.AddressSetRefs {
-					if addrSetRef.Name == o.GetName() && addrSetRef.Namespace == o.GetNamespace() {
+					if addrSetRef.Name == obj.GetName() && addrSetRef.Namespace == obj.GetNamespace() {
 						requestSet[reconcile.Request{
 							NamespacedName: types.NamespacedName{
 								Name:      item.GetName(),
@@ -74,7 +74,7 @@ func findObjectsForAddressSet(logger logr.Logger, tracedClient client.Client) ha
 			}
 			for _, outboundRule := range item.Spec.OutboundRules {
 				for _, addrSetRef := range outboundRule.AddressSetRefs {
-					if addrSetRef.Name == o.GetName() && addrSetRef.Namespace == o.GetNamespace() {
+					if addrSetRef.Name == obj.GetName() && addrSetRef.Namespace == obj.GetNamespace() {
 						requestSet[reconcile.Request{
 							NamespacedName: types.NamespacedName{
 								Name:      item.GetName(),

internal/controller/linodefirewall_controller_helpers_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/linode/linodego"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	infrav1alpha2 "github.com/linode/cluster-api-provider-linode/api/v1alpha2"
 )
@@ -535,7 +536,7 @@ func TestProcessInboundRule(t *testing.T) {
 			logger := logr.Logger{}
 			for _, rule := range tt.firewall.Spec.InboundRules {
 				err := processInboundRule(context.Background(), k8sClient, logger, rule, tt.firewall, tt.createOpts)
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				if !reflect.DeepEqual(tt.createOpts, tt.want) {
 					t.Errorf("processInboundRule() = %v, want %v", tt.createOpts, tt.want)
 				}
@@ -605,7 +606,7 @@ func TestProcessOutboundRule(t *testing.T) {
 			logger := logr.Logger{}
 			for _, rule := range tt.firewall.Spec.OutboundRules {
 				err := processOutboundRule(context.Background(), k8sClient, logger, rule, tt.firewall, tt.createOpts)
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				if !reflect.DeepEqual(tt.createOpts, tt.want) {
 					t.Errorf("processOutboundRule() = %v, want %v", tt.createOpts, tt.want)
 				}