Merge branch 'master' into admission-test

Author: jelledijkstra97

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Kubebuilder DevContainer",
-  "image": "docker.io/golang:1.23",
+  "image": "docker.io/golang:1.24",
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:2": {},
     "ghcr.io/devcontainers/features/git:1": {}

Dockerfile

@@ -3,6 +3,9 @@ FROM docker.io/golang:1.24 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
+#COPY --from=repos ./smooth-operator /smooth-operator
+#COPY --from=repos ./ogc-specifications /ogc-specifications
+
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod

Makefile

@@ -44,6 +44,7 @@ help: ## Display this help.
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd:allowDangerousTypes=true webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	go run config/crd/update_openapi.go config/crd/bases
 ## allowDangerousTypes=true for v2beta structs
 
 .PHONY: generate

api/v2beta1/wms_conversion.go

@@ -26,17 +26,17 @@ package v2beta1
 
 import (
 	"errors"
+	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	"log"
-	"strconv"
-
-	sharedModel "github.com/pdok/smooth-operator/model"
-
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
+	"strconv"
+	"strings"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
+	sharedModel "github.com/pdok/smooth-operator/model"
 )
 
-const SERVICE_METADATA_IDENTIFIER_ANNOTATION = "pdok.nl/wms-service-metadata-uuid"
+const ServiceMetatdataIdentifierAnnotation = "pdok.nl/wms-service-metadata-uuid"
 
 // ConvertTo converts this WMS (v2beta1) to the Hub version (v3).
 func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
@@ -56,7 +56,7 @@ func V3WMSHubFromV2(src *WMS, target *pdoknlv3.WMS) {
 		dst.Annotations = make(map[string]string)
 	}
 
