Improve error handling across kong & ingress-nginx

Author: levikobi

pkg/i2gw/providers/common/converter.go

@@ -362,6 +362,11 @@ func toHTTPRouteMatch(routePath networkingv1.HTTPIngressPath, path *field.Path,
 	pmExact := gatewayv1.PathMatchExact
 
 	match := &gatewayv1.HTTPRouteMatch{Path: &gatewayv1.HTTPPathMatch{Value: &routePath.Path}}
+
+	if routePath.PathType == nil {
+		return nil, field.Invalid(path.Child("pathType"), routePath.PathType, "pathType is required")
+	}
+
 	switch *routePath.PathType {
 	case networkingv1.PathTypePrefix:
 		match.Path.Type = &pmPrefix

pkg/i2gw/providers/ingressnginx/canary.go

@@ -47,7 +47,7 @@ func canaryFeature(ingressResources i2gw.InputResources, gatewayResources *i2gw.
 			key := types.NamespacedName{Namespace: path.ingress.Namespace, Name: common.RouteName(rg.Name, rg.Host)}
 			httpRoute, ok := gatewayResources.HTTPRoutes[key]
 			if !ok {
-				panic("HTTPRoute not exists - this should never happen")
+				return field.ErrorList{field.InternalError(nil, fmt.Errorf("HTTPRoute does not exist"))}
 			}
 
 			patchHTTPRouteWithBackendRefs(&httpRoute, backendRefs)

pkg/i2gw/providers/kong/converter.go

@@ -51,31 +51,35 @@ func (c *converter) convert(storage *storage) (i2gw.GatewayResources, field.Erro
 		ingressList = append(ingressList, *ingress)
 	}
 
-	globalErrs := field.ErrorList{}
+	errorList := field.ErrorList{}
 
 	// Convert plain ingress resources to gateway resources, ignoring all
 	// provider-specific features.
 	gatewayResources, errs := common.ToGateway(ingressList, c.implementationSpecificOptions)
 	if len(errs) > 0 {
-		globalErrs = append(globalErrs, errs...)
+		errorList = append(errorList, errs...)
 	}
 
 	tcpGatewayResources, errs := crds.TCPIngressToGatewayAPI(storage.TCPIngresses)
 	if len(errs) > 0 {
-		globalErrs = append(globalErrs, errs...)
+		errorList = append(errorList, errs...)
+	}
+
+	if len(errorList) > 0 {
+		return i2gw.GatewayResources{}, errorList
 	}
 
 	gatewayResources, errs = i2gw.MergeGatewayResources(gatewayResources, tcpGatewayResources)
 	if len(errs) > 0 {
-		globalErrs = append(globalErrs, errs...)
+		return i2gw.GatewayResources{}, errs
 	}
 
 	for _, parseFeatureFunc := range c.featureParsers {
 		// Apply the feature parsing function to the gateway resources, one by one.
 		errs = parseFeatureFunc(i2gw.InputResources{Ingresses: ingressList}, &gatewayResources)
 		// Append the parsing errors to the error list.
-		globalErrs = append(globalErrs, errs...)
+		errorList = append(errorList, errs...)
 	}
 
-	return gatewayResources, globalErrs
+	return gatewayResources, errorList
 }

pkg/i2gw/providers/kong/header_matching.go

@@ -44,7 +44,7 @@ func headerMatchingFeature(ingressResources i2gw.InputResources, gatewayResource
 			key := types.NamespacedName{Namespace: rule.Ingress.Namespace, Name: common.RouteName(rg.Name, rg.Host)}
 			httpRoute, ok := gatewayResources.HTTPRoutes[key]
 			if !ok {
-				panic("HTTPRoute does not exist - this should never happen")
+				return field.ErrorList{field.InternalError(nil, fmt.Errorf("HTTPRoute does not exist"))}
 			}
 
 			patchHTTPRouteHeaderMatching(&httpRoute, headerskeys, headersValues)

pkg/i2gw/providers/kong/method_matching.go

@@ -42,7 +42,7 @@ func methodMatchingFeature(ingressResources i2gw.InputResources, gatewayResource
 			key := types.NamespacedName{Namespace: rule.Ingress.Namespace, Name: common.RouteName(rg.Name, rg.Host)}
 			httpRoute, ok := gatewayResources.HTTPRoutes[key]
 			if !ok {
-				panic("HTTPRoute does not exist - this should never happen")
+				return field.ErrorList{field.InternalError(nil, fmt.Errorf("HTTPRoute does not exist"))}
 			}
 			methods, errs := parseMethodsAnnotation(rule.Ingress.ObjectMeta.Namespace, rule.Ingress.ObjectMeta.Name, rule.Ingress.Annotations)
 			if len(errs) != 0 {

pkg/i2gw/providers/kong/plugins.go

@@ -17,6 +17,7 @@ limitations under the License.
 package kong
 
 import (
+	"errors"
 	"strings"
 
 	"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw"
@@ -39,7 +40,7 @@ func pluginsFeature(ingressResources i2gw.InputResources, gatewayResources *i2gw
 			key := types.NamespacedName{Namespace: rule.Ingress.Namespace, Name: common.RouteName(rg.Name, rg.Host)}
 			httpRoute, ok := gatewayResources.HTTPRoutes[key]
 			if !ok {
-				panic("HTTPRoute does not exist - this should never happen")
+				return field.ErrorList{field.InternalError(nil, errors.New("HTTPRoute does not exist"))}
 			}
 			filters := parsePluginsAnnotation(rule.Ingress.Annotations)
 			patchHTTPRoutePlugins(&httpRoute, filters)