refactor(service): move attribute slice func to shared utils

Author: swarner1033

pkg/ingress/model_build_frontend_nlb.go

@@ -238,14 +238,20 @@ func (t *defaultModelBuildTask) buildFrontendNlbSpec(ctx context.Context, scheme
 		return elbv2model.LoadBalancerSpec{}, err
 	}
 
+	lbAttributes, err := t.buildFrontendNlbAttributes(ctx)
+	if err != nil {
+		return elbv2model.LoadBalancerSpec{}, err
+	}
+
 	spec := elbv2model.LoadBalancerSpec{
-		Name:           name,
-		Type:           elbv2model.LoadBalancerTypeNetwork,
-		Scheme:         scheme,
-		IPAddressType:  alb.Spec.IPAddressType,
-		SecurityGroups: securityGroups,
-		SubnetMappings: subnetMappings,
-		Tags:           tags,
+		Name:                   name,
+		Type:                   elbv2model.LoadBalancerTypeNetwork,
+		Scheme:                 scheme,
+		IPAddressType:          alb.Spec.IPAddressType,
+		LoadBalancerAttributes: lbAttributes,
+		SecurityGroups:         securityGroups,
+		SubnetMappings:         subnetMappings,
+		Tags:                   tags,
 	}
 
 	return spec, nil

pkg/service/model_build_load_balancer.go

@@ -7,8 +7,6 @@ import (
 	"fmt"
 	"net/netip"
 	"regexp"
-	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
-	"sort"
 	"strconv"
 
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
@@ -24,6 +22,8 @@ import (
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/model/core"
 	elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/networking"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_utils"
 )
 
 const (
@@ -497,7 +497,7 @@ func (t *defaultModelBuildTask) buildLoadBalancerAttributes(_ context.Context) (
 		return []elbv2model.LoadBalancerAttribute{}, err
 	}
 	mergedAttributes := algorithm.MergeStringMap(specificAttributes, loadBalancerAttributes)
-	return makeAttributesSliceFromMap(mergedAttributes), nil
+	return shared_utils.MakeAttributesSliceFromMap(mergedAttributes), nil
 }
 
 func (t *defaultModelBuildTask) buildLoadBalancerMinimumCapacity(_ context.Context) (*elbv2model.MinimumLoadBalancerCapacity, error) {
@@ -527,20 +527,6 @@ func (t *defaultModelBuildTask) buildLoadBalancerMinimumCapacity(_ context.Conte
 	return minimumLoadBalancerCapacity, nil
 }
 
-func makeAttributesSliceFromMap(loadBalancerAttributesMap map[string]string) []elbv2model.LoadBalancerAttribute {
-	attributes := make([]elbv2model.LoadBalancerAttribute, 0, len(loadBalancerAttributesMap))
-	for attrKey, attrValue := range loadBalancerAttributesMap {
-		attributes = append(attributes, elbv2model.LoadBalancerAttribute{
-			Key:   attrKey,
-			Value: attrValue,
-		})
-	}
-	sort.Slice(attributes, func(i, j int) bool {
-		return attributes[i].Key < attributes[j].Key
-	})
-	return attributes
-}
-
 func (t *defaultModelBuildTask) getLoadBalancerAttributes() (map[string]string, error) {
 	var attributes map[string]string
 	if _, err := t.annotationParser.ParseStringMapAnnotation(annotations.SvcLBSuffixLoadBalancerAttributes, &attributes, t.service.Annotations); err != nil {

pkg/service/model_build_target_group.go

@@ -10,6 +10,8 @@ import (
 	"strconv"
 	"strings"
 
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
+
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"

pkg/shared_utils/attribute_utils_test.go

@@ -0,0 +1,70 @@
+package shared_utils
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
+)
+
+func TestMakeLoadBalancerAttributeSliceFromMap(t *testing.T) {
+	tests := []struct {
+		name         string
+		attributeMap map[string]string
+		expected     []elbv2model.LoadBalancerAttribute
+	}{
+		{
+			name:         "empty map",
+			attributeMap: map[string]string{},
+			expected:     []elbv2model.LoadBalancerAttribute{},
+		},
+		{
+			name:         "single attribute",
+			attributeMap: map[string]string{"key1": "value1"},
+			expected:     []elbv2model.LoadBalancerAttribute{{Key: "key1", Value: "value1"}},
+		},
+		{
+			name:         "multiple attributes",
+			attributeMap: map[string]string{"key2": "value2", "key1": "value1", "key3": "value3"},
+			expected: []elbv2model.LoadBalancerAttribute{
+				{Key: "key1", Value: "value1"},
+				{Key: "key2", Value: "value2"},
+				{Key: "key3", Value: "value3"},
+			},
+		},
+		{
+			name:         "attributes with special characters",
+			attributeMap: map[string]string{"key-with-dash": "value with spaces", "key_with_underscore": "value=with=equals"},
+			expected: []elbv2model.LoadBalancerAttribute{
+				{Key: "key-with-dash", Value: "value with spaces"},
+				{Key: "key_with_underscore", Value: "value=with=equals"},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := MakeLoadBalancerAttributeSliceFromMap(tt.attributeMap)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestMakeLoadBalancerAttributeSliceFromMap_Sorting(t *testing.T) {
+	// Test that attributes are properly sorted by key
+	attributeMap := map[string]string{
+		"zebra":  "last",
+		"apple":  "first",
+		"banana": "middle",
+	}
+
+	result := MakeLoadBalancerAttributeSliceFromMap(attributeMap)
+
+	expected := []elbv2model.LoadBalancerAttribute{
+		{Key: "apple", Value: "first"},
+		{Key: "banana", Value: "middle"},
+		{Key: "zebra", Value: "last"},
+	}
+
+	assert.Equal(t, expected, result)
+}

pkg/shared_utils/model_build_utils.go

@@ -0,0 +1,20 @@
+package shared_utils
+
+import (
+	"sort"
+	elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
+)
+
+func MakeAttributesSliceFromMap(loadBalancerAttributesMap map[string]string) []elbv2model.LoadBalancerAttribute {
+	attributes := make([]elbv2model.LoadBalancerAttribute, 0, len(loadBalancerAttributesMap))
+	for attrKey, attrValue := range loadBalancerAttributesMap {
+		attributes = append(attributes, elbv2model.LoadBalancerAttribute{
+			Key:   attrKey,
+			Value: attrValue,
+		})
+	}
+	sort.Slice(attributes, func(i, j int) bool {
+		return attributes[i].Key < attributes[j].Key
+	})
+	return attributes
+}