-	dst.Annotations[SERVICE_METADATA_IDENTIFIER_ANNOTATION] = src.Spec.Service.MetadataIdentifier
+	dst.Annotations[ServiceMetatdataIdentifierAnnotation] = src.Spec.Service.MetadataIdentifier
 
 	// Set LifeCycle if defined
 	if src.Spec.Kubernetes.Lifecycle != nil && src.Spec.Kubernetes.Lifecycle.TTLInDays != nil {
@@ -180,7 +180,7 @@ func (dst *WMS) ConvertFrom(srcRaw conversion.Hub) error {
 		// TODO unable to fill in MetadataIdentifier here until we know how to handle non inspire services
 	}
 
-	uuid, ok := src.Annotations[SERVICE_METADATA_IDENTIFIER_ANNOTATION]
+	uuid, ok := src.Annotations[ServiceMetatdataIdentifierAnnotation]
 	if service.MetadataIdentifier == "00000000-0000-0000-0000-000000000000" && ok {
 		service.MetadataIdentifier = uuid
 	}
@@ -300,11 +300,28 @@ func (v2Service WMSService) MapLayersToV3() pdoknlv3.Layer {
 	// it needs to be created with defaults from the service
 	// and in this case the middleLayers are all layers without a group
 	if topLayer == nil {
+		boundingBoxes := make([]pdoknlv3.WMSBoundingBox, 0)
+		if v2Service.Extent != nil {
+			bboxStringList := strings.Split(*v2Service.Extent, " ")
+			bbox := pdoknlv3.WMSBoundingBox{
+				CRS: v2Service.DataEPSG,
+				BBox: sharedModel.BBox{
+					MinX: bboxStringList[0],
+					MaxX: bboxStringList[2],
+					MinY: bboxStringList[1],
+					MaxY: bboxStringList[3],
+				},
+			}
+			boundingBoxes = append(boundingBoxes, bbox)
+		}
+
 		topLayer = &pdoknlv3.Layer{
-			Title:    &v2Service.Title,
-			Abstract: &v2Service.Abstract,
-			Keywords: v2Service.Keywords,
-			Layers:   &[]pdoknlv3.Layer{},
+			Title:         &v2Service.Title,
+			Abstract:      &v2Service.Abstract,
+			Keywords:      v2Service.Keywords,
+			Layers:        &[]pdoknlv3.Layer{},
+			BoundingBoxes: boundingBoxes,
+			Visible:       smoothoperatorutils.Pointer(true),
 		}
 
 		if v2Service.DataEPSG != "EPSG:28992" && v2Service.Extent != nil {
@@ -416,7 +433,7 @@ func (v2Layer WMSLayer) MapToV3(v2Service WMSService) pdoknlv3.Layer {
 func mapV3LayerToV2Layers(v3Layer pdoknlv3.Layer, parent *pdoknlv3.Layer, serviceEPSG string) []WMSLayer {
 	var layers []WMSLayer
 
-	if parent == nil && *v3Layer.Name == "wms" {
+	if parent == nil && v3Layer.Name == nil {
 		// Default top layer, do not include in v2 layers
 		if v3Layer.Layers != nil {
 			for _, childLayer := range *v3Layer.Layers {
@@ -433,7 +450,7 @@ func mapV3LayerToV2Layers(v3Layer pdoknlv3.Layer, parent *pdoknlv3.Layer, servic
 			Styles:      []Style{},
 		}
 
-		v2Layer.Visible = PointerVal(v3Layer.Visible, true)
+		v2Layer.Visible = *v3Layer.Visible
 
 		if parent != nil {
 			v2Layer.Group = parent.Name

api/v2beta1/wms_conversion_test.go

@@ -8,6 +8,7 @@ import (
 )
 
 func TestV2ToV3(t *testing.T) {
+	//nolint:misspell
 	input := "apiVersion: pdok.nl/v2beta1\nkind: WMS\nmetadata:\n  name: rws-nwbwegen-v1-0\n  labels:\n    dataset-owner: rws\n    dataset: nwbwegen\n    service-version: v1_0\n    service-type: wms\n  annotations:\n    lifecycle-phase: prod\n    service-bundle-id: b39c152b-393b-52f5-a50c-e1ffe904b6fb\nspec:\n  general:\n    datasetOwner: rws\n    dataset: nwbwegen\n    serviceVersion: v1_0\n  kubernetes:\n    healthCheck:\n      boundingbox: 135134.89,457152.55,135416.03,457187.82\n    resources:\n      limits:\n        ephemeralStorage: 1535Mi\n        memory: 4G\n      requests:\n        cpu: 2000m\n        ephemeralStorage: 1535Mi\n        memory: 4G\n  options:\n    automaticCasing: true\n    disableWebserviceProxy: false\n    includeIngress: true\n    validateRequests: true\n  service:\n    title: NWB - Wegen WMS\n    abstract:\n      Dit is de web map service van het Nationaal Wegen Bestand (NWB) - wegen.\n      Deze dataset bevat alleen de wegvakken en hectometerpunten. Het Nationaal Wegen\n      Bestand - Wegen is een digitaal geografisch bestand van alle wegen in Nederland.\n      Opgenomen zijn alle wegen die worden beheerd door wegbeheerders als het Rijk,\n      provincies, gemeenten en waterschappen, echter alleen voor zover deze zijn voorzien\n      van een straatnaam of nummer.\n    authority:\n      name: rws\n      url: https://www.rijkswaterstaat.nl\n    dataEPSG: EPSG:28992\n    extent: -59188.44333693248 304984.64144318487 308126.88473339565 858328.516489961\n    inspire: true\n    keywords:\n      - Vervoersnetwerken\n      - Menselijke gezondheid en veiligheid\n      - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n      - Nationaal\n      - Voertuigen\n      - Verkeer\n      - Wegvakken\n      - Hectometerpunten\n      - HVD\n      - Mobiliteit\n    stylingAssets:\n      configMapRefs:\n        - name: includes\n          keys:\n            - nwb_wegen_hectopunten.symbol\n            - hectopunten.style\n            - wegvakken.style\n      blobKeys:\n        - resources/fonts/liberation-sans.ttf\n    layers:\n      - abstract:\n          Deze laag bevat de wegvakken uit het Nationaal Wegen bestand (NWB)\n          en geeft gedetailleerde informatie per wegvak zoals straatnaam, wegnummer,\n          routenummer, wegbeheerder, huisnummers, enz. weer.\n        data:\n          gpkg:\n            columns:\n              - objectid\n              - wvk_id\n              - wvk_begdat\n              - jte_id_beg\n              - jte_id_end\n              - wegbehsrt\n              - wegnummer\n              - wegdeelltr\n              - hecto_lttr\n              - bst_code\n              - rpe_code\n              - admrichtng\n              - rijrichtng\n              - stt_naam\n              - stt_bron\n              - wpsnaam\n              - gme_id\n              - gme_naam\n              - hnrstrlnks\n              - hnrstrrhts\n              - e_hnr_lnks\n              - e_hnr_rhts\n              - l_hnr_lnks\n              - l_hnr_rhts\n              - begafstand\n              - endafstand\n              - beginkm\n              - eindkm\n              - pos_tv_wol\n              - wegbehcode\n              - wegbehnaam\n              - distrcode\n              - distrnaam\n              - dienstcode\n              - dienstnaam\n              - wegtype\n              - wgtype_oms\n              - routeltr\n              - routenr\n              - routeltr2\n              - routenr2\n              - routeltr3\n              - routenr3\n              - routeltr4\n              - routenr4\n              - wegnr_aw\n              - wegnr_hmp\n              - geobron_id\n              - geobron_nm\n              - bronjaar\n              - openlr\n              - bag_orl\n              - frc\n              - fow\n              - alt_naam\n              - alt_nr\n              - rel_hoogte\n              - st_lengthshape\n            geometryType: MultiLineString\n            blobKey: geopackages/rws/nwbwegen/410a6d1e-e767-41b4-ba8d-9e1e955dd013/1/nwb_wegen.gpkg\n            table: wegvakken\n        datasetMetadataIdentifier: a9b7026e-0a81-4813-93bd-ba49e6f28502\n        keywords:\n          - Vervoersnetwerken\n          - Menselijke gezondheid en veiligheid\n          - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n          - Nationaal\n          - Voertuigen\n          - Verkeer\n          - Wegvakken\n        maxScale: 50000.0\n        minScale: 1.0\n        name: wegvakken\n        sourceMetadataIdentifier: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff\n        styles:\n          - name: wegvakken\n            title: NWB - Wegvakken\n            visualization: wegvakken.style\n        title: Wegvakken\n        visible: true\n      - abstract:\n          Deze laag bevat de hectopunten uit het Nationaal Wegen Bestand (NWB)\n          en geeft gedetailleerde informatie per hectopunt zoals hectometrering, afstand,\n          zijde en hectoletter weer.\n        data:\n          gpkg:\n            columns:\n              - objectid\n              - hectomtrng\n              - afstand\n              - wvk_id\n              - wvk_begdat\n              - zijde\n              - hecto_lttr\n            geometryType: MultiPoint\n            blobKey: geopackages/rws/nwbwegen/410a6d1e-e767-41b4-ba8d-9e1e955dd013/1/nwb_wegen.gpkg\n            table: hectopunten\n        datasetMetadataIdentifier: a9b7026e-0a81-4813-93bd-ba49e6f28502\n        keywords:\n          - Vervoersnetwerken\n          - Menselijke gezondheid en veiligheid\n          - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n          - Nationaal\n          - Voertuigen\n          - Verkeer\n          - Hectometerpunten\n        maxScale: 50000.0\n        minScale: 1.0\n        name: hectopunten\n        sourceMetadataIdentifier: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff\n        styles:\n          - name: hectopunten\n            title: NWB - Hectopunten\n            visualization: hectopunten.style\n        title: Hectopunten\n        visible: true\n    metadataIdentifier: f2437a92-ddd3-4777-a1bc-fdf4b4a7fcb8\n"
 	var v2wms WMS
 	err := yaml.Unmarshal([]byte(input), &v2wms)

api/v2beta1/wms_types.go

@@ -54,21 +54,23 @@ type WMSSpec struct {
 
 // WMSService is the struct for all service level fields
 type WMSService struct {
-	Inspire            bool           `json:"inspire"`
-	Title              string         `json:"title"`
-	Abstract           string         `json:"abstract"`
-	AccessConstraints  string         `json:"accessConstraints"`
-	Keywords           []string       `json:"keywords"`
-	MetadataIdentifier string         `json:"metadataIdentifier"`
-	Authority          Authority      `json:"authority"`
-	Layers             []WMSLayer     `json:"layers"`
-	DataEPSG           string         `json:"dataEPSG"`
-	Extent             *string        `json:"extent,omitempty"`
-	Maxsize            *float64       `json:"maxSize,omitempty"`
-	Resolution         *int           `json:"resolution,omitempty"`
-	DefResolution      *int           `json:"defResolution,omitempty"`
-	StylingAssets      *StylingAssets `json:"stylingAssets,omitempty"`
-	Mapfile            *Mapfile       `json:"mapfile,omitempty"`
+	Inspire  bool   `json:"inspire"`
+	Title    string `json:"title"`
+	Abstract string `json:"abstract"`
+	// +kubebuilder:default="https://creativecommons.org/publicdomain/zero/1.0/deed.nl"
+	AccessConstraints  string     `json:"accessConstraints"`
+	Keywords           []string   `json:"keywords"`
+	MetadataIdentifier string     `json:"metadataIdentifier"`
+	Authority          Authority  `json:"authority"`
+	Layers             []WMSLayer `json:"layers"`
+	//nolint:tagliatelle
+	DataEPSG      string         `json:"dataEPSG"`
+	Extent        *string        `json:"extent,omitempty"`
+	Maxsize       *float64       `json:"maxSize,omitempty"`
+	Resolution    *int           `json:"resolution,omitempty"`
+	DefResolution *int           `json:"defResolution,omitempty"`
+	StylingAssets *StylingAssets `json:"stylingAssets,omitempty"`
+	Mapfile       *Mapfile       `json:"mapfile,omitempty"`
 }
 
 // WMSLayer is the struct for all layer level fields
@@ -85,7 +87,7 @@ type WMSLayer struct {
 	Extent                    *string  `json:"extent,omitempty"`
 	MinScale                  *float64 `json:"minScale,omitempty"`
 	MaxScale                  *float64 `json:"maxScale,omitempty"`
-	LabelNoClip               bool     `json:"labelNoClip"`
+	LabelNoClip               bool     `json:"labelNoClip,omitempty"`
 	Data                      *Data    `json:"data,omitempty"`
 }