Merge branch 'master' into PDOK-17804-wms-mapfilegenerator-input

Author: Daimanta

internal/controller/legendgenerator/legend_generator.go

@@ -16,11 +16,18 @@ func GetLegendGeneratorInitContainer(wms *pdoknlv3.WMS, image string, srvDir str
 			"bash",
 			"-c",
 			`set -eu;
+exit_code=0;
 cat /input/input | xargs -n 2 echo | while read layer style; do
 echo Generating legend for layer: $layer, style: $style;
 mkdir -p /var/www/legend/$layer;
 mapserv -nh 'QUERY_STRING=SERVICE=WMS&language=dut&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer='$layer'&format=image/png&STYLE='$style'' > /var/www/legend/$layer/${style}.png;
-done
+magic_bytes=$(head -c 4 /var/www/legend/$layer/${style}.png | tail -c 3);
+if [[ $magic_bytes != 'PNG' ]]; then
+echo [4T2O9] file /var/www/legend/$layer/${style}.png appears to not be a png file;
+exit_code=1;
+fi;
+done;
+exit $exit_code;
 `,
 		},
 		VolumeMounts: []corev1.VolumeMount{

internal/controller/suite_test.go

@@ -29,16 +29,16 @@ import (
 	"encoding/json"
 	"errors"
 	pdoknlv2beta1 "github.com/pdok/mapserver-operator/api/v2beta1"
+	smoothoperator1 "github.com/pdok/smooth-operator/api/v1"
+	traefikiov1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefikio/v1alpha1"
+	"golang.org/x/tools/go/packages"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"testing"
 
-	traefikiov1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefikio/v1alpha1"
-	"golang.org/x/tools/go/packages"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -49,7 +49,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
-	smoothoperator1 "github.com/pdok/smooth-operator/api/v1"
 	// +kubebuilder:scaffold:imports
 )