Skip to content

Commit a49371d

Browse files
committed
Fix linting issues
Signed-off-by: Nolan Brubaker <[email protected]>
1 parent 158fc75 commit a49371d

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

controllers/helpers_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ func mockedDescribeTargetGroupsCall(t *testing.T, m *mocks.MockELBV2APIMockRecor
323323
}
324324

325325
func mockedDescribeListenersCall(t *testing.T, m *mocks.MockELBV2APIMockRecorder) {
326+
t.Helper()
326327
m.DescribeListeners(gomock.Eq(&elbv2.DescribeListenersInput{
327328
LoadBalancerArn: lbArn,
328329
})).

pkg/cloud/services/elb/loadbalancer.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ func (s *Service) reconcileV2LB(lbSpec *infrav1.AWSLoadBalancerSpec) error {
153153
return errors.Wrapf(err, "failed to apply security groups to load balancer %q", lb.Name)
154154
}
155155
}
156-
157156
} else {
158157
s.scope.Trace("Unmanaged control plane load balancer, skipping load balancer configuration", "api-server-elb", lb)
159158
}
@@ -1591,7 +1590,7 @@ func (s *Service) reconcileTargetGroupsAndListeners(spec *infrav1.LoadBalancer,
15911590

15921591
var listener *elbv2.Listener
15931592
for _, l := range existingListeners.Listeners {
1594-
if l.DefaultActions != nil && l.DefaultActions[0].TargetGroupArn == group.TargetGroupArn {
1593+
if l.DefaultActions != nil && len(l.DefaultActions) > 0 && l.DefaultActions[0].TargetGroupArn == group.TargetGroupArn {
15951594
listener = l
15961595
}
15971596
}
@@ -1609,7 +1608,7 @@ func (s *Service) reconcileTargetGroupsAndListeners(spec *infrav1.LoadBalancer,
16091608
return createdTargetGroups, createdListeners, nil
16101609
}
16111610

1612-
// createListener creates a single Listener
1611+
// createListener creates a single Listener.
16131612
func (s *Service) createListener(ln infrav1.Listener, group *elbv2.TargetGroup, lbARN string, tags map[string]string) (*elbv2.Listener, error) {
16141613
listenerInput := &elbv2.CreateListenerInput{
16151614
DefaultActions: []*elbv2.Action{
@@ -1637,7 +1636,7 @@ func (s *Service) createListener(ln infrav1.Listener, group *elbv2.TargetGroup,
16371636
return listener.Listeners[0], nil
16381637
}
16391638

1640-
// createTargetGroup creates a single Target Group
1639+
// createTargetGroup creates a single Target Group.
16411640
func (s *Service) createTargetGroup(ln infrav1.Listener, tags map[string]string) (*elbv2.TargetGroup, error) {
16421641
targetGroupInput := &elbv2.CreateTargetGroupInput{
16431642
Name: aws.String(ln.TargetGroup.Name),

pkg/cloud/services/elb/loadbalancer_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2198,7 +2198,6 @@ func TestReconcileTargetGroupsAndListeners(t *testing.T) {
21982198
}
21992199

22002200
spec := tc.spec(*loadBalancerSpec)
2201-
//_, err := s.createLB(&spec, clusterScope.ControlPlaneLoadBalancer())
22022201
tgs, listeners, err := s.reconcileTargetGroupsAndListeners(&spec, clusterScope.ControlPlaneLoadBalancer())
22032202
tc.check(t, tgs, listeners, err)
22042203
})

0 commit comments

Comments
 (0)