Working blobdownload + mapfilegenerator

Jelle Dijkstra · Jelle Dijkstra · commit 476ab237d03c · 2025-04-30T09:02:43.000+02:00
diff --git a/Makefile b/Makefile
@@ -44,7 +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 cmd/update_openapi.go config/crd/bases
+	go run config/crd/update_openapi.go config/crd/bases
 ## allowDangerousTypes=true for v2beta structs
 
 .PHONY: generate
diff --git a/api/v3/wms_types.go b/api/v3/wms_types.go
@@ -94,7 +94,7 @@ type Layer struct {
 	Title         *string          `json:"title,omitempty"`
 	Abstract      *string          `json:"abstract,omitempty"`
 	Keywords      []string         `json:"keywords"`
-	BoundingBoxes []WMSBoundingBox `json:"boundingBoxes"`
+	BoundingBoxes []WMSBoundingBox `json:"boundingBoxes,omitempty"`
 	// +kubebuilder:default:=true
 	Visible             *bool        `json:"visible,omitempty"`
 	Authority           *Authority   `json:"authority,omitempty"`
diff --git a/api/v3/wms_validation.go b/api/v3/wms_validation.go
@@ -110,7 +110,7 @@ func validateWMS(wms *WMS, warnings *[]string, reasons *[]string) {
 		}
 
 		if slices.Contains(names, layerName) {
-			layerReasons = append(layerReasons, fmt.Sprintf("layer names must be unique, layer.name '%s' is duplicated", layer.Name))
+			layerReasons = append(layerReasons, fmt.Sprintf("layer names must be unique, layer.name '%s' is duplicated", layerName))
 		}
 		names = append(names, layerName)
 
@@ -204,7 +204,7 @@ func validateWMS(wms *WMS, warnings *[]string, reasons *[]string) {
 			}
 		}
 		if len(layerReasons) != 0 {
-			*reasons = append(*reasons, fmt.Sprintf("%s '%s' is invalid: ", layerType, layer.Name)+strings.Join(layerReasons, ", "))
+			*reasons = append(*reasons, fmt.Sprintf("%s '%s' is invalid: ", layerType, layerName)+strings.Join(layerReasons, ", "))
 		}
 	}
 
diff --git a/config/crd/bases/pdok.nl_wms.yaml b/config/crd/bases/pdok.nl_wms.yaml
@@ -1719,7 +1719,6 @@ spec:
                                     default: true
                                     type: boolean
                                 required:
-                                - boundingBoxes
                                 - keywords
                                 - name
                                 type: object
@@ -1769,7 +1768,6 @@ spec:
                               default: true
                               type: boolean
                           required:
-                          - boundingBoxes
                           - keywords
                           - name
                           type: object
@@ -1819,7 +1817,6 @@ spec:
                         default: true
                         type: boolean
                     required:
-                    - boundingBoxes
                     - keywords
                     type: object
                   mapfile:
