Merge pull request #91 from PDOK/jd/fixes

jelledijkstra97 · web-flow · commit 1b2c91fad0b9 · 2025-06-13T14:38:24.000+02:00
Conversion fixes
diff --git a/api/v2beta1/shared_conversion.go b/api/v2beta1/shared_conversion.go
@@ -52,15 +52,16 @@ func ConvertOptionsV3ToV2(src *pdoknlv3.Options) *WMSWFSOptions {
 
 //nolint:gosec
 func ConvertAutoscaling(src Autoscaling) *pdoknlv3.HorizontalPodAutoscalerPatch {
-	var minReplicas *int32
+	hpa := &pdoknlv3.HorizontalPodAutoscalerPatch{}
+
 	if src.MinReplicas != nil {
 		//nolint:gosec
-		minReplicas = smoothoperatorutils.Pointer(int32(*src.MinReplicas))
+		hpa.MinReplicas = smoothoperatorutils.Pointer(int32(*src.MinReplicas))
 	}
 
-	var maxReplicas int32
 	if src.MaxReplicas != nil {
-		maxReplicas = int32(*src.MaxReplicas)
+		//nolint:gosec
+		hpa.MaxReplicas = smoothoperatorutils.Pointer(int32(*src.MaxReplicas))
 	}
 
 	metrics := make([]autoscalingv2.MetricSpec, 0)
@@ -75,13 +76,10 @@ func ConvertAutoscaling(src Autoscaling) *pdoknlv3.HorizontalPodAutoscalerPatch
 				},
 			},
 		})
+		hpa.Metrics = metrics
 	}
 
-	return &pdoknlv3.HorizontalPodAutoscalerPatch{
-		MinReplicas: minReplicas,
-		MaxReplicas: &maxReplicas,
-		Metrics:     metrics,
-	}
+	return hpa
 }
 
 func ConvertResources(src corev1.ResourceRequirements) corev1.PodSpec {
@@ -168,7 +166,7 @@ func ConvertV2DataToV3(v2 Data) pdoknlv3.Data {
 	if v2.Tif != nil {
 		v3.TIF = &pdoknlv3.TIF{
 			BlobKey:                     v2.Tif.BlobKey,
-			Resample:                    *v2.Tif.Resample,
+			Resample:                    smoothoperatorutils.PointerVal(v2.Tif.Resample, "NEAREST"),
 			Offsite:                     v2.Tif.Offsite,
 			GetFeatureInfoIncludesClass: smoothoperatorutils.PointerVal(v2.Tif.GetFeatureInfoIncludesClass, false),
 		}
diff --git a/api/v2beta1/wfs_conversion.go b/api/v2beta1/wfs_conversion.go
@@ -88,9 +88,23 @@ func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 		}
 	}
 
-	if err != nil {
-		return err
+	allOtherCrs := []string{
+		"EPSG:25831",
+		"EPSG:25832",
+		"EPSG:28992",
+		"EPSG:3034",
+		"EPSG:3035",
+		"EPSG:3857",
+		"EPSG:4258",
+		"EPSG:4326",
+	}
+	otherCrs := []string{}
+	for _, cr := range allOtherCrs {
+		if cr != src.Spec.Service.DataEPSG {
+			otherCrs = append(otherCrs, cr)
+		}
 	}
+
 	service := pdoknlv3.WFSService{
 		BaseService: pdoknlv3.BaseService{
 			Prefix:            src.Spec.General.Dataset,
@@ -102,16 +116,8 @@ func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 			Fees:              nil,
 			AccessConstraints: smoothoperatormodel.URL{URL: accessConstraints},
 		},
-		DefaultCrs: src.Spec.Service.DataEPSG,
-		OtherCrs: []string{
-			"EPSG:25831",
-			"EPSG:25832",
-			"EPSG:3034",
-			"EPSG:3035",
-			"EPSG:3857",
-			"EPSG:4258",
-			"EPSG:4326",
-		},
+		DefaultCrs:   src.Spec.Service.DataEPSG,
+		OtherCrs:     otherCrs,
 		FeatureTypes: make([]pdoknlv3.FeatureType, 0),
 	}
 
diff --git a/api/v2beta1/wms_conversion.go b/api/v2beta1/wms_conversion.go
@@ -158,8 +158,8 @@ func (src *WMS) ToV3(target *pdoknlv3.WMS) error {
 		if len(src.Spec.Service.StylingAssets.ConfigMapRefs) == 1 {
 			for _, layer := range src.Spec.Service.Layers {
 				for _, style := range layer.Styles {
-					if style.Visualization != nil && !slices.Contains(src.Spec.Service.StylingAssets.ConfigMapRefs[0].Keys, *style.Visualization) {
-						src.Spec.Service.StylingAssets.ConfigMapRefs[0].Keys = append(src.Spec.Service.StylingAssets.ConfigMapRefs[0].Keys, *style.Visualization)
+					if style.Visualization != nil && !slices.Contains(service.StylingAssets.ConfigMapRefs[0].Keys, *style.Visualization) {
+						service.StylingAssets.ConfigMapRefs[0].Keys = append(service.StylingAssets.ConfigMapRefs[0].Keys, *style.Visualization)
 					}
 				}
 			}
@@ -440,45 +440,45 @@ func getDefaultWMSLayerBoundingBoxes(defaultBbox *pdoknlv3.WMSBoundingBox) []pdo
 			CRS: "EPSG:25831",
 			BBox: smoothoperatormodel.BBox{
 				MinX: "-470271",
-				MinY: "5.56231e+06",
+				MinY: "5562310",
 				MaxX: "795163",
-				MaxY: "6.18197e+06",
+				MaxY: "6181970",
 			},
 		},
 		{
 			CRS: "EPSG:25832",
 			BBox: smoothoperatormodel.BBox{
 				MinX: "62461.6",
-				MinY: "5.56555e+06",
+				MinY: "5565550",
 				MaxX: "397827",
-				MaxY: "6.19042e+06",
+				MaxY: "6190420",
 			},
 		},
 		{
 			CRS: "EPSG:3034",
 			BBox: smoothoperatormodel.BBox{
-				MinX: "2.61336e+06",
-				MinY: "3.509e+06",
-				MaxX: "3.22007e+06",
-				MaxY: "3.84003e+06",
+				MinX: "2613360",
+				MinY: "3509000",
+				MaxX: "3220070",
+				MaxY: "3840030",
 			},
 		},
 		{
 			CRS: "EPSG:3035",
 			BBox: smoothoperatormodel.BBox{
-				MinX: "3.01676e+06",
-				MinY: "3.81264e+06",
-				MaxX: "3.64485e+06",
-				MaxY: "4.15586e+06",
+				MinX: "3016760",
+				MinY: "3812640",
+				MaxX: "3644850",
+				MaxY: "4155860",
 			},
 		},
 		{
 			CRS: "EPSG:3857",
 			BBox: smoothoperatormodel.BBox{
 				MinX: "281318",
-				MinY: "6.48322e+06",
+				MinY: "6483220",
 				MaxX: "820873",
-				MaxY: "7.50311e+06",
+				MaxY: "7503110",
 			},
 		},
 		{
diff --git a/api/v3/wfs_types.go b/api/v3/wfs_types.go
@@ -136,8 +136,8 @@ func (s WFSService) KeywordsIncludingInspireKeyword() []string {
 
 // HealthCheck is the struct with all fields to configure custom healthchecks
 type HealthCheckWFS struct {
-	// +kubebuilder:validation:XValidation:rule="self.contains('Service=WFS')",message="a valid healthcheck contains 'Service=WFS'"
-	// +kubebuilder:validation:XValidation:rule="self.contains('Request=')",message="a valid healthcheck contains 'Request='"
+	// +kubebuilder:validation:XValidation:rule="self.lowerAscii().contains('service=wfs')",message="a valid healthcheck contains 'Service=WFS'"
+	// +kubebuilder:validation:XValidation:rule="self.lowerAscii().contains('request=')",message="a valid healthcheck contains 'Request='"
 	Querystring string `json:"querystring"`
 	// +kubebuilder:validation:Pattern=(image/png|text/xml|text/html)
 	Mimetype string `json:"mimetype"`
diff --git a/api/v3/wms_types.go b/api/v3/wms_types.go
@@ -155,8 +155,8 @@ func (wmsService WMSService) KeywordsIncludingInspireKeyword() []string {
 // +kubebuilder:validation:XValidation:rule="(has(self.boundingbox) || has(self.querystring)) && !(has(self.querystring) && has(self.boundingbox))", message="healthcheck should have exactly 1 of querystring + mimetype or boundingbox"
 // +kubebuilder:validation:XValidation:rule="(has(self.boundingbox) || has(self.mimetype)) && !(has(self.mimetype) && has(self.boundingbox))", message="healthcheck should have exactly 1 of querystring + mimetype or boundingbox"
 type HealthCheckWMS struct {
-	// +kubebuilder:validation:XValidation:rule="self.contains('Service=WMS')",message="a valid healthcheck contains 'Service=WMS'"
-	// +kubebuilder:validation:XValidation:rule="self.contains('Request=')",message="a valid healthcheck contains 'Request='"
+	// +kubebuilder:validation:XValidation:rule="self.lowerAscii().contains('service=wms')",message="a valid healthcheck contains 'SERVICE=WMS'"
+	// +kubebuilder:validation:XValidation:rule="self.lowerAscii().contains('request=')",message="a valid healthcheck contains 'REQUEST='"
 	Querystring *string `json:"querystring,omitempty"`
 	// +kubebuilder:validation:Pattern=(image/png|text/xml|text/html)
 	Mimetype *string `json:"mimetype,omitempty"`
@@ -216,7 +216,8 @@ type Layer struct {
 
 	// Whether or not the layer is visible. At least one of the layers must be visible.
 	// +kubebuilder:default:=true
-	Visible bool `json:"visible,omitempty"`
+	// +kubebuilder:validation:Optional
+	Visible bool `json:"visible"`
 
 	// TODO ??
 	Authority *Authority `json:"authority,omitempty"`
diff --git a/config/crd/bases/pdok.nl_wfs.yaml b/config/crd/bases/pdok.nl_wfs.yaml
@@ -49,9 +49,9 @@ spec:
                       type: string
                       x-kubernetes-validations:
                         - message: a valid healthcheck contains 'Service=WFS'
-                          rule: self.contains('Service=WFS')
+                          rule: self.lowerAscii().contains('service=wfs')
                         - message: a valid healthcheck contains 'Request='
-                          rule: self.contains('Request=')
+                          rule: self.lowerAscii().contains('request=')
                   required:
                     - mimetype
                     - querystring
diff --git a/config/crd/bases/pdok.nl_wms.yaml b/config/crd/bases/pdok.nl_wms.yaml
@@ -73,10 +73,10 @@ spec:
                     querystring:
                       type: string
                       x-kubernetes-validations:
-                        - message: a valid healthcheck contains 'Service=WMS'
-                          rule: self.contains('Service=WMS')
-                        - message: a valid healthcheck contains 'Request='
-                          rule: self.contains('Request=')
+                        - message: a valid healthcheck contains 'SERVICE=WMS'
+                          rule: self.lowerAscii().contains('service=wms')
+                        - message: a valid healthcheck contains 'REQUEST='
+                          rule: self.lowerAscii().contains('request=')
                   type: object
                   x-kubernetes-validations:
                     - message: mimetype is required when a querystring is used
