Merge pull request #68 from PDOK/jd/wms-prefix

Prefix in WMS spec

Author: jelledijkstra97

api/v2beta1/wms_conversion.go

@@ -77,6 +77,7 @@ func (src *WMS) ToV3(target *pdoknlv3.WMS) {
 	dst.Spec.HealthCheck = convertHealthCheckToV3(src.Spec.Kubernetes.HealthCheck)
 
 	service := pdoknlv3.WMSService{
+		Prefix:            src.Spec.General.Dataset,
 		URL:               CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
 		OwnerInfoRef:      "pdok",
 		Title:             src.Spec.Service.Title,

api/v3/wms_types.go

@@ -74,6 +74,9 @@ type WMSSpec struct {
 }
 
 type WMSService struct {
+	// +kubebuilder:validation:MinLength:=1
+	Prefix string `json:"prefix"`
+
 	// URL of the service
 	// +kubebuilder:validation:Format:=uri
 	URL string `json:"url"`

config/crd/bases/pdok.nl_wms.yaml

@@ -2095,6 +2095,9 @@ spec:
                       description: Reference to a CR of Kind OwnerInfo
                       minLength: 1
                       type: string
+                    prefix:
+                      minLength: 1
+                      type: string
                     resolution:
                       description: 'Mapfile setting: Sets the RESOLUTION field in the mapfile, not used when service.mapfile is configured'
                       format: int32
@@ -2137,6 +2140,7 @@ spec:
                     - keywords
                     - layer
                     - ownerInfoRef
+                    - prefix
                     - title
                     - url
                   type: object

internal/controller/mapfilegenerator/mapper.go

@@ -1,7 +1,6 @@
 package mapfilegenerator
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
@@ -145,22 +144,15 @@ func getGeopackagePath(data pdoknlv3.Data) *string {
 	return smoothoperatorutils.Pointer(geopackagePath + "/" + blobName)
 }
 
-func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerInfo) (WMSInput, error) {
+func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv1.OwnerInfo) (WMSInput, error) {
 	service := wms.Spec.Service
 
-	datasetOwner := ""
-	if service.Layer.Authority != nil {
-		datasetOwner = service.Layer.Authority.Name
-	} else {
-		datasetOwner = wms.ObjectMeta.Labels["dataset-owner"]
-	}
-
-	datasetName := wms.ObjectMeta.Labels["dataset"]
-	protocol := "http"
 	authority := wms.GetAuthority()
 	authorityURL := ""
+	datasetOwner := ""
 	if authority != nil {
 		authorityURL = authority.URL
+		datasetOwner = authority.Name
 	}
 
 	box := service.GetBoundingBox()
@@ -198,8 +190,8 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
 			Abstract:        service.Abstract,
 			Keywords:        strings.Join(wms.Spec.Service.KeywordsIncludingInspireKeyword(), ","),
 			Extent:          extent,
-			NamespacePrefix: datasetName,
-			NamespaceURI:    fmt.Sprintf("%s://%s.geonovum.nl", protocol, datasetName),
+			NamespacePrefix: wms.Spec.Service.Prefix,
+			NamespaceURI:    mapperutils.GetNamespaceURI(wms.Spec.Service.Prefix, ownerInfo),
 			OnlineResource:  pdoknlv3.GetHost(true),
 			Path:            "/" + pdoknlv3.GetBaseURLPath(wms),
 			MetadataID:      metadataID,

internal/controller/test_data/wms/complete/input/wms.yaml

@@ -44,6 +44,7 @@ spec:
           ephemeral-storage: 11G
           memory: 50M
   service:
+    prefix: dataset
     abstract: some "service" abstract
     accessConstraints: http://creativecommons.org/publicdomain/zero/1.0/deed.nl
     dataEPSG: EPSG:28992

internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapfile-generator.yaml

@@ -107,7 +107,7 @@ metadata:
     inspire: "false"
     service-type: wms
     service-version: v1_0
-  name: custom-mapfile-wms-mapfile-generator-gbcm54mbtm
+  name: custom-mapfile-wms-mapfile-generator-kg99hgf8dg
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wms/custom-mapfile/input/wms.yaml

@@ -19,6 +19,7 @@ spec:
         limits:
           ephemeral-storage: 100m
   service:
+    prefix: dataset
     abstract: service-abstract
     accessConstraints: http://creativecommons.org/publicdomain/zero/1.0/deed.nl
     dataEPSG: EPSG:28992

internal/controller/test_data/wms/minimal/expected/configmap-mapfile-generator.yaml

@@ -107,7 +107,7 @@ metadata:
     inspire: "false"
     service-type: wms
     service-version: v1_0
-  name: minimal-wms-mapfile-generator-gbcm54mbtm
+  name: minimal-wms-mapfile-generator-kg99hgf8dg
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wms/minimal/expected/deployment.yaml

@@ -346,7 +346,7 @@ spec:
             defaultMode: 420
           name: capabilities-generator-config
         - configMap:
-            name: minimal-wms-mapfile-generator-gbcm54mbtm
+            name: minimal-wms-mapfile-generator-kg99hgf8dg
             defaultMode: 420
           name: mapfile-generator-config
         - name: styling-files

internal/controller/test_data/wms/minimal/input/wms.yaml

@@ -19,6 +19,7 @@ spec:
         limits:
           ephemeral-storage: 100m
   service:
+    prefix: dataset
     abstract: service-abstract
     accessConstraints: http://creativecommons.org/publicdomain/zero/1.0/deed.nl
     dataEPSG: EPSG:28992