Fixed tests

Author: Jelle Dijkstra

api/v3/wms_types.go

@@ -137,7 +137,7 @@ type ConfigMapRef struct {
 	Keys []string `json:"keys,omitempty"`
 }
 
-// +kubebuilder:validation:XValidation:message="A layer can only have data or layers, not both.", rule="empty(self.data) || empty(self.layers)"
+// +kubebuilder:validation:XValidation:message="A layer can only have data or layers, not both.", rule="has(self.data) || has(self.layers)"
 type Layer struct {
 	// Name of the layer, required for layers on the 2nd or 3rd level
 	// +kubebuilder:validations:MinLength:=1

api/v3/zz_generated.deepcopy.go

@@ -1695,9 +1695,6 @@ spec:
                                     - keywords
                                     - name
                                   type: object
-                                  x-kubernetes-validations:
-                                    - message: A layer can only have data or layers, not both.
-                                      rule: empty(self.data) || empty(self.layers)
                                 type: array
                               maxscaledenominator:
                                 description: The maximum scale at which this layer functions
@@ -1757,7 +1754,7 @@ spec:
                             type: object
                             x-kubernetes-validations:
                               - message: A layer can only have data or layers, not both.
-                                rule: empty(self.data) || empty(self.layers)
+                                rule: has(self.data) || has(self.layers)
                           type: array
                         maxscaledenominator:
                           description: The maximum scale at which this layer functions
@@ -1816,7 +1813,7 @@ spec:
                       type: object
                       x-kubernetes-validations:
                         - message: A layer can only have data or layers, not both.
-                          rule: empty(self.data) || empty(self.layers)
+                          rule: has(self.data) || has(self.layers)
                     mapfile:
                       description: Custom mapfile
                       properties:

config/crd/bases/pdok.nl_wms.yaml

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	kyaml "sigs.k8s.io/yaml"
+	"strings"
 )
 
 // Usage: go run ./update_layersv3_openapi.go <crd_dir_path>
@@ -42,6 +43,13 @@ func updateWMSV3Layers(crdDir string) {
 			layerSpecLevel3 := layer.DeepCopy()
 			layerSpecLevel3.Required = append(layerSpecLevel3.Required, "name")
 			delete(layerSpecLevel3.Properties, "layers")
+			xvals := v1.ValidationRules{}
+			for _, xval := range layerSpecLevel3.XValidations {
+				if !strings.Contains(xval.Rule, "self.layers") {
+					xvals = append(xvals, xval)
+				}
+			}
+			layerSpecLevel3.XValidations = xvals
 
 			// Level 2
 			layerSpecLevel2 := layer.DeepCopy()

config/crd/update_openapi.go

@@ -49,7 +49,7 @@ spec:
       - keyword1
       - keyword2
     ownerInfoRef:
-    fees: ""
+    fees: "test"
     accessConstraints: "http://creativecommons.org/publicdomain/zero/1.0/deed.nl"
     maxSize:
     inspire: