Merge pull request #6 from PDOK/PDOK-17805-mapserver-operator-mapfile-generator-configmap

 PDOK-17805 Setup mapfile generator in configmap

Author: damienmulder

api/v2beta1/shared_conversion.go

@@ -83,10 +83,10 @@ func ConverseResources(src corev1.ResourceRequirements) *corev1.PodSpec {
 	}
 }
 
-func ConverseColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases map[string]string) []pdoknlv3.Columns {
-	v3Columns := make([]pdoknlv3.Columns, 0)
+func ConverseColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases map[string]string) []pdoknlv3.Column {
+	v3Columns := make([]pdoknlv3.Column, 0)
 	for _, column := range columns {
-		col := pdoknlv3.Columns{
+		col := pdoknlv3.Column{
 			Name: column,
 		}
 
@@ -101,7 +101,7 @@ func ConverseColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases ma
 	return v3Columns
 }
 
-func ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Columns) ([]string, map[string]string) {
+func ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Column) ([]string, map[string]string) {
 	v2Columns := make([]string, 0)
 	v2Aliases := make(map[string]string)
 

api/v3/shared_types.go

@@ -1,6 +1,11 @@
 package v3
 
-import corev1 "k8s.io/api/core/v1"
+import (
+	corev1 "k8s.io/api/core/v1"
+	"strings"
+)
+
+var baseURL string
 
 type Mapfile struct {
 	ConfigMapKeyRef corev1.ConfigMapKeySelector `json:"configMapKeyRef"`
@@ -43,17 +48,17 @@ type Data struct {
 }
 
 type Gpkg struct {
-	BlobKey      string    `json:"blobKey"`
-	TableName    string    `json:"tableName"`
-	GeometryType string    `json:"geometryType"`
-	Columns      []Columns `json:"columns"`
+	BlobKey      string   `json:"blobKey"`
+	TableName    string   `json:"tableName"`
+	GeometryType string   `json:"geometryType"`
+	Columns      []Column `json:"columns"`
 }
 
 // Postgis - reference to table in a Postgres database
 type Postgis struct {
-	TableName    string    `json:"tableName"`
-	GeometryType string    `json:"geometryType"`
-	Columns      []Columns `json:"columns"`
+	TableName    string   `json:"tableName"`
+	GeometryType string   `json:"geometryType"`
+	Columns      []Column `json:"columns"`
 }
 
 type TIF struct {
@@ -63,7 +68,48 @@ type TIF struct {
 	GetFeatureInfoIncludesClass *bool   `json:"getFeatureInfoIncludesClass,omitempty"`
 }
 
-type Columns struct {
+type Column struct {
 	Name  string  `json:"name"`
 	Alias *string `json:"alias,omitempty"`
 }
+
+func SetBaseURL(url string) {
+	baseURL = strings.TrimSuffix(url, "/")
+}
+
+func GetBaseURL() string {
+	return baseURL
+}
+
+func (d *Data) GetColumns() *[]Column {
+	switch {
+	case d.Gpkg != nil:
+		return &d.Gpkg.Columns
+	case d.Postgis != nil:
+		return &d.Postgis.Columns
+	default:
+		return nil
+	}
+}
+
+func (d *Data) GetTableName() *string {
+	switch {
+	case d.Gpkg != nil:
+		return &d.Gpkg.TableName
+	case d.Postgis != nil:
+		return &d.Postgis.TableName
+	default:
+		return nil
+	}
+}
+
+func (d *Data) GetGeometryType() *string {
+	switch {
+	case d.Gpkg != nil:
+		return &d.Gpkg.GeometryType
+	case d.Postgis != nil:
+		return &d.Postgis.GeometryType
+	default:
+		return nil
+	}
+}

api/v3/wfs_types.go

@@ -117,3 +117,12 @@ type FeatureBbox struct {
 	DefaultCRS shared_model.BBox  `json:"defaultCRS"`
 	WGS84      *shared_model.BBox `json:"wgs84,omitempty"`
 }
+
+func (wfs *WFS) HasPostgisData() bool {
+	for _, featureType := range wfs.Spec.Service.FeatureTypes {
+		if featureType.Data.Postgis != nil {
+			return true
+		}
+	}
+	return false
+}

api/v3/zz_generated.deepcopy.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"crypto/tls"
+	"errors"
 	"flag"
 	"os"
 	"path/filepath"
@@ -45,7 +46,8 @@ import (
 )
 
 const (
-	defaultMultitoolImage = "docker.io/pdok/docker-multitool:0.9.1"
+	defaultMultitoolImage        = "docker.io/pdok/docker-multitool:0.9.1"
+	defaultMapfileGeneratorImage = "docker.io/pdok/mapfile-generator:1.9.3"
 )
 
 var (
@@ -71,7 +73,9 @@ func main() {
 	var secureMetrics bool
 	var enableHTTP2 bool
 	var tlsOpts []func(*tls.Config)
+	var baseURL string
 	var multitoolImage string
+	var mapfileGeneratorImage string
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -89,7 +93,10 @@ func main() {
 	flag.StringVar(&metricsCertKey, "metrics-cert-key", "tls.key", "The name of the metrics server key file.")
 	flag.BoolVar(&enableHTTP2, "enable-http2", false,
 		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
+	flag.StringVar(&baseURL, "baseurl", "", "The base url which is used in the mapserver service.")
 	flag.StringVar(&multitoolImage, "multitool-image", defaultMultitoolImage, "The image to use in the blob download init-container.")
+	flag.StringVar(&mapfileGeneratorImage, "mapfile-generator-image", defaultMapfileGeneratorImage, "The image to use in the mapfile generator init-container.")
+
 	opts := zap.Options{
 		Development: true,
 	}
@@ -98,6 +105,12 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
+	if baseURL == "" {
+		setupLog.Error(errors.New("baseURL is required"), "A value for baseURL must be specified.")
+		os.Exit(1)
+	}
+	pdoknlv3.SetBaseURL(baseURL)
+
 	// if the enable-http2 flag is false (the default), http/2 should be disabled
 	// due to its vulnerabilities. More specifically, disabling http/2 will
 	// prevent from being vulnerable to the HTTP/2 Stream Cancellation and
@@ -219,9 +232,10 @@ func main() {
 		os.Exit(1)
 	}
 	if err = (&controller.WFSReconciler{
-		Client:         mgr.GetClient(),
-		Scheme:         mgr.GetScheme(),
-		MultitoolImage: multitoolImage,
+		Client:                mgr.GetClient(),
+		Scheme:                mgr.GetScheme(),
+		MultitoolImage:        multitoolImage,
+		MapfileGeneratorImage: mapfileGeneratorImage,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "WFS")
 		os.Exit(1)

cmd/main.go

@@ -63,6 +63,7 @@ spec:
         args:
           - --leader-elect
           - --health-probe-bind-address=:8081
+          - --baseurl=https://test.example.nl
         image: controller:latest
         name: manager
         ports: []

config/manager/manager.yaml

@@ -4,6 +4,20 @@ kind: ClusterRole
 metadata:
   name: manager-role
 rules:
+- apiGroups:
+  - pdok.nl
+  resources:
+  - ownerinfo
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - pdok.nl
+  resources:
+  - ownerinfo/status
+  verbs:
+  - get
 - apiGroups:
   - pdok.nl
   resources:

config/rbac/role.yaml

@@ -7,14 +7,15 @@ godebug default=go1.23
 require (
 	github.com/onsi/ginkgo/v2 v2.21.0
 	github.com/onsi/gomega v1.35.1
-	github.com/pdok/smooth-operator v0.0.4
 	k8s.io/api v0.32.0
 	k8s.io/apimachinery v0.32.0
 	k8s.io/client-go v0.32.0
 	sigs.k8s.io/controller-runtime v0.20.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
+require github.com/pdok/smooth-operator v0.0.6
+
 require (
 	cel.dev/expr v0.18.0 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -27,7 +28,7 @@ require (
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirectC
+	github.com/fsnotify/fsnotify v1.8.0 // indirect; indirectC
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

go.mod

@@ -99,8 +99,8 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
 github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
 github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
-github.com/pdok/smooth-operator v0.0.4 h1:NVt7srlkSyiZooqn9R2pnMapY6jwZDVTj4QxUjy7UB0=
-github.com/pdok/smooth-operator v0.0.4/go.mod h1:oZWFuIKJGjN/C6ocgMNfMZ7SbLQi+N0qaWj7j95Wdec=
+github.com/pdok/smooth-operator v0.0.6 h1:IwgY3X2zYA2XLw0eKmBBN1Md6gNWnoVl0i1R8/wFHvs=
+github.com/pdok/smooth-operator v0.0.6/go.mod h1:oZWFuIKJGjN/C6ocgMNfMZ7SbLQi+N0qaWj7j95Wdec=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

go.sum

@@ -0,0 +1,38 @@
+package mapfilegenerator
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
+	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+)
+
+func GetConfig[W *pdoknlv3.WFS | *pdoknlv3.WMS](webservice W, ownerInfo *smoothoperatorv1.OwnerInfo) (config string, err error) {
+	switch any(webservice).(type) {
+	case *pdoknlv3.WFS:
+		if WFS, ok := any(webservice).(*pdoknlv3.WFS); ok {
+			return createConfigForWFS(WFS, ownerInfo)
+		}
+	case *pdoknlv3.WMS:
+		if _, ok := any(webservice).(*pdoknlv3.WMS); ok {
+			return "", errors.New("not implemented for WMS")
+		}
+	default:
+		return "", fmt.Errorf("unexpected input, webservice should be of type WFS or WMS, webservice: %v", webservice)
+	}
+	return "", fmt.Errorf("unexpected input, webservice should be of type WFS or WMS, webservice: %v", webservice)
+}
+
+func createConfigForWFS(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv1.OwnerInfo) (config string, err error) {
+	input, err := MapWFSToMapfileGeneratorInput(wfs, ownerInfo)
+	if err != nil {
+		return "", err
+	}
+
+	jsonConfig, err := json.MarshalIndent(input, "", "    ")
+	if err != nil {
+		return "", err
+	}
+	return string(jsonConfig), nil
+}