accesscontrstaintes & countdefault

Author: Shalucik

api/v2beta1/wfs_conversion.go

@@ -26,6 +26,7 @@ package v2beta1
 
 import (
 	"log"
+	"strconv"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	smoothoperatormodel "github.com/pdok/smooth-operator/model"
@@ -43,7 +44,7 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
 	return src.ToV3(dst)
 }
 
-//nolint:gosec,funlen
+//nolint:gosec,funlen,cyclop
 func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 	dst.ObjectMeta = src.ObjectMeta
 
@@ -87,6 +88,9 @@ func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 		}
 	}
 
+	if err != nil {
+		return err
+	}
 	service := pdoknlv3.WFSService{
 		Prefix:            src.Spec.General.Dataset,
 		URL:               *url,
@@ -106,10 +110,17 @@ func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 			"EPSG::4258",
 			"EPSG::4326",
 		},
-		CountDefault: src.Spec.Service.Maxfeatures,
 		FeatureTypes: make([]pdoknlv3.FeatureType, 0),
 	}
 
+	if src.Spec.Service.Maxfeatures != nil {
+		maxFeatures, err := strconv.Atoi(*src.Spec.Service.Maxfeatures)
+		if err != nil {
+			return err
+		}
+		service.CountDefault = &maxFeatures
+	}
+
 	if src.Spec.Service.Mapfile != nil {
 		service.Mapfile = &pdoknlv3.Mapfile{
 			ConfigMapKeyRef: src.Spec.Service.Mapfile.ConfigMapKeyRef,
@@ -209,13 +220,16 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
 		Keywords:          src.Spec.Service.Keywords,
 		AccessConstraints: &accessConstraints,
 		DataEPSG:          src.Spec.Service.DefaultCrs,
-		Maxfeatures:       src.Spec.Service.CountDefault,
 		Authority: Authority{
 			Name: "",
 			URL:  "",
 		},
 	}
 
+	if src.Spec.Service.CountDefault != nil {
+		service.Maxfeatures = smoothoperatorutils.Pointer(strconv.Itoa(*src.Spec.Service.CountDefault))
+	}
+
 	if src.Spec.Service.Bbox != nil {
 		service.Extent = smoothoperatorutils.Pointer(src.Spec.Service.Bbox.DefaultCRS.ToExtent())
 	} else {

api/v3/shared_validation.go

@@ -2,6 +2,7 @@ package v3
 
 import (
 	"fmt"
+
 	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
 	v1 "k8s.io/api/core/v1"
 

api/v3/wfs_types.go

@@ -126,9 +126,7 @@ type WFSService struct {
 	Fees *string `json:"fees,omitempty"`
 
 	// AccessConstraints URL
-	// +kubebuilder:validation:Pattern:="https?://"
 	// +kubebuilder:default="https://creativecommons.org/publicdomain/zero/1.0/deed.nl"
-	// +kubebuilder:validation:MinLength:=1
 	AccessConstraints smoothoperatormodel.URL `json:"accessConstraints,omitempty"`
 
 	// Default CRS (DataEPSG)
@@ -144,8 +142,8 @@ type WFSService struct {
 	Bbox *Bbox `json:"bbox,omitempty"`
 
 	// CountDefault -> wfs_maxfeatures in mapfile
-	// +kubebuilder:validation:MinLength:=1
-	CountDefault *string `json:"countDefault,omitempty"`
+	// +kubebuilder:validation:Minimum:=1
+	CountDefault *int `json:"countDefault,omitempty"`
 
 	// FeatureTypes configurations
 	// +kubebuilder:validation:MinItems:=1

api/v3/zz_generated.deepcopy.go

@@ -1064,14 +1064,6 @@ spec:
                     format: int32
                     type: integer
                 type: object
-                x-kubernetes-validations:
-                - message: 'maxReplicas (default: 30) cannot be less than minReplicas
-                    (default: 2)'
-                  rule: (!has(self.maxReplicas) && !has(self.minReplicas)) || (has(self.maxReplicas)
-                    && has(self.minReplicas) && self.maxReplicas >= self.minReplicas)
-                    || (has(self.maxReplicas) && !has(self.minReplicas) && self.maxReplicas
-                    >= 2) || (!has(self.maxReplicas) && has(self.minReplicas) && 30
-                    >= self.minReplicas)
               lifecycle:
                 description: Optional lifecycle settings
                 properties:
@@ -1143,8 +1135,7 @@ spec:
                   accessConstraints:
                     default: https://creativecommons.org/publicdomain/zero/1.0/deed.nl
                     description: AccessConstraints URL
-                    minLength: 1
-                    pattern: https?://
+                    pattern: ^https?://.+/.+
                     type: string
                   bbox:
                     description: Service bounding box
@@ -1179,8 +1170,8 @@ spec:
                     type: object
                   countDefault:
                     description: CountDefault -> wfs_maxfeatures in mapfile
-                    minLength: 1
-                    type: string
+                    minimum: 1
+                    type: integer
                   defaultCrs:
                     description: Default CRS (DataEPSG)
                     minLength: 1

config/crd/bases/pdok.nl_wfs.yaml

@@ -1085,9 +1085,6 @@ spec:
                       format: int32
                       type: integer
                   type: object
-                  x-kubernetes-validations:
-                    - message: 'maxReplicas (default: 30) cannot be less than minReplicas (default: 2)'
-                      rule: (!has(self.maxReplicas) && !has(self.minReplicas)) || (has(self.maxReplicas) && has(self.minReplicas) && self.maxReplicas >= self.minReplicas) || (has(self.maxReplicas) && !has(self.minReplicas) && self.maxReplicas >= 2) || (!has(self.maxReplicas) && has(self.minReplicas) && 30 >= self.minReplicas)
                 lifecycle:
                   description: Optional lifecycle settings
                   properties:

config/crd/bases/pdok.nl_wms.yaml

@@ -2,10 +2,17 @@ apiVersion: pdok.nl/v3
 kind: WFS
 metadata:
   name: sample
+  labels:
+    sample: sample
 spec:
-  podSpecPatch: {}
+  podSpecPatch:
+    containers:
+      - name: mapserver
+        resources:
+          limits:
+            ephemeral-storage: 2G
   service:
-    accessConstraints: "f"
+    accessConstraints: "http://bla/bla"
     title: "title"
     abstract: "abstract"
     defaultCrs: "EPSG:28992"
@@ -14,6 +21,12 @@ spec:
     ownerInfoRef: "owner"
     prefix: "prefix"
     url: "http://host/path"
+    inspire:
+      language: dut
+      serviceMetadataUrl:
+        csw:
+          metadataIdentifier: testtest-test-test-test-testtesttest
+      spatialDatasetIdentifier: testtest-test-test-test-testtesttest
     featureTypes:
       - name: "name"
         title: "title"

config/samples/v3_wfs.yaml

@@ -91,6 +91,17 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 			},
 		}
 	}
+	if wfs.Spec.Service.CountDefault != nil {
+		operationsMetadata := config.Services.WFS200Config.Wfs200.Capabilities.OperationsMetadata
+		if operationsMetadata == nil {
+			operationsMetadata = &wfs200.OperationsMetadata{}
+		}
+		operationsMetadata.Constraint = append(operationsMetadata.Constraint, wfs200.Constraint{
+			Name:         "CountDefault",
+			DefaultValue: smoothoperatorutils.Pointer(strconv.Itoa(*wfs.Spec.Service.CountDefault)),
+		})
+		config.Services.WFS200Config.Wfs200.Capabilities.OperationsMetadata = operationsMetadata
+	}
 
 	return &config, nil
 }

internal/controller/capabilitiesgenerator/mapper.go

@@ -48,7 +48,7 @@ func MapWFSToMapfileGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv
 		metadataID = wfs.Spec.Service.Inspire.ServiceMetadataURL.CSW.MetadataIdentifier
 	}
 
-	var extent string
+	extent := defaultExtent
 	if wfs.Spec.Service.Bbox != nil {
 		extent = wfs.Spec.Service.Bbox.DefaultCRS.ToExtent()
 	}
@@ -70,7 +70,7 @@ func MapWFSToMapfileGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv
 			EPSGList:   defaultEpsgList, // wfs.Spec.Service.OtherCrs,
 			DebugLevel: mapserverDebugLevel,
 		},
-		MaxFeatures: smoothoperatorutils.PointerVal(wfs.Spec.Service.CountDefault, strconv.Itoa(defaultMaxFeatures)),
+		MaxFeatures: strconv.Itoa(smoothoperatorutils.PointerVal(wfs.Spec.Service.CountDefault, defaultMaxFeatures)),
 		Layers:      getWFSLayers(wfs.Spec.Service),
 	}