Created a NewCurrentRules and moved it into NewCurrentListener instead of some logic inside of NewCurrentListeners

Author: bigkraig

pkg/alb/ls/listener.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/elbv2"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/rs"
+	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
@@ -52,16 +53,27 @@ func NewDesiredListener(o *NewDesiredListenerOptions) *Listener {
 }
 
 type NewCurrentListenerOptions struct {
-	Listener *elbv2.Listener
-	Logger   *log.Logger
+	Listener     *elbv2.Listener
+	Logger       *log.Logger
+	TargetGroups tg.TargetGroups
 }
 
 // NewCurrentListener returns a new listener.Listener based on an elbv2.Listener.
-func NewCurrentListener(o *NewCurrentListenerOptions) *Listener {
+func NewCurrentListener(o *NewCurrentListenerOptions) (*Listener, error) {
+	rules, err := rs.NewCurrentRules(&rs.NewCurrentRulesOptions{
+		ListenerArn:  o.Listener.ListenerArn,
+		Logger:       o.Logger,
+		TargetGroups: o.TargetGroups,
+	})
+	if err != nil {
+		return nil, err
+	}
+
 	return &Listener{
 		ls:     ls{current: o.Listener},
 		logger: o.Logger,
-	}
+		rules:  rules,
+	}, nil
 }
 
 // Reconcile compares the current and desired state of this Listener instance. Comparison

pkg/alb/ls/listeners.go

@@ -1,17 +1,13 @@
 package ls
 
 import (
-	"fmt"
-
-	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/aws/aws-sdk-go/service/elbv2"
 
 	extensions "k8s.io/api/extensions/v1beta1"
 
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/rs"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
-	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
 )
 
@@ -74,33 +70,15 @@ func NewCurrentListeners(o *NewCurrentListenersOptions) (Listeners, error) {
 	var output Listeners
 
 	for _, l := range o.Listeners {
-		o.Logger.Infof("Fetching Rules for Listener %s", *l.ListenerArn)
-		rules, err := albelbv2.ELBV2svc.DescribeRules(&elbv2.DescribeRulesInput{ListenerArn: l.ListenerArn})
+		newListener, err := NewCurrentListener(&NewCurrentListenerOptions{
+			Listener:     l,
+			Logger:       o.Logger,
+			TargetGroups: o.TargetGroups,
+		})
 		if err != nil {
 			return nil, err
 		}
 
-		newListener := NewCurrentListener(&NewCurrentListenerOptions{
-			Listener: l,
-			Logger:   o.Logger,
-		})
-
-		for _, r := range rules.Rules {
-			// TODO LOOKUP svcName based on TG
-			i, tg := o.TargetGroups.FindCurrentByARN(*r.Actions[0].TargetGroupArn)
-			if i < 0 {
-				return nil, fmt.Errorf("failed to find a target group associated with a rule. This should not be possible. Rule: %s", awsutil.Prettify(r.RuleArn))
-			}
-			o.Logger.Debugf("Assembling rule for: %s", log.Prettify(r.Conditions))
-			newRule := rs.NewCurrentRule(&rs.NewCurrentRuleOptions{
-				SvcName: tg.SvcName,
-				Rule:    r,
-				Logger:  o.Logger,
-			})
-
-			newListener.rules = append(newListener.rules, newRule)
-		}
-
 		output = append(output, newListener)
 	}
 	return output, nil

pkg/alb/rs/rules.go

@@ -4,13 +4,49 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/service/elbv2"
 
 	extensions "k8s.io/api/extensions/v1beta1"
 
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
+	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
 )
 
+type NewCurrentRulesOptions struct {
+	ListenerArn  *string
+	Logger       *log.Logger
+	TargetGroups tg.TargetGroups
+}
+
+// NewCurrentRules
+func NewCurrentRules(o *NewCurrentRulesOptions) (Rules, error) {
+	var rs Rules
+
+	o.Logger.Infof("Fetching Rules for Listener %s", *o.ListenerArn)
+	rules, err := albelbv2.ELBV2svc.DescribeRules(&elbv2.DescribeRulesInput{ListenerArn: o.ListenerArn})
+	if err != nil {
+		return nil, err
+	}
+
+	for _, r := range rules.Rules {
+		// TODO LOOKUP svcName based on TG
+		i, tg := o.TargetGroups.FindCurrentByARN(*r.Actions[0].TargetGroupArn)
+		if i < 0 {
+			return nil, fmt.Errorf("failed to find a target group associated with a rule. This should not be possible. Rule: %s", awsutil.Prettify(r.RuleArn))
+		}
+
+		newRule := NewCurrentRule(&NewCurrentRuleOptions{
+			SvcName: tg.SvcName,
+			Rule:    r,
+			Logger:  o.Logger,
+		})
+
+		rs = append(rs, newRule)
+	}
+	return rs, nil
+}
+
 type NewDesiredRulesOptions struct {
 	Priority         int
 	Logger           *log.Logger