WFS validation

Author: Jelle Dijkstra

api/v3/wfs_validation.go

@@ -0,0 +1,71 @@
+package v3
+
+import (
+	"fmt"
+	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
+	"strings"
+)
+
+func (wfs *WFS) ValidateCreate() ([]string, error) {
+	warnings := []string{}
+	reasons := []string{}
+
+	err := sharedValidation.ValidateLabelsOnCreate(wfs.Labels)
+	if err != nil {
+		reasons = append(reasons, fmt.Sprintf("%v", err))
+	}
+
+	validateWFS(wfs, &warnings, &reasons)
+
+	if len(reasons) > 0 {
+		return warnings, fmt.Errorf("%s", strings.Join(reasons, ". "))
+	} else {
+		return warnings, nil
+	}
+}
+
+func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
+	warnings := []string{}
+	reasons := []string{}
+
+	// Check labels did not change
+	err := sharedValidation.ValidateLabelsOnUpdate(wfsOld.Labels, wfs.Labels)
+	if err != nil {
+		reasons = append(reasons, fmt.Sprintf("%v", err))
+	}
+
+	if (wfs.Spec.Service.Inspire == nil && wfsOld.Spec.Service.Inspire != nil) || (wfs.Spec.Service.Inspire != nil && wfsOld.Spec.Service.Inspire == nil) {
+		reasons = append(reasons, fmt.Sprintf("services cannot change from inspire to not inspire or the other way around"))
+	}
+
+	validateWFS(wfs, &warnings, &reasons)
+
+	if len(reasons) > 0 {
+		return warnings, fmt.Errorf("%s", strings.Join(reasons, ". "))
+	} else {
+		return warnings, nil
+	}
+}
+
+func validateWFS(wfs *WFS, warnings *[]string, reasons *[]string) {
+	if strings.Contains(wfs.GetName(), "wfs") {
+		*warnings = append(*warnings, sharedValidation.FormatValidationWarning("name should not contain wfs", wfs.GroupVersionKind(), wfs.GetName()))
+	}
+
+	service := wfs.Spec.Service
+
+	err := sharedValidation.ValidateBaseURL(service.BaseURL)
+	if err != nil {
+		*reasons = append(*reasons, fmt.Sprintf("%v", err))
+	}
+
+	if service.Mapfile == nil && service.DefaultCrs != "EPSG:28992" && service.Bbox == nil {
+		*reasons = append(*reasons, fmt.Sprintf("service.bbox.defaultCRS is required when service.defaultCRS is not 'EPSG:28992'"))
+	}
+
+	if service.Mapfile != nil {
+		if service.Bbox != nil {
+			*warnings = append(*warnings, sharedValidation.FormatValidationWarning("service.bbox is not used when service.mapfile is configured", wfs.GroupVersionKind(), wfs.GetName()))
+		}
+	}
+}

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: local-registry:5000/mapserver-operator
-  newTag: v3.0.9
+  newTag: v3.0.10

internal/webhook/v3/wfs_webhook.go

@@ -27,17 +27,13 @@ package v3
 import (
 	"context"
 	"fmt"
-	"strings"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
-
-	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
 )
 
 // nolint:unused
@@ -77,21 +73,7 @@ func (v *WFSCustomValidator) ValidateCreate(ctx context.Context, obj runtime.Obj
 	}
 	wfslog.Info("Validation for WFS upon creation", "name", wfs.GetName())
 
-	warnings := admission.Warnings{}
-	reasons := make([]string, 0)
-
-	err := sharedValidation.ValidateLabelsOnCreate(wfs.Labels)
-	if err != nil {
-		reasons = append(reasons, fmt.Sprintf("%v", err))
-	}
-
-	validateWFS(wfs, &warnings, &reasons)
-
-	if len(reasons) > 0 {
-		return warnings, fmt.Errorf("%s", strings.Join(reasons, "\n"))
-	} else {
-		return warnings, nil
-	}
+	return wfs.ValidateCreate()
 }
 
 // ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type WFS.
@@ -106,26 +88,7 @@ func (v *WFSCustomValidator) ValidateUpdate(ctx context.Context, oldObj, newObj
 	}
 	wfslog.Info("Validation for WFS upon update", "name", wfs.GetName())
 
-	warnings := admission.Warnings{}
-	reasons := make([]string, 0)
-
-	// Check labels did not change
-	err := sharedValidation.ValidateLabelsOnUpdate(wfsOld.Labels, wfs.Labels)
-	if err != nil {
-		reasons = append(reasons, fmt.Sprintf("%v", err))
-	}
-
-	if (wfs.Spec.Service.Inspire == nil && wfsOld.Spec.Service.Inspire != nil) || (wfs.Spec.Service.Inspire != nil && wfsOld.Spec.Service.Inspire == nil) {
-		reasons = append(reasons, fmt.Sprintf("services cannot change from inspire to not inspire or the other way around"))
-	}
-
-	validateWFS(wfs, &warnings, &reasons)
-
-	if len(reasons) > 0 {
-		return warnings, fmt.Errorf("%s", strings.Join(reasons, "\n"))
-	} else {
-		return warnings, nil
-	}
+	return wfs.ValidateUpdate(wfsOld)
 }
 
 // ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type WFS.
@@ -140,26 +103,3 @@ func (v *WFSCustomValidator) ValidateDelete(ctx context.Context, obj runtime.Obj
 
 	return nil, nil
 }
-
-func validateWFS(wfs *pdoknlv3.WFS, warnings *admission.Warnings, reasons *[]string) {
-	if strings.Contains(wfs.GetName(), "wfs") {
-		*warnings = append(*warnings, sharedValidation.FormatValidationWarning("name should not contain wfs", wfs.GroupVersionKind(), wfs.GetName()))
-	}
-
-	service := wfs.Spec.Service
-
-	err := sharedValidation.ValidateBaseURL(service.BaseURL)
-	if err != nil {
-		*reasons = append(*reasons, fmt.Sprintf("%v", err))
-	}
-
-	if service.Mapfile == nil && service.DefaultCrs != "EPSG:28992" && service.Bbox == nil {
-		*reasons = append(*reasons, fmt.Sprintf("service.bbox.defaultCRS is required when service.defaultCRS is not 'EPSG:28992'"))
-	}
-
-	if service.Mapfile != nil {
-		if service.Bbox != nil {
-			*warnings = append(*warnings, sharedValidation.FormatValidationWarning("service.bbox is not used when service.mapfile is configured", wfs.GroupVersionKind(), wfs.GetName()))
-		}
-	}
-}