Create wrappers for shared function with different return signatures

Author: ciarams87

internal/state/graph/gateway_listener.go

@@ -89,6 +89,7 @@ func newListenerConfiguratorFactory(
 		},
 		http: &listenerConfigurator{
 			validators: []listenerValidator{
+				validateListenerAllowedRouteKind,
 				validateListenerLabelSelector,
 				validateListenerHostname,
 				validateHTTPListener,
@@ -158,8 +159,7 @@ func (c *listenerConfigurator) configure(listener v1beta1.Listener) *Listener {
 		}
 	}
 
-	cnds, supportedKinds := getAndValidateSupportedKinds(listener)
-	conds = append(conds, cnds...)
+	supportedKinds := getListenerSupportedKinds(listener)
 
 	if len(conds) > 0 {
 		return &Listener{
@@ -211,7 +211,10 @@ func validateListenerHostname(listener v1beta1.Listener) []conditions.Condition
 	return nil
 }
 
-func getAndValidateSupportedKinds(listener v1beta1.Listener) ([]conditions.Condition, []v1beta1.RouteGroupKind) {
+func getAndValidateListenerSupportedKinds(listener v1beta1.Listener) (
+	[]conditions.Condition,
+	[]v1beta1.RouteGroupKind,
+) {
 	if listener.AllowedRoutes == nil || listener.AllowedRoutes.Kinds == nil {
 		return nil, []v1beta1.RouteGroupKind{
 			{
@@ -247,6 +250,16 @@ func getAndValidateSupportedKinds(listener v1beta1.Listener) ([]conditions.Condi
 	return conds, supportedKinds
 }
 
+func validateListenerAllowedRouteKind(listener v1beta1.Listener) []conditions.Condition {
+	conds, _ := getAndValidateListenerSupportedKinds(listener)
+	return conds
+}
+
+func getListenerSupportedKinds(listener v1beta1.Listener) []v1beta1.RouteGroupKind {
+	_, kinds := getAndValidateListenerSupportedKinds(listener)
+	return kinds
+}
+
 func validateListenerLabelSelector(listener v1beta1.Listener) []conditions.Condition {
 	if listener.AllowedRoutes != nil &&
 		listener.AllowedRoutes.Namespaces != nil &&

internal/state/graph/gateway_listener_test.go

@@ -219,7 +219,7 @@ func TestValidateListenerHostname(t *testing.T) {
 	}
 }
 
-func TestGetAndValidateSupportedKinds(t *testing.T) {
+func TestGetAndValidateListenerSupportedKinds(t *testing.T) {
 	HTTPRouteGroupKind := []v1beta1.RouteGroupKind{
 		{
 			Kind:  "HTTPRoute",
@@ -321,7 +321,7 @@ func TestGetAndValidateSupportedKinds(t *testing.T) {
 				}
 			}
 
-			conds, kinds := getAndValidateSupportedKinds(listener)
+			conds, kinds := getAndValidateListenerSupportedKinds(listener)
 			g.Expect(helpers.Diff(test.expected, kinds)).To(BeEmpty())
 			if test.expectErr {
 				g.Expect(conds).ToNot(BeEmpty())