Merge pull request #80 from PDOK/wr/validate-ownerref

Shalucik · web-flow · commit f35e80158035 · 2025-06-04T10:55:40.000+02:00
Wr/validate ownerref
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   lint:
-    name: Run on Ubuntu
+    name: Linting on Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Clone the code
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   test-e2e:
-    name: Run on Ubuntu
+    name: End-2-End on Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Clone the code
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   test:
-    name: Run on Ubuntu
+    name: Testing on Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Clone the code
diff --git a/api/v3/shared_types.go b/api/v3/shared_types.go
@@ -45,6 +45,7 @@ type WMSWFS interface {
 	TypedName() string
 	Options() Options
 	HasPostgisData() bool
+	OwnerInfoRef() string
 
 	// URL returns the configured service URL
 	URL() smoothoperatormodel.URL
diff --git a/api/v3/shared_validation.go b/api/v3/shared_validation.go
@@ -1,17 +1,47 @@
 package v3
 
 import (
+	"context"
 	"fmt"
 	"slices"
 
+	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
 	v1 "k8s.io/api/core/v1"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
-func ValidateUpdate[W WMSWFS](newW, oldW W, validate func(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{}
 
@@ -47,6 +77,7 @@ func ValidateUpdate[W WMSWFS](newW, oldW W, validate func(W, *[]string, *field.E
 	}
 
 	validate(newW, &warnings, &allErrs)
+	ValidateOwnerInfo(c, newW, &allErrs)
 
 	if len(allErrs) == 0 {
 		return warnings, nil
@@ -137,3 +168,43 @@ func ValidateInspire[O WMSWFS](obj O, allErrs *field.ErrorList) {
 	}
 
 }
+
+func ValidateOwnerInfo[O WMSWFS](c client.Client, obj O, allErrs *field.ErrorList) {
+	ownerInfoRef := obj.OwnerInfoRef()
+	ownerInfo := &smoothoperatorv1.OwnerInfo{}
+	objectKey := client.ObjectKey{
+		Namespace: obj.GetNamespace(),
+		Name:      ownerInfoRef,
+	}
+	ctx := context.Background()
+	err := c.Get(ctx, objectKey, ownerInfo)
+	fieldPath := field.NewPath("spec").Child("service").Child("ownerInfoRef")
+	if err != nil {
+		*allErrs = append(*allErrs, field.NotFound(fieldPath, ownerInfoRef))
+		return
+	}
+
+	if ownerInfo.Spec.NamespaceTemplate == nil {
+		*allErrs = append(*allErrs, field.Required(fieldPath, "spec.namespaceTemplate missing in "+ownerInfo.Name))
+		return
+	}
+
+	if ((obj.Inspire() != nil && obj.Inspire().ServiceMetadataURL.CSW != nil) ||
+		len(obj.DatasetMetadataIDs()) > 0) &&
+		(ownerInfo.Spec.MetadataUrls == nil || ownerInfo.Spec.MetadataUrls.CSW == nil) {
+		*allErrs = append(*allErrs, field.Required(fieldPath, "spec.metadataUrls.csw missing in "+ownerInfo.Name))
+		return
+	}
+
+	switch obj.Type() {
+	case ServiceTypeWFS:
+		if ownerInfo.Spec.WFS == nil {
+			*allErrs = append(*allErrs, field.Required(fieldPath, "spec.WFS missing in "+ownerInfo.Name))
+		}
+	case ServiceTypeWMS:
+		if ownerInfo.Spec.WMS == nil {
+			*allErrs = append(*allErrs, field.Required(fieldPath, "spec.WMS missing in "+ownerInfo.Name))
+		}
+	}
+
+}
diff --git a/api/v3/wfs_types.go b/api/v3/wfs_types.go
@@ -332,3 +332,7 @@ func (wfs *WFS) IngressRouteURLs(includeServiceURLWhenEmpty bool) smoothoperator
 
 	return wfs.Spec.IngressRouteURLs
 }
+
+func (wfs *WFS) OwnerInfoRef() string {
+	return wfs.Spec.Service.OwnerInfoRef
+}
diff --git a/api/v3/wfs_validation.go b/api/v3/wfs_validation.go
@@ -4,40 +4,19 @@ import (
 	"slices"
 	"strings"
 
+	"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"
 )
 
-func (wfs *WFS) ValidateCreate() ([]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(wfs, &warnings, &allErrs)
-
-	if len(allErrs) == 0 {
-		return warnings, nil
-	}
-
-	return warnings, apierrors.NewInvalid(
-		schema.GroupKind{Group: "pdok.nl", Kind: "WFS"},
-		wfs.Name, allErrs)
+func (wfs *WFS) ValidateCreate(c client.Client) ([]string, error) {
+	return ValidateCreate(c, wfs, ValidateWFS)
 }
 
-func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
-	return ValidateUpdate(wfs, wfsOld, ValidateWFS)
+func (wfs *WFS) ValidateUpdate(c client.Client, wfsOld *WFS) ([]string, error) {
+	return ValidateUpdate(c, wfs, wfsOld, ValidateWFS)
 }
 
 func ValidateWFS(wfs *WFS, warnings *[]string, allErrs *field.ErrorList) {
diff --git a/api/v3/wms_types.go b/api/v3/wms_types.go
@@ -701,3 +701,7 @@ func (wms *WMS) IngressRouteURLs(includeServiceURLWhenEmpty bool) smoothoperator
 
 	return wms.Spec.IngressRouteURLs
 }
+
+func (wms *WMS) OwnerInfoRef() string {
+	return wms.Spec.Service.OwnerInfoRef
+}
diff --git a/api/v3/wms_validation.go b/api/v3/wms_validation.go
@@ -5,40 +5,19 @@ import (
 	"maps"
 	"strings"
 
+	"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() ([]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(wms, &warnings, &allErrs)
-
-	if len(allErrs) == 0 {
-		return warnings, nil
-	}
-
-	return warnings, apierrors.NewInvalid(
-		schema.GroupKind{Group: "pdok.nl", Kind: "WMS"},
-		wms.Name, allErrs)
+func (wms *WMS) ValidateCreate(c client.Client) ([]string, error) {
+	return ValidateCreate(c, wms, ValidateWMS)
 }
 
-func (wms *WMS) ValidateUpdate(wmsOld *WMS) ([]string, error) {
-	return ValidateUpdate(wms, wmsOld, ValidateWMS)
+func (wms *WMS) ValidateUpdate(c client.Client, wmsOld *WMS) ([]string, error) {
+	return ValidateUpdate(c, wms, wmsOld, ValidateWMS)
 }
 
 // TODO fix linting (cyclop,funlen)
diff --git a/internal/controller/shared_controller_test.go b/internal/controller/shared_controller_test.go
@@ -239,16 +239,19 @@ func testMutates[R Reconciler, O pdoknlv3.WMSWFS](reconcilerFn func() R, resourc
 		Expect(err).NotTo(HaveOccurred())
 		Expect(owner.Name).Should(Equal("owner"))
 
+		Expect(k8sClient.Create(ctx, &owner)).To(Succeed())
+
 		var validationError error
 		switch any(resource).(type) {
 		case *pdoknlv3.WMS:
 			wms := any(resource).(*pdoknlv3.WMS)
-			_, validationError = wms.ValidateCreate()
+			_, validationError = wms.ValidateCreate(k8sClient)
 		case *pdoknlv3.WFS:
 			wfs := any(resource).(*pdoknlv3.WFS)
-			_, validationError = wfs.ValidateCreate()
+			_, validationError = wfs.ValidateCreate(k8sClient)
 		}
 		Expect(validationError).NotTo(HaveOccurred())
+		Expect(k8sClient.Delete(ctx, &owner)).To(Succeed())
 	})
 
 	configMapNames := types.HashedConfigMapNames{}
diff --git a/internal/webhook/v3/shared_webhook.go b/internal/webhook/v3/shared_webhook.go
@@ -1,10 +1,16 @@
 package v3
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"os"
 
+	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	k8stypes "k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"sigs.k8s.io/yaml"
 )
@@ -13,6 +19,65 @@ const (
 	samplesPath = "test_data/"
 )
 
+func readOwnerInfo(ownerInfo *smoothoperatorv1.OwnerInfo) error {
+	data, err := os.ReadFile(samplesPath + "ownerinfo.yaml")
+	if err != nil {
+		return err
+	}
+	err = yaml.UnmarshalStrict(data, ownerInfo)
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func createOwnerInfo(ctx context.Context, c client.Client, ownerInfo *smoothoperatorv1.OwnerInfo) error {
+	clusterOwner := &smoothoperatorv1.OwnerInfo{}
+	objectKeyOwner := k8stypes.NamespacedName{
+		Namespace: ownerInfo.GetNamespace(),
+		Name:      ownerInfo.GetName(),
+	}
+
+	err := c.Get(ctx, objectKeyOwner, clusterOwner)
+	if client.IgnoreNotFound(err) != nil {
+		return err
+	}
+	if err != nil && apierrors.IsNotFound(err) {
+		resource := ownerInfo.DeepCopy()
+		err = c.Create(ctx, resource)
+		if err != nil {
+			return err
+		}
+		err = c.Get(ctx, objectKeyOwner, clusterOwner)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func updateOwnerInfo(ctx context.Context, c client.Client, ownerInfo *smoothoperatorv1.OwnerInfo) error {
+	clusterOwner := &smoothoperatorv1.OwnerInfo{}
+	objectKeyOwner := k8stypes.NamespacedName{
+		Namespace: ownerInfo.GetNamespace(),
+		Name:      ownerInfo.GetName(),
+	}
+
+	err := c.Get(ctx, objectKeyOwner, clusterOwner)
+	if err != nil {
+		return err
+	}
+
+	ownerInfo.ResourceVersion = clusterOwner.ResourceVersion
+
+	err = c.Update(ctx, ownerInfo)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func getSampleFilename[W pdoknlv3.WMSWFS](webservice W) (string, error) {
 	switch any(webservice).(type) {
 	case *pdoknlv3.WFS:
diff --git a/internal/webhook/v3/test_data/ownerinfo.yaml b/internal/webhook/v3/test_data/ownerinfo.yaml
@@ -0,0 +1,33 @@
+apiVersion: pdok.nl/v1
+kind: OwnerInfo
+metadata:
+  name: owner
+  namespace: default
+spec:
+  metadataUrls:
+    csw:
+      hrefTemplate: "https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?service=CSW&version=2.0.2&request=GetRecordById&outputschema=http://www.isotc211.org/2005/gmd&elementsetname=full&id={{identifier}}"
+      type: alternate
+  namespaceTemplate: "http://{{prefix}}.geonovum.nl"
+  wfs:
+    serviceprovider:
+      providername: PDOK
+      providersite:
+        type: simple
+        href: https://pdok.nl
+  wms:
+    contactinformation:
+      contactpersonprimary:
+        contactperson: KlantContactCenter PDOK
+        contactorganization: PDOK
+      contactposition: pointOfContact
+      contactaddress:
+        addresstype:
+        address:
+        city: Apeldoorn
+        stateorprovince:
+        postcode:
+        country: Netherlands
+      contactvoicetelephone:
+      contactfacsimiletelephone:
+      contactelectronicmailAddress: BeheerPDOK@kadaster.nl
diff --git a/internal/webhook/v3/test_data/v3_wfs.yaml b/internal/webhook/v3/test_data/v3_wfs.yaml
@@ -2,6 +2,7 @@ apiVersion: pdok.nl/v3
 kind: WFS
 metadata:
   name: sample
+  namespace: default
   labels:
     sample: sample
 spec:
diff --git a/internal/webhook/v3/test_data/v3_wms.yaml b/internal/webhook/v3/test_data/v3_wms.yaml
diff --git a/internal/webhook/v3/webhook_suite_test.go b/internal/webhook/v3/webhook_suite_test.go
diff --git a/internal/webhook/v3/wfs_webhook.go b/internal/webhook/v3/wfs_webhook.go
diff --git a/internal/webhook/v3/wfs_webhook_test.go b/internal/webhook/v3/wfs_webhook_test.go
diff --git a/internal/webhook/v3/wms_webhook.go b/internal/webhook/v3/wms_webhook.go
diff --git a/internal/webhook/v3/wms_webhook_test.go b/internal/webhook/v3/wms_webhook_test.go

Original file line number	Diff line number	Diff line change
`@@ -332,3 +332,7 @@ func (wfs *WFS) IngressRouteURLs(includeServiceURLWhenEmpty bool) smoothoperator`
`332`	`332`
`333`	`333`	`return wfs.Spec.IngressRouteURLs`
`334`	`334`	`}`
	`335`	`+`
	`336`	`+func (wfs *WFS) OwnerInfoRef() string {`
	`337`	`+ return wfs.Spec.Service.OwnerInfoRef`
	`338`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -701,3 +701,7 @@ func (wms *WMS) IngressRouteURLs(includeServiceURLWhenEmpty bool) smoothoperator`
`701`	`701`
`702`	`702`	`return wms.Spec.IngressRouteURLs`
`703`	`703`	`}`
	`704`	`+`
	`705`	`+func (wms *WMS) OwnerInfoRef() string {`
	`706`	`+ return wms.Spec.Service.OwnerInfoRef`
	`707`	`+}`