Fixsed tests

Author: bigkraig

pkg/alb/rs/rule_test.go

@@ -354,6 +354,8 @@ func TestRuleReconcile(t *testing.T) {
 }
 
 func genTG(arn, svcname string) *tg.TargetGroup {
+	albelbv2.ELBV2svc = mockedELBV2{}
+
 	t, _ := tg.NewCurrentTargetGroup(&tg.NewCurrentTargetGroupOptions{
 		ALBNamePrefix:  "pfx",
 		LoadBalancerID: "nnnnn",
@@ -755,3 +757,7 @@ func (m mockedELBV2) ModifyRule(input *elbv2.ModifyRuleInput) (*elbv2.ModifyRule
 func (m mockedELBV2) DeleteRule(input *elbv2.DeleteRuleInput) (*elbv2.DeleteRuleOutput, error) {
 	return &m.DeleteRuleOutput, m.DeleteRuleError
 }
+
+func (m mockedELBV2) DescribeTargetGroupAttributesFiltered(s *string) (albelbv2.TargetGroupAttributes, error) {
+	return nil, nil
+}

pkg/annotations/annotations_test.go

@@ -184,21 +184,6 @@ func TestHealthcheckSecondsValidation(t *testing.T) {
 	}
 }
 
-// Should fail when idle timeout is not in range 1-3600. Should succeed otherwise.
-func TestConnectionIdleTimeoutValidation(t *testing.T) {
-	a := &Annotations{}
-
-	err := a.setConnectionIdleTimeout(map[string]string{connectionIdleTimeoutKey: "15"})
-	if err != nil || a.ConnectionIdleTimeout == aws.Int64(0) {
-		t.Error("Failed to set connection idle timeout when value was correct.")
-	}
-
-	err = a.setConnectionIdleTimeout(map[string]string{connectionIdleTimeoutKey: "3700"})
-	if err == nil {
-		t.Error("Succeeded setting connection idle timeout when value was incorrect")
-	}
-}
-
 func TestSetLoadBalancerAttributes(t *testing.T) {
 	var tests = []struct {
 		annotations map[string]string
@@ -299,7 +284,7 @@ func TestSetTargetGroupAttributes(t *testing.T) {
 	annotations := &Annotations{}
 	attributes := map[string]string{targetGroupAttributesKey: "deregistration_delay.timeout_seconds=60,stickiness.enabled=true"}
 	err := annotations.setTargetGroupAttributes(attributes)
-	if err != nil || len(annotations.TargetGroupAttributes) != 5 {
+	if err != nil || len(annotations.TargetGroupAttributes) != 2 {
 		t.Errorf("setTargetGroupAttributes - number of attributes incorrect")
 	}