refactor validation

Author: zac-nixon

pkg/gateway/model/model_build_subnet.go

@@ -113,28 +113,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")
@@ -171,6 +149,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