diff --git a/config/crd/update_openapi.go b/config/crd/update_openapi.go
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: local-registry:5000/mapserver-operator
-  newTag: v3.0.24
+  newTag: v3.0.26
diff --git a/internal/controller/blobdownload/blob_download.go b/internal/controller/blobdownload/blob_download.go
@@ -197,14 +197,14 @@ func downloadLegends(sb *strings.Builder, wms *pdoknlv3.WMS) error {
 	layers := wms.GetAllLayersWithLegend()
 	if len(layers) > 0 {
 		for _, layer := range layers {
-			writeLine(sb, "mkdir -p %s/%s;", legendPath, layer.Name)
+			writeLine(sb, "mkdir -p %s/%s;", legendPath, *layer.Name)
 			for _, style := range layer.Styles {
-				writeLine(sb, "rclone copyto blobs:/%s  %s/%s/%s.png || exit 1;", style.Legend.BlobKey, legendPath, layer.Name, style.Name)
+				writeLine(sb, "rclone copyto blobs:/%s  %s/%s/%s.png || exit 1;", style.Legend.BlobKey, legendPath, *layer.Name, style.Name)
 				fileName, err := getFilenameFromBlobKey(style.Legend.BlobKey)
 				if err != nil {
 					return err
 				}
-				writeLine(sb, "Copied legend %s to %s/%s/%s.png;", fileName, legendPath, layer.Name, style.Name)
+				writeLine(sb, "Copied legend %s to %s/%s/%s.png;", fileName, legendPath, *layer.Name, style.Name)
 			}
 		}
 		writeLine(sb, "chown -R 999:999 %s", legendPath)
diff --git a/internal/controller/mapserver/deployment.go b/internal/controller/mapserver/deployment.go
@@ -103,26 +103,26 @@ func GetVolumesForDeployment[O pdoknlv3.WMSWFS](obj O, configMapNames types.Hash
 			Name:         ConfigMapFeatureinfoGeneratorVolumeName,
 			VolumeSource: newVolumeSource(configMapNames.FeatureInfoGenerator),
 		}
+
+		wms, _ := any(obj).(*pdoknlv3.WMS)
+		stylingFilesVolumeProjections := []v1.VolumeProjection{}
+		if wms.Spec.Service.StylingAssets != nil && wms.Spec.Service.StylingAssets.ConfigMapRefs != nil {
+			for _, cf := range wms.Spec.Service.StylingAssets.ConfigMapRefs {
+				stylingFilesVolumeProjections = append(stylingFilesVolumeProjections, v1.VolumeProjection{
+					ConfigMap: &v1.ConfigMapProjection{
+						LocalObjectReference: v1.LocalObjectReference{
+							Name: cf.Name,
+						},
+					},
+				})
+			}
+		}
+
 		stylingFilesVolume := v1.Volume{
 			Name: ConfigMapStylingFilesVolumeName,
 			VolumeSource: v1.VolumeSource{
 				Projected: &v1.ProjectedVolumeSource{
-					Sources: []v1.VolumeProjection{
-						{
-							ConfigMap: &v1.ConfigMapProjection{
-								LocalObjectReference: v1.LocalObjectReference{
-									Name: "gpkg-styling",
-								},
-							},
-						},
-						{
-							ConfigMap: &v1.ConfigMapProjection{
-								LocalObjectReference: v1.LocalObjectReference{
-									Name: "tif-styling",
-								},
-							},
-						},
-					},
+					Sources: stylingFilesVolumeProjections,
 				},
 			},
 		}
diff --git a/internal/controller/shared_controller_test.go b/internal/controller/shared_controller_test.go
@@ -85,15 +85,16 @@ func getExpectedObjects[O pdoknlv3.WMSWFS](ctx context.Context, obj O, includeBl
 	}
 
 	if obj.Type() == pdoknlv3.ServiceTypeWMS {
-		cm = getBareConfigMapLegendGenerator(obj)
+		wms, _ := any(obj).(*pdoknlv3.WMS)
+		cm = getBareConfigMapLegendGenerator(wms)
 		hashedName, err = getHashedConfigMapNameFromClient(ctx, obj, mapserver.ConfigMapLegendGeneratorVolumeName)
 		if err != nil {
 			return objects, err
 		}
 		cm.Name = hashedName
 		objects = append(objects, cm)
 
-		cm = getBareConfigMapFeatureinfoGenerator(obj)
+		cm = getBareConfigMapFeatureinfoGenerator(wms)
 		hashedName, err = getHashedConfigMapNameFromClient(ctx, obj, mapserver.ConfigMapFeatureinfoGeneratorVolumeName)
 		if err != nil {
 			return objects, err
@@ -102,7 +103,7 @@ func getExpectedObjects[O pdoknlv3.WMSWFS](ctx context.Context, obj O, includeBl
 		objects = append(objects, cm)
 
 		if obj.Options().UseWebserviceProxy() {
-			cm = getBareConfigMapOgcWebserviceProxy(obj)
+			cm = getBareConfigMapOgcWebserviceProxy(wms)
 			hashedName, err = getHashedConfigMapNameFromClient(ctx, obj, mapserver.ConfigMapOgcWebserviceProxyVolumeName)
 			if err != nil {
 				return objects, err
diff --git a/internal/controller/wms_controller_test.go b/internal/controller/wms_controller_test.go
@@ -641,7 +641,7 @@ var _ = Describe("WMS Controller", func() {
 				return Expect(err).NotTo(HaveOccurred())
 			}, "10s", "1s").Should(BeTrue())
 
-			Expect(configMap.GetName()).To(HavePrefix(wms.GetName() + "-legend-generator-"))
+			Expect(configMap.GetName()).To(HavePrefix(wms.GetName() + "-wms-legend-generator-"))
 			Expect(configMap.GetNamespace()).To(Equal(namespace))
 			Expect(configMap.Immutable).To(Equal(smoothoperatorutils.Pointer(true)))
 			checkWMSLabels(configMap.GetLabels())
@@ -681,7 +681,7 @@ var _ = Describe("WMS Controller", func() {
 				return Expect(err).NotTo(HaveOccurred())
 			}, "10s", "1s").Should(BeTrue())
 
-			Expect(configMap.GetName()).To(HavePrefix(wms.GetName() + "-featureinfo-generator"))
+			Expect(configMap.GetName()).To(HavePrefix(wms.GetName() + "-wms-featureinfo-generator"))
 			Expect(configMap.GetNamespace()).To(Equal(namespace))
 			Expect(configMap.Immutable).To(Equal(smoothoperatorutils.Pointer(true)))
 			checkWMSLabels(configMap.GetLabels())
diff --git a/internal/webhook/v3/wms_webhook_test.go b/internal/webhook/v3/wms_webhook_test.go
@@ -158,7 +158,7 @@ var _ = Describe("WMS Webhook", func() {
 
 		It("Should deny creation if grouplayer is not visible", func() {
 			nestedLayers1 := *obj.Spec.Service.Layer.Layers
-			nestedLayers1[0].Visible = false
+			nestedLayers1[0].Visible = smoothoperatorutils.Pointer(false)
 			_, err := validator.ValidateCreate(ctx, obj)
 			Expect(err).To(HaveOccurred())
 		})
@@ -215,7 +215,7 @@ var _ = Describe("WMS Webhook", func() {
 
 		It("Should deny creation if there are no visible layers", func() {
 			obj.Spec.Service.Layer.Layers = nil
-			obj.Spec.Service.Layer.Visible = false
+			obj.Spec.Service.Layer.Visible = smoothoperatorutils.Pointer(false)
 
 			_, err := validator.ValidateUpdate(ctx, oldObj, obj)
 			Expect(err).To(HaveOccurred())

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func validateWMS(wms WMS, warnings []string, reasons *[]string) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`if slices.Contains(names, layerName) {`
`113`		`- layerReasons = append(layerReasons, fmt.Sprintf("layer names must be unique, layer.name '%s' is duplicated", layer.Name))`
	`113`	`+ layerReasons = append(layerReasons, fmt.Sprintf("layer names must be unique, layer.name '%s' is duplicated", layerName))`
`114`	`114`	`}`
`115`	`115`	`names = append(names, layerName)`
`116`	`116`
`@@ -204,7 +204,7 @@ func validateWMS(wms WMS, warnings []string, reasons *[]string) {`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`	`if len(layerReasons) != 0 {`
`207`		`- reasons = append(reasons, fmt.Sprintf("%s '%s' is invalid: ", layerType, layer.Name)+strings.Join(layerReasons, ", "))`
	`207`	`+ reasons = append(reasons, fmt.Sprintf("%s '%s' is invalid: ", layerType, layerName)+strings.Join(layerReasons, ", "))`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -197,14 +197,14 @@ func downloadLegends(sb strings.Builder, wms pdoknlv3.WMS) error {`
`197`	`197`	`layers := wms.GetAllLayersWithLegend()`
`198`	`198`	`if len(layers) > 0 {`
`199`	`199`	`for _, layer := range layers {`
`200`		`- writeLine(sb, "mkdir -p %s/%s;", legendPath, layer.Name)`
	`200`	`+ writeLine(sb, "mkdir -p %s/%s;", legendPath, *layer.Name)`
`201`	`201`	`for _, style := range layer.Styles {`
`202`		`- writeLine(sb, "rclone copyto blobs:/%s %s/%s/%s.png \|\| exit 1;", style.Legend.BlobKey, legendPath, layer.Name, style.Name)`
	`202`	`+ writeLine(sb, "rclone copyto blobs:/%s %s/%s/%s.png \|\| exit 1;", style.Legend.BlobKey, legendPath, *layer.Name, style.Name)`
`203`	`203`	`fileName, err := getFilenameFromBlobKey(style.Legend.BlobKey)`
`204`	`204`	`if err != nil {`
`205`	`205`	`return err`
`206`	`206`	`}`
`207`		`- writeLine(sb, "Copied legend %s to %s/%s/%s.png;", fileName, legendPath, layer.Name, style.Name)`
	`207`	`+ writeLine(sb, "Copied legend %s to %s/%s/%s.png;", fileName, legendPath, *layer.Name, style.Name)`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`writeLine(sb, "chown -R 999:999 %s", legendPath)`