refactor duplicated icmp values

Author: zac-nixon

pkg/gateway/model/model_build_loadbalancer.go

@@ -15,15 +15,7 @@ import (
 var invalidLoadBalancerNamePattern = regexp.MustCompile("[[:^alnum:]]")
 
 const (
-	lbAttrsAccessLogsS3Enabled                 = "access_logs.s3.enabled"
-	lbAttrsAccessLogsS3Bucket                  = "access_logs.s3.bucket"
-	lbAttrsAccessLogsS3Prefix                  = "access_logs.s3.prefix"
-	lbAttrsLoadBalancingCrossZoneEnabled       = "load_balancing.cross_zone.enabled"
-	lbAttrsLoadBalancingDnsClientRoutingPolicy = "dns_record.client_routing_policy"
-	availabilityZoneAffinity                   = "availability_zone_affinity"
-	partialAvailabilityZoneAffinity            = "partial_availability_zone_affinity"
-	anyAvailabilityZone                        = "any_availability_zone"
-	resourceIDLoadBalancer                     = "LoadBalancer"
+	resourceIDLoadBalancer = "LoadBalancer"
 )
 
 type loadBalancerBuilder interface {

pkg/gateway/model/model_build_security_group.go

@@ -19,6 +19,7 @@ import (
 	ec2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/ec2"
 	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"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 	"strings"
 )
@@ -28,16 +29,9 @@ var (
 )
 
 const (
-	icmpv4Protocol = "icmp"
-	icmpv6Protocol = "icmpv6"
-
-	icmpv4TypeForPathMtu = 3 // https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-codes-3
-	icmpv4CodeForPathMtu = 4
-
-	icmpv6TypeForPathMtu = 2 // https://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xhtml#icmpv6-parameters-codes-2
-	icmpv6CodeForPathMtu = 0
-
 	resourceIDManagedSecurityGroup = "ManagedLBSecurityGroup"
+
+	managedSGDescription = "[k8s] Managed SecurityGroup for LoadBalancer"
 )
 
 type securityGroupOutput struct {
@@ -161,7 +155,7 @@ func (builder *securityGroupBuilderImpl) buildManagedSecurityGroup(stack core.St
 	ingressPermissions := builder.buildManagedSecurityGroupIngressPermissions(lbConf, routes, ipAddressType)
 	return ec2model.NewSecurityGroup(stack, resourceIDManagedSecurityGroup, ec2model.SecurityGroupSpec{
 		GroupName:   name,
-		Description: "[k8s] Managed SecurityGroup for LoadBalancer",
+		Description: managedSGDescription,
 		Tags:        tags,
 		Ingress:     ingressPermissions,
 	}), nil
@@ -223,9 +217,9 @@ func (builder *securityGroupBuilderImpl) buildManagedSecurityGroupIngressPermiss
 
 					if enableICMP {
 						permissions = append(permissions, ec2model.IPPermission{
-							IPProtocol: icmpv4Protocol,
-							FromPort:   awssdk.Int32(icmpv4TypeForPathMtu),
-							ToPort:     awssdk.Int32(icmpv4CodeForPathMtu),
+							IPProtocol: shared_constants.ICMPV4Protocol,
+							FromPort:   awssdk.Int32(shared_constants.ICMPV4TypeForPathMtu),
+							ToPort:     awssdk.Int32(shared_constants.ICMPV4CodeForPathMtu),
 							IPRanges: []ec2model.IPRange{
 								{
 									CIDRIP: cidr,
@@ -248,9 +242,9 @@ func (builder *securityGroupBuilderImpl) buildManagedSecurityGroupIngressPermiss
 
 					if enableICMP {
 						permissions = append(permissions, ec2model.IPPermission{
-							IPProtocol: icmpv6Protocol,
-							FromPort:   awssdk.Int32(icmpv6TypeForPathMtu),
-							ToPort:     awssdk.Int32(icmpv6CodeForPathMtu),
+							IPProtocol: shared_constants.ICMPV6Protocol,
+							FromPort:   awssdk.Int32(shared_constants.ICMPV6TypeForPathMtu),
+							ToPort:     awssdk.Int32(shared_constants.ICMPV6CodeForPathMtu),
 							IPv6Range: []ec2model.IPv6Range{
 								{
 									CIDRIPv6: cidr,

pkg/service/model_build_managed_sg.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"regexp"
+	"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
 	"strings"
 
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
@@ -17,15 +18,6 @@ import (
 )
 
 const (
-	icmpv4Protocol = "icmp"
-	icmpv6Protocol = "icmpv6"
-
-	icmpv4TypeForPathMtu = 3 // https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-codes-3
-	icmpv4CodeForPathMtu = 4
-
-	icmpv6TypeForPathMtu = 2 // https://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xhtml#icmpv6-parameters-codes-2
-	icmpv6CodeForPathMtu = 0
-
 	resourceIDManagedSecurityGroup = "ManagedLBSecurityGroup"
 )
 
@@ -99,9 +91,9 @@ func (t *defaultModelBuildTask) buildManagedSecurityGroupIngressPermissions(ctx
 				})
 				if icmpForPathMtuConfigured && icmpForPathMtuConfiguredFlag == "on" {
 					permissions = append(permissions, ec2model.IPPermission{
-						IPProtocol: string(icmpv4Protocol),
-						FromPort:   awssdk.Int32(icmpv4TypeForPathMtu),
-						ToPort:     awssdk.Int32(icmpv4CodeForPathMtu),
+						IPProtocol: shared_constants.ICMPV4Protocol,
+						FromPort:   awssdk.Int32(shared_constants.ICMPV4TypeForPathMtu),
+						ToPort:     awssdk.Int32(shared_constants.ICMPV4CodeForPathMtu),
 						IPRanges: []ec2model.IPRange{
 							{
 								CIDRIP: cidr,
@@ -122,9 +114,9 @@ func (t *defaultModelBuildTask) buildManagedSecurityGroupIngressPermissions(ctx
 				})
 				if icmpForPathMtuConfigured && icmpForPathMtuConfiguredFlag == "on" {
 					permissions = append(permissions, ec2model.IPPermission{
-						IPProtocol: string(icmpv6Protocol),
-						FromPort:   awssdk.Int32(icmpv6TypeForPathMtu),
-						ToPort:     awssdk.Int32(icmpv6CodeForPathMtu),
+						IPProtocol: shared_constants.ICMPV6Protocol,
+						FromPort:   awssdk.Int32(shared_constants.ICMPV6TypeForPathMtu),
+						ToPort:     awssdk.Int32(shared_constants.ICMPV6CodeForPathMtu),
 						IPv6Range: []ec2model.IPv6Range{
 							{
 								CIDRIPv6: cidr,

pkg/shared_constants/icmp.go

@@ -0,0 +1,12 @@
+package shared_constants
+
+const (
+	ICMPV4Protocol = "icmp"
+	ICMPV6Protocol = "icmpv6"
+
+	ICMPV4CodeForPathMtu = 3 // https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-codes-3
+	ICMPV6CodeForPathMtu = 4
+
+	ICMPV4TypeForPathMtu = 2 // https://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xhtml#icmpv6-parameters-codes-2
+	ICMPV6TypeForPathMtu = 0
+)