Setup capabilities generator config

Author: damienmulder

internal/controller/capabilitiesgenerator/capabilities_generator.go

@@ -0,0 +1,38 @@
+package capabilitiesgenerator
+
+import (
+	"errors"
+	"fmt"
+	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
+	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+	yaml "sigs.k8s.io/yaml/goyaml.v3"
+)
+
+func GetInput[W *pdoknlv3.WFS | *pdoknlv3.WMS](webservice W, ownerInfo *smoothoperatorv1.OwnerInfo) (input string, err error) {
+	switch any(webservice).(type) {
+	case *pdoknlv3.WFS:
+		if WFS, ok := any(webservice).(*pdoknlv3.WFS); ok {
+			return createInputForWFS(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 createInputForWFS(wfs *pdoknlv3.WFS, ownerInfo *smoothoperatorv1.OwnerInfo) (config string, err error) {
+	input, err := MapWFSToCapabilitiesGeneratorInput(wfs, ownerInfo)
+	if err != nil {
+		return "", err
+	}
+	yamlInput, err := yaml.Marshal(&input)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal the capabilities generator input to yaml: %w", err)
+	}
+
+	return string(yamlInput), nil
+}

internal/controller/capabilitiesgenerator/mapper.go

@@ -1,7 +1,6 @@
 package capabilitiesgenerator
 
 import (
-	"encoding/xml"
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/mapperutils"
 	"github.com/pdok/ogc-specifications/pkg/wfs200"
@@ -24,7 +23,7 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 			Version:           *mapperutils.GetLabelValueByKey(wfs.ObjectMeta.Labels, "service-version"),
 		},
 		Services: Services{
-			WFS200Config: WFS200Config{
+			WFS200Config: &WFS200Config{
 				Filename: capabilitiesFilename,
 				Wfs200: wfs200.GetCapabilitiesResponse{
 
@@ -48,24 +47,9 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 							Keyword: wfs.Spec.Service.Keywords,
 						},
 					},
-
 					Capabilities: wfs200.Capabilities{
 						FeatureTypeList: getFeatureTypeList(wfs),
 					},
-					XMLName: xml.Name{},
-					Namespaces: wfs200.Namespaces{ // TODO
-						XmlnsGML:           "",
-						XmlnsWFS:           "",
-						XmlnsOWS:           "",
-						XmlnsXlink:         "",
-						XmlnsXSI:           "",
-						XmlnsFes:           "",
-						XmlnsInspireCommon: "",
-						XmlnsInspireDls:    "",
-						XmlnsPrefix:        "",
-						Version:            "",
-						SchemaLocation:     "",
-					},
 				},
 			},
 		},
@@ -75,7 +59,7 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 		config.Global.AdditionalSchemaLocations = inspireSchemaLocations
 
 		// Todo set extended capabilities
-		config.Services.WFS200Config.Wfs200.Capabilities.OperationsMetadata = wfs200.OperationsMetadata{}
+		//config.Services.WFS200Config.Wfs200.Capabilities.OperationsMetadata = wfs200.OperationsMetadata{}
 	}
 
 	return config, nil

internal/controller/capabilitiesgenerator/types.go

@@ -1,4 +1,4 @@
-// TODO Replace this by using the ogc-capabilities-generator from Github
+// TODO Move this to the ogc-capabilities-generator on Github
 
 package capabilitiesgenerator
 
@@ -17,21 +17,21 @@ type Config struct {
 
 // Global contains a collection of base var that are globally usable for the generation of the capabilities
 type Global struct {
-	Prefix                    string `yaml:"prefix"`
-	Namespace                 string `yaml:"namespace"`
-	OnlineResourceurl         string `yaml:"onlineResourceUrl"`
-	Path                      string `yaml:"path"`
-	Version                   string `yaml:"version"`
-	AdditionalSchemaLocations string `yaml:"additionalSchemaLocations"`
-	Empty                     string
+	Prefix                    string  `yaml:"prefix"`
+	Namespace                 string  `yaml:"namespace"`
+	OnlineResourceurl         string  `yaml:"onlineResourceUrl"`
+	Path                      string  `yaml:"path"`
+	Version                   string  `yaml:"version"`
+	AdditionalSchemaLocations string  `yaml:"additionalSchemaLocations"`
+	Empty                     *string `yaml:"-"`
 }
 
 // Services contain a single service struct for every service type
 type Services struct {
-	WFS200Config  WFS200Config  `yaml:"wfs200"`
-	WMS130Config  WMS130Config  `yaml:"wms130"`
-	WMTS100Config WMTS100Config `yaml:"wmts100"`
-	WCS201Config  WCS201Config  `yaml:"wcs201"`
+	WFS200Config  *WFS200Config  `yaml:"wfs200,omitempty"`
+	WMS130Config  *WMS130Config  `yaml:"wms130,omitempty"`
+	WMTS100Config *WMTS100Config `yaml:"wmts100,omitempty"`
+	WCS201Config  *WCS201Config  `yaml:"wcs201,omitempty"`
 }
 
 // The WFS200Config service struct

internal/controller/wfs_controller.go

@@ -26,7 +26,6 @@ package controller
 
 import (
 	"context"
-	"fmt"
 	"github.com/pdok/mapserver-operator/internal/controller/blobdownload"
 	"github.com/pdok/mapserver-operator/internal/controller/capabilitiesgenerator"
 	"github.com/pdok/mapserver-operator/internal/controller/mapfilegenerator"
@@ -40,7 +39,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	yaml "sigs.k8s.io/yaml/goyaml.v3"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
@@ -207,16 +205,11 @@ func (r *WFSReconciler) mutateConfigMapCapabilitiesGenerator(WFS *pdoknlv3.WFS,
 	}
 
 	if len(configMap.Data) == 0 {
-		input, err := capabilitiesgenerator.MapWFSToCapabilitiesGeneratorInput(WFS, ownerInfo)
+		input, err := capabilitiesgenerator.GetInput(WFS, ownerInfo)
 		if err != nil {
 			return err
 		}
-		yamlInput, err := yaml.Marshal(&input)
-		if err != nil {
-			return fmt.Errorf("failed to marshal the capabilities generator input to yaml: %w", err)
-		}
-
-		configMap.Data = map[string]string{capabilitiesGeneratorInput: string(yamlInput)}
+		configMap.Data = map[string]string{capabilitiesGeneratorInput: string(input)}
 
 	}
 	configMap.Immutable = smoothoperatorutils.Pointer(true)