refactor validation

Author: zac-nixon

go.mod

@@ -32,9 +32,10 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
+	golang.org/x/net v0.37.0
 	golang.org/x/time v0.7.0
 	gomodules.xyz/jsonpatch/v2 v2.4.0
-	helm.sh/helm/v3 v3.17.2
+	helm.sh/helm/v3 v3.17.3
 	k8s.io/api v0.32.2
 	k8s.io/apimachinery v0.32.2
 	k8s.io/cli-runtime v0.32.2
@@ -172,7 +173,6 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/net v0.37.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect

go.sum

@@ -595,8 +595,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
 gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
-helm.sh/helm/v3 v3.17.2 h1:agYQ5ew2jq5vdx2K7q5W44KyKQrnSubUMCQsjkiv3/o=
-helm.sh/helm/v3 v3.17.2/go.mod h1:+uJKMH/UiMzZQOALR3XUf3BLIoczI2RKKD6bMhPh4G8=
+helm.sh/helm/v3 v3.17.3 h1:3n5rW3D0ArjFl0p4/oWO8IbY/HKaNNwJtOQFdH2AZHg=
+helm.sh/helm/v3 v3.17.3/go.mod h1:+uJKMH/UiMzZQOALR3XUf3BLIoczI2RKKD6bMhPh4G8=
 k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
 k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
 k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4=

pkg/gateway/model/model_build_subnet.go

@@ -105,28 +105,6 @@ func (subnetBuilder *subnetModelBuilderImpl) validateSubnetsInput(subnetConfigsP
 	privateIPv4AllocationSpecified := subnetsConfig[0].PrivateIPv4Allocation != nil
 	sourceNATSpecified := subnetsConfig[0].SourceNatIPv6Prefix != nil
 
-	for _, subnetConfig := range subnetsConfig {
-		if (subnetConfig.Identifier != "") != identifierSpecified {
-			return false, errors.Errorf("Either specify all subnet identifiers or none.")
-		}
-
-		if (subnetConfig.EIPAllocation != nil) != eipAllocationSpecified {
-			return false, errors.Errorf("Either specify all eip allocations or none.")
-		}
-
-		if (subnetConfig.IPv6Allocation != nil) != ipv6AllocationSpecified {
-			return false, errors.Errorf("Either specify all ipv6 allocations or none.")
-		}
-
-		if (subnetConfig.PrivateIPv4Allocation != nil) != privateIPv4AllocationSpecified {
-			return false, errors.Errorf("Either specify all private ipv4 allocations or none.")
-		}
-
-		if (subnetConfig.SourceNatIPv6Prefix != nil) != sourceNATSpecified {
-			return false, errors.Errorf("Either specify all source nat prefixes or none.")
-		}
-	}
-
 	if eipAllocationSpecified {
 		if subnetBuilder.loadBalancerType != elbv2model.LoadBalancerTypeNetwork {
 			return false, errors.Errorf("EIP Allocation is only allowed for Network LoadBalancers")
@@ -163,6 +141,28 @@ func (subnetBuilder *subnetModelBuilderImpl) validateSubnetsInput(subnetConfigsP
 		}
 	}
 
+	for _, subnetConfig := range subnetsConfig {
+		if (subnetConfig.Identifier != "") != identifierSpecified {
+			return false, errors.Errorf("Either specify all subnet identifiers or none.")
+		}
+
+		if (subnetConfig.EIPAllocation != nil) != eipAllocationSpecified {
+			return false, errors.Errorf("Either specify all eip allocations or none.")
+		}
+
+		if (subnetConfig.IPv6Allocation != nil) != ipv6AllocationSpecified {
+			return false, errors.Errorf("Either specify all ipv6 allocations or none.")
+		}
+
+		if (subnetConfig.PrivateIPv4Allocation != nil) != privateIPv4AllocationSpecified {
+			return false, errors.Errorf("Either specify all private ipv4 allocations or none.")
+		}
+
+		if (subnetConfig.SourceNatIPv6Prefix != nil) != sourceNATSpecified {
+			return false, errors.Errorf("Either specify all source nat prefixes or none.")
+		}
+	}
+
 	return sourceNATSpecified, nil
 }
 

pkg/gateway/model/subnet/eip_mutator.go

@@ -1,7 +1,6 @@
 package subnet
 
 import (
-	"fmt"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/pkg/errors"
 	elbv2gw "sigs.k8s.io/aws-load-balancer-controller/apis/gateway/v1beta1"
@@ -27,7 +26,6 @@ func (mutator *eipMutator) Mutate(elbSubnets []*elbv2model.SubnetMapping, _ []ec
 	}
 
 	for i, elbSubnet := range elbSubnets {
-		fmt.Println("HERE!")
 		elbSubnet.AllocationID = subnetConfig[i].EIPAllocation
 	}
 	return nil