made validateCreate Generic

Author: Shalucik

api/v3/shared_validation.go

@@ -15,7 +15,33 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
-func ValidateUpdate[W WMSWFS](c client.Client, newW, oldW W, validate func(client.Client, W, *[]string, *field.ErrorList)) ([]string, error) {
+func ValidateCreate[W WMSWFS](c client.Client, obj W, validate func(W, *[]string, *field.ErrorList)) ([]string, error) {
+	warnings := []string{}
+	allErrs := field.ErrorList{}
+
+	err := sharedValidation.ValidateLabelsOnCreate(obj.GetLabels())
+	if err != nil {
+		allErrs = append(allErrs, err)
+	}
+
+	err = sharedValidation.ValidateIngressRouteURLsContainsBaseURL(obj.IngressRouteURLs(false), obj.URL(), nil)
+	if err != nil {
+		allErrs = append(allErrs, err)
+	}
+
+	validate(obj, &warnings, &allErrs)
+	ValidateOwnerInfo(c, obj, &allErrs)
+
+	if len(allErrs) == 0 {
+		return warnings, nil
+	}
+
+	return warnings, apierrors.NewInvalid(
+		obj.GroupKind(),
+		obj.GetName(), allErrs)
+}
+
+func ValidateUpdate[W WMSWFS](c client.Client, newW, oldW W, validate func(W, *[]string, *field.ErrorList)) ([]string, error) {
 	warnings := []string{}
 	allErrs := field.ErrorList{}
 
@@ -50,7 +76,8 @@ func ValidateUpdate[W WMSWFS](c client.Client, newW, oldW W, validate func(clien
 		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec").Child("service").Child("inspire"), "cannot change from inspire to not inspire or the other way around"))
 	}
 
-	validate(c, newW, &warnings, &allErrs)
+	validate(newW, &warnings, &allErrs)
+	ValidateOwnerInfo(c, newW, &allErrs)
 
 	if len(allErrs) == 0 {
 		return warnings, nil

api/v3/wfs_validation.go

@@ -8,41 +8,18 @@ import (
 
 	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
 
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
 func (wfs *WFS) ValidateCreate(c client.Client) ([]string, error) {
-	warnings := []string{}
-	allErrs := field.ErrorList{}
-
-	err := sharedValidation.ValidateLabelsOnCreate(wfs.Labels)
-	if err != nil {
-		allErrs = append(allErrs, err)
-	}
-
-	err = sharedValidation.ValidateIngressRouteURLsContainsBaseURL(wfs.Spec.IngressRouteURLs, wfs.URL(), nil)
-	if err != nil {
-		allErrs = append(allErrs, err)
-	}
-
-	ValidateWFS(c, wfs, &warnings, &allErrs)
-
-	if len(allErrs) == 0 {
-		return warnings, nil
-	}
-
-	return warnings, apierrors.NewInvalid(
-		schema.GroupKind{Group: "pdok.nl", Kind: "WFS"},
-		wfs.Name, allErrs)
+	return ValidateCreate(c, wfs, ValidateWFS)
 }
 
 func (wfs *WFS) ValidateUpdate(c client.Client, wfsOld *WFS) ([]string, error) {
 	return ValidateUpdate(c, wfs, wfsOld, ValidateWFS)
 }
 
-func ValidateWFS(c client.Client, wfs *WFS, warnings *[]string, allErrs *field.ErrorList) {
+func ValidateWFS(wfs *WFS, warnings *[]string, allErrs *field.ErrorList) {
 	if strings.Contains(wfs.GetName(), "wfs") {
 		sharedValidation.AddWarning(
 			warnings,
@@ -74,8 +51,6 @@ func ValidateWFS(c client.Client, wfs *WFS, warnings *[]string, allErrs *field.E
 	ValidateEphemeralStorage(podSpecPatch, allErrs)
 
 	ValidateFeatureTypes(wfs, warnings, allErrs)
-
-	ValidateOwnerInfo(c, wfs, allErrs)
 }
 
 func ValidateFeatureTypes(wfs *WFS, warnings *[]string, allErrs *field.ErrorList) {

api/v3/wms_validation.go

@@ -8,35 +8,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/utils/strings/slices"
 )
 
 func (wms *WMS) ValidateCreate(c client.Client) ([]string, error) {
-	warnings := []string{}
-	allErrs := field.ErrorList{}
-
-	err := sharedValidation.ValidateLabelsOnCreate(wms.Labels)
-	if err != nil {
-		allErrs = append(allErrs, err)
-	}
-
-	err = sharedValidation.ValidateIngressRouteURLsContainsBaseURL(wms.Spec.IngressRouteURLs, wms.URL(), nil)
-	if err != nil {
-		allErrs = append(allErrs, err)
-	}
-
-	ValidateWMS(c, wms, &warnings, &allErrs)
-
-	if len(allErrs) == 0 {
-		return warnings, nil
-	}
-
-	return warnings, apierrors.NewInvalid(
-		schema.GroupKind{Group: "pdok.nl", Kind: "WMS"},
-		wms.Name, allErrs)
+	return ValidateCreate(c, wms, ValidateWMS)
 }
 
 func (wms *WMS) ValidateUpdate(c client.Client, wmsOld *WMS) ([]string, error) {
@@ -46,7 +23,7 @@ func (wms *WMS) ValidateUpdate(c client.Client, wmsOld *WMS) ([]string, error) {
 // TODO fix linting (cyclop,funlen)
 //
 //nolint:cyclop,funlen
-func ValidateWMS(c client.Client, wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
+func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 	if strings.Contains(wms.GetName(), "wms") {
 		sharedValidation.AddWarning(
 			warnings,
@@ -306,8 +283,6 @@ func ValidateWMS(c client.Client, wms *WMS, warnings *[]string, allErrs *field.E
 
 	podSpecPatch := wms.Spec.PodSpecPatch
 	ValidateEphemeralStorage(podSpecPatch, allErrs)
-
-	ValidateOwnerInfo(c, wms, allErrs)
 }
 
 func findEqualChildStyleNames(layer *Layer, equalStyleNames *map[string][]string) {