unit tests

Author: Shalucik

api/v3/shared_validation.go

@@ -46,7 +46,7 @@ func ValidateUpdate[W WMSWFS](c client.Client, newW, oldW W, validate func(W, *[
 	allErrs := field.ErrorList{}
 
 	// Make sure no ingressRouteURLs have been removed
-	sharedValidation.ValidateIngressRouteURLsNotRemoved(oldW.IngressRouteURLs(true), newW.IngressRouteURLs(true), &allErrs, nil)
+	sharedValidation.ValidateIngressRouteURLsNotRemoved(oldW.IngressRouteURLs(false), newW.IngressRouteURLs(true), &allErrs, nil)
 
 	if len(newW.IngressRouteURLs(false)) == 0 {
 		// There are no ingressRouteURLs given, spec.service.url is immutable is that case.

api/v3/wfs_validation.go

@@ -34,11 +34,20 @@ func ValidateWFS(wfs *WFS, warnings *[]string, allErrs *field.ErrorList) {
 	path := field.NewPath("spec").Child("service")
 
 	if service.Mapfile == nil && service.DefaultCrs != "EPSG:28992" && service.Bbox == nil {
-		*allErrs = append(*allErrs, field.Required(path.Child("bbox").Child("defaultCRS"), "when service.defaultCRS is not 'EPSG:28992'"))
+		*allErrs = append(*allErrs, field.Required(
+			path.Child("bbox").Child("defaultCRS"),
+			"when service.defaultCRS is not 'EPSG:28992'",
+		))
 	}
 
 	if service.Mapfile != nil && service.Bbox != nil {
-		sharedValidation.AddWarning(warnings, *path.Child("bbox"), "is not used when service.mapfile is configured", wfs.GroupVersionKind(), wfs.GetName())
+		sharedValidation.AddWarning(
+			warnings,
+			*path.Child("bbox"),
+			"is not used when service.mapfile is configured",
+			wfs.GroupVersionKind(),
+			wfs.GetName(),
+		)
 	}
 
 	ValidateInspire(wfs, allErrs)

api/v3/wms_validation.go

@@ -51,20 +51,6 @@ func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 				wms.GetName(),
 			)
 		}
-	} else {
-		styleFile := false
-		for _, key := range wms.Spec.Service.StylingAssets.GetAllConfigMapRefKeys() {
-			if strings.HasSuffix(key, ".style") {
-				styleFile = true
-				break
-			}
-		}
-		if !styleFile {
-			*allErrs = append(*allErrs, field.Required(
-				field.NewPath("spec").Child("service").Child("stylingAssets[*]").Child("configMapRefs[*]").Child("keys"),
-				"at least one .style file is required",
-			))
-		}
 	}
 
 	ValidateInspire(wms, allErrs)
@@ -129,7 +115,9 @@ func validateLayer(layer AnnotatedLayer, path *field.Path, groupStyles []string,
 	validateLayerWithMapfile(layer, path, wms, warnings, allErrs)
 
 	if layer.Visible {
-		*hasVisibleLayer = true
+		if !layer.IsTopLayer {
+			*hasVisibleLayer = true
+		}
 	} else {
 		validateNotVisibleLayer(layer, path, wms, warnings, allErrs)
 	}
@@ -150,9 +138,6 @@ func validateLayer(layer AnnotatedLayer, path *field.Path, groupStyles []string,
 				))
 			}
 		}
-		if tif := layer.Data.TIF; tif != nil {
-			tifWarnings(tif, path, wms, warnings)
-		}
 	}
 
 	for i, subLayer := range layer.Layers {
@@ -180,12 +165,19 @@ func validateLayerWithMapfile(layer AnnotatedLayer, path *field.Path, wms *WMS,
 			wms.GetName(),
 		)
 	}
-	if !hasCustomMapfile && service.DataEPSG != "EPSG:28992" && !layer.hasBoundingBoxForCRS(service.DataEPSG) {
+	if !hasCustomMapfile && service.DataEPSG != "EPSG:28992" && !layer.hasBoundingBoxForCRS(service.DataEPSG) && layer.Name != nil {
 		*allErrs = append(*allErrs, field.Required(
 			path.Child("boundingBoxes").Child("crs"),
 			fmt.Sprintf("must contain a boundingBox for CRS %s when service.dataEPSG is not 'EPSG:28992'", service.DataEPSG),
 		))
 	}
+
+	if layer.IsDataLayer && hasCustomMapfile {
+		if tif := layer.Data.TIF; tif != nil {
+			tifWarnings(tif, path, wms, warnings)
+		}
+	}
+
 }
 
 func tifWarnings(tif *TIF, path *field.Path, wms *WMS, warnings *[]string) {
@@ -241,7 +233,7 @@ func validateStyle(style Style, path *field.Path, styleNames *[]string, groupSty
 	if layer.IsGroupLayer {
 		if slices.Contains(*groupStyles, style.Name) {
 			*allErrs = append(*allErrs, field.Invalid(
-				path,
+				path.Child("name"),
 				style.Name,
 				"A GroupLayer can't redefine the same style as a parent layer",
 			))

internal/webhook/v3/test_data/v3_wms.yaml

@@ -12,6 +12,8 @@ spec:
         resources:
           limits:
             ephemeral-storage: 1G
+  ingressRouteUrls:
+    - url: "https://test.test/path"
   service:
     prefix: "prefix"
     url: "https://test.test/path"
@@ -50,14 +52,20 @@ spec:
             - name: "name"
               title: "title"
               visualization: "file.style"
-        - name: "not visible"
-          visible: false
-          data:
-            postgis:
-              columns:
-                - name: "column"
-              geometryType: "Point"
-              tableName: "table"
+        - name: "visible Group Layer"
+          visible: true
           styles:
-            - name: "name"
-              visualization: "file.style"
+            - name: style
+              title: style
+          layers:
+            - name: "not visible"
+              visible: false
+              data:
+                postgis:
+                  columns:
+                    - name: "column"
+                  geometryType: "Point"
+                  tableName: "table"
+              styles:
+                - name: "style"
+                  visualization: "file.style"

internal/webhook/v3/webhook_suite_test.go

@@ -38,6 +38,12 @@ import (
 	"testing"
 	"time"
 
+	"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"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
 	"golang.org/x/tools/go/packages"
 
@@ -229,3 +235,16 @@ func must[T any](t T, err error) T {
 	}
 	return t
 }
+
+func getValidationError[O pdoknlv3.WMSWFS](obj O, errorList *field.Error) error {
+	return apierrors.NewInvalid(obj.GroupKind(), obj.GetName(), field.ErrorList{errorList})
+}
+
+func getValidationWarnings[O pdoknlv3.WMSWFS](obj O, path field.Path, warning string, warnings []string) admission.Warnings {
+	validation.AddWarning(&warnings, path, warning, schema.GroupVersionKind{
+		Group:   obj.GroupKind().Group,
+		Version: "v3",
+		Kind:    obj.GroupKind().Kind,
+	}, obj.GetName())
+	return warnings
+}