tests(ingress): remove envoloping tests

Author: swarner1033

pkg/ingress/model_build_frontend_nlb_test.go

@@ -2,7 +2,6 @@ package ingress
 
 import (
 	"context"
-	"sort"
 	"testing"
 
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
@@ -1603,104 +1602,3 @@ func Test_defaultModelBuildTask_getFrontendNlbAttributes(t *testing.T) {
 		})
 	}
 }
-
-func Test_defaultModelBuildTask_buildFrontendNlbAttributes(t *testing.T) {
-	tests := []struct {
-		name           string
-		ingGroup       Group
-		wantAttributes []elbv2model.LoadBalancerAttribute
-		wantErr        bool
-		expectedErrMsg string
-	}{
-		{
-			name: "no attributes specified",
-			ingGroup: Group{
-				Members: []ClassifiedIngress{
-					{
-						Ing: &networking.Ingress{
-							ObjectMeta: metav1.ObjectMeta{
-								Name:      "ingress1",
-								Namespace: "default",
-							},
-						},
-					},
-				},
-			},
-			wantAttributes: []elbv2model.LoadBalancerAttribute{},
-			wantErr:        false,
-		},
-		{
-			name: "valid attributes conversion",
-			ingGroup: Group{
-				Members: []ClassifiedIngress{
-					{
-						Ing: &networking.Ingress{
-							ObjectMeta: metav1.ObjectMeta{
-								Name:      "ingress1",
-								Namespace: "default",
-								Annotations: map[string]string{
-									"alb.ingress.kubernetes.io/frontend-nlb-attributes": "dns_record.client_routing_policy=availability_zone_affinity,cross_zone.enabled=true",
-								},
-							},
-						},
-					},
-				},
-			},
-			wantAttributes: []elbv2model.LoadBalancerAttribute{
-				{Key: "cross_zone.enabled", Value: "true"},
-				{Key: "dns_record.client_routing_policy", Value: "availability_zone_affinity"},
-			},
-			wantErr: false,
-		},
-		{
-			name: "invalid DNS policy should cause error",
-			ingGroup: Group{
-				Members: []ClassifiedIngress{
-					{
-						Ing: &networking.Ingress{
-							ObjectMeta: metav1.ObjectMeta{
-								Name:      "ingress1",
-								Namespace: "default",
-								Annotations: map[string]string{
-									"alb.ingress.kubernetes.io/frontend-nlb-attributes": "dns_record.client_routing_policy=invalid_policy",
-								},
-							},
-						},
-					},
-				},
-			},
-			wantAttributes: []elbv2model.LoadBalancerAttribute{},
-			wantErr:        true,
-			expectedErrMsg: "invalid dns_record.client_routing_policy set in annotation",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			parser := annotations.NewSuffixAnnotationParser("alb.ingress.kubernetes.io")
-			task := &defaultModelBuildTask{
-				annotationParser: parser,
-				ingGroup:         tt.ingGroup,
-			}
-
-			gotAttributes, err := task.buildFrontendNlbAttributes()
-
-			if tt.wantErr {
-				assert.Error(t, err)
-				if tt.expectedErrMsg != "" {
-					assert.Contains(t, err.Error(), tt.expectedErrMsg)
-				}
-			} else {
-				assert.NoError(t, err)
-				// Sort both slices to ensure stable comparison
-				sort.Slice(gotAttributes, func(i, j int) bool {
-					return gotAttributes[i].Key < gotAttributes[j].Key
-				})
-				sort.Slice(tt.wantAttributes, func(i, j int) bool {
-					return tt.wantAttributes[i].Key < tt.wantAttributes[j].Key
-				})
-				assert.Equal(t, tt.wantAttributes, gotAttributes)
-			}
-		})
-	}
-}

pkg/service/model_build_load_balancer.go

@@ -26,11 +26,6 @@ import (
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_utils"
 )
 
-// Abstract this out??
-const (
-	resourceIDLoadBalancer = "LoadBalancer"
-)
-
 func (t *defaultModelBuildTask) buildLoadBalancer(ctx context.Context, scheme elbv2model.LoadBalancerScheme) error {
 	existingLB, err := t.fetchExistingLoadBalancer(ctx)
 	if err != nil {