Merge pull request #8 from PDOK/jd/pdok-17799-wfs-reconcile

WFS Reconcile

Author: jelledijkstra97

.github/workflows/lint.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.63.4
+          version: v1.64.8

.golangci.yml

@@ -4,7 +4,7 @@ run:
   timeout: 5m
 
   # Modules download mode (do not modify go.mod)
-  module-download-mode: readonly
+  modules-download-mode: readonly
 
   # Include test files (see below to exclude certain linters)
   tests: true
@@ -20,7 +20,9 @@ issues:
         - funlen
 
 output:
-  formats: colored-line-number
+  formats:
+    - format: colored-line-number
+      path: stdout
   print-issued-lines: true
   print-linter-name: true
 

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM docker.io/golang:1.23 AS builder
+FROM docker.io/golang:1.24 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
@@ -8,8 +8,6 @@ WORKDIR /workspace
 COPY go.mod go.mod
 COPY go.sum go.sum
 
-COPY --from=repos ./smooth-operator /smooth-operator
-
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download

Makefile

@@ -179,7 +179,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.17.1
 ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
 #ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
 ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
-GOLANGCI_LINT_VERSION ?= v1.63.4
+GOLANGCI_LINT_VERSION ?= v1.64.8
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

api/v2beta1/shared_conversion.go

@@ -2,9 +2,10 @@ package v2beta1
 
 import (
 	"fmt"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	shared_model "github.com/pdok/smooth-operator/model"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -15,12 +16,12 @@ func Pointer[T interface{}](val T) *T {
 func PointerVal[T interface{}](val *T, def T) T {
 	if val == nil {
 		return def
-	} else {
-		return *val
 	}
+
+	return *val
 }
 
-func ConverseOptionsV2ToV3(src WMSWFSOptions) *pdoknlv3.Options {
+func ConvertOptionsV2ToV3(src WMSWFSOptions) *pdoknlv3.Options {
 	return &pdoknlv3.Options{
 		AutomaticCasing:             src.AutomaticCasing,
 		IncludeIngress:              src.IncludeIngress,
@@ -32,7 +33,7 @@ func ConverseOptionsV2ToV3(src WMSWFSOptions) *pdoknlv3.Options {
 	}
 }
 
-func ConverseOptionsV3ToV2(src *pdoknlv3.Options) WMSWFSOptions {
+func ConvertOptionsV3ToV2(src *pdoknlv3.Options) WMSWFSOptions {
 	return WMSWFSOptions{
 		AutomaticCasing:             src.AutomaticCasing,
 		PrefetchData:                src.PrefetchData,
@@ -44,9 +45,10 @@ func ConverseOptionsV3ToV2(src *pdoknlv3.Options) WMSWFSOptions {
 	}
 }
 
-func ConverseAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscalerSpec {
+func ConvertAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscalerSpec {
 	var minReplicas *int32
 	if src.MinReplicas != nil {
+		//nolint:gosec
 		minReplicas = Pointer(int32(*src.MinReplicas))
 	}
 
@@ -60,8 +62,11 @@ func ConverseAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscaler
 		metrics = append(metrics, autoscalingv2.MetricSpec{
 			Type: autoscalingv2.ResourceMetricSourceType,
 			Resource: &autoscalingv2.ResourceMetricSource{
-				Name:                     corev1.ResourceCPU,
-				TargetAverageUtilization: Pointer(int32(*src.AverageCPUUtilization)),
+				Name: corev1.ResourceCPU,
+				Target: autoscalingv2.MetricTarget{
+					Type:               autoscalingv2.UtilizationMetricType,
+					AverageUtilization: Pointer(int32(*src.AverageCPUUtilization)),
+				},
 			},
 		})
 	}
@@ -73,7 +78,7 @@ func ConverseAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscaler
 	}
 }
 
-func ConverseResources(src corev1.ResourceRequirements) *corev1.PodSpec {
+func ConvertResources(src corev1.ResourceRequirements) *corev1.PodSpec {
 	return &corev1.PodSpec{
 		Containers: []corev1.Container{
 			{
@@ -83,7 +88,7 @@ func ConverseResources(src corev1.ResourceRequirements) *corev1.PodSpec {
 	}
 }
 
-func ConverseColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases map[string]string) []pdoknlv3.Column {
+func ConvertColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases map[string]string) []pdoknlv3.Column {
 	v3Columns := make([]pdoknlv3.Column, 0)
 	for _, column := range columns {
 		col := pdoknlv3.Column{
@@ -101,7 +106,7 @@ func ConverseColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases ma
 	return v3Columns
 }
 
-func ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Column) ([]string, map[string]string) {
+func ConvertColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Column) ([]string, map[string]string) {
 	v2Columns := make([]string, 0)
 	v2Aliases := make(map[string]string)
 
@@ -116,15 +121,15 @@ func ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Column)
 	return v2Columns, v2Aliases
 }
 
-func ConverseV2DataToV3(v2 Data) pdoknlv3.Data {
+func ConvertV2DataToV3(v2 Data) pdoknlv3.Data {
 	v3 := pdoknlv3.Data{}
 
 	if v2.GPKG != nil {
 		v3.Gpkg = &pdoknlv3.Gpkg{
 			BlobKey:      v2.GPKG.BlobKey,
 			TableName:    v2.GPKG.Table,
 			GeometryType: v2.GPKG.GeometryType,
-			Columns: ConverseColumnAndAliasesV2ToColumnsWithAliasV3(
+			Columns: ConvertColumnAndAliasesV2ToColumnsWithAliasV3(
 				v2.GPKG.Columns,
 				v2.GPKG.Aliases,
 			),
@@ -135,7 +140,7 @@ func ConverseV2DataToV3(v2 Data) pdoknlv3.Data {
 		v3.Postgis = &pdoknlv3.Postgis{
 			TableName:    v2.Postgis.Table,
 			GeometryType: v2.Postgis.GeometryType,
-			Columns: ConverseColumnAndAliasesV2ToColumnsWithAliasV3(
+			Columns: ConvertColumnAndAliasesV2ToColumnsWithAliasV3(
 				v2.Postgis.Columns,
 				v2.Postgis.Aliases,
 			),
@@ -154,11 +159,11 @@ func ConverseV2DataToV3(v2 Data) pdoknlv3.Data {
 	return v3
 }
 
-func ConverseV3DataToV2(v3 pdoknlv3.Data) Data {
+func ConvertV3DataToV2(v3 pdoknlv3.Data) Data {
 	v2 := Data{}
 
 	if v3.Gpkg != nil {
-		columns, aliases := ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Gpkg.Columns)
+		columns, aliases := ConvertColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Gpkg.Columns)
 		v2.GPKG = &GPKG{
 			BlobKey:      v3.Gpkg.BlobKey,
 			Table:        v3.Gpkg.TableName,
@@ -169,7 +174,7 @@ func ConverseV3DataToV2(v3 pdoknlv3.Data) Data {
 	}
 
 	if v3.Postgis != nil {
-		columns, aliases := ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Postgis.Columns)
+		columns, aliases := ConvertColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Postgis.Columns)
 		v2.Postgis = &Postgis{
 			Table:        v3.Postgis.TableName,
 			GeometryType: v3.Postgis.GeometryType,
@@ -215,7 +220,7 @@ func NewV2KubernetesObject(lifecycle *shared_model.Lifecycle, podSpecPatch *core
 
 		if scalingSpec.Metrics != nil {
 			kub.Autoscaling.AverageCPUUtilization = Pointer(
-				int(*scalingSpec.Metrics[0].Resource.TargetAverageUtilization),
+				int(*scalingSpec.Metrics[0].Resource.Target.AverageUtilization),
 			)
 		}
 	}

api/v2beta1/wfs_conversion.go

@@ -25,9 +25,10 @@ SOFTWARE.
 package v2beta1
 
 import (
-	sharedModel "github.com/pdok/smooth-operator/model"
 	"log"
 
+	sharedModel "github.com/pdok/smooth-operator/model"
+
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
@@ -49,19 +50,19 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	if src.Spec.Kubernetes.Autoscaling != nil {
-		dst.Spec.HorizontalPodAutoscalerPatch = ConverseAutoscaling(*src.Spec.Kubernetes.Autoscaling)
+		dst.Spec.HorizontalPodAutoscalerPatch = ConvertAutoscaling(*src.Spec.Kubernetes.Autoscaling)
 	}
 
 	// TODO converse src.Spec.Kubernetes.HealthCheck when we know what the implementation in v3 will be
 	if src.Spec.Kubernetes.Resources != nil {
-		dst.Spec.PodSpecPatch = ConverseResources(*src.Spec.Kubernetes.Resources)
+		dst.Spec.PodSpecPatch = ConvertResources(*src.Spec.Kubernetes.Resources)
 	}
 
-	dst.Spec.Options = ConverseOptionsV2ToV3(src.Spec.Options)
+	dst.Spec.Options = ConvertOptionsV2ToV3(src.Spec.Options)
 
 	service := pdoknlv3.WFSService{
 		Prefix:            "",
-		BaseURL:           CreateBaseURL("https://service.pdok.nl", "wfs", src.Spec.General),
+		URL:               CreateBaseURL("https://service.pdok.nl", "wfs", src.Spec.General),
 		OwnerInfoRef:      "pdok",
 		Title:             src.Spec.Service.Title,
 		Abstract:          src.Spec.Service.Abstract,
@@ -137,7 +138,7 @@ func convertV2FeatureTypeToV3(src FeatureType) pdoknlv3.FeatureType {
 		}
 	}
 
-	featureTypeV3.Data = ConverseV2DataToV3(src.Data)
+	featureTypeV3.Data = ConvertV2DataToV3(src.Data)
 
 	return featureTypeV3
 }
@@ -157,7 +158,7 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
 	dst.Spec.Kubernetes = NewV2KubernetesObject(src.Spec.Lifecycle, src.Spec.PodSpecPatch, src.Spec.HorizontalPodAutoscalerPatch)
 
 	if src.Spec.Options != nil {
-		dst.Spec.Options = ConverseOptionsV3ToV2(src.Spec.Options)
+		dst.Spec.Options = ConvertOptionsV3ToV2(src.Spec.Options)
 	}
 
 	service := WFSService{
@@ -190,7 +191,7 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
 		service.MetadataIdentifier = src.Spec.Service.Inspire.ServiceMetadataURL.CSW.MetadataIdentifier
 	} else {
 		service.Inspire = false
-		// TODO unable to fill in MetadataIdentifier here untill we know how to handle non inspire services
+		// TODO unable to fill in MetadataIdentifier here until we know how to handle non inspire services
 	}
 
 	for _, featureType := range src.Spec.Service.FeatureTypes {
@@ -201,7 +202,7 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
 			Keywords:                  featureType.Keywords,
 			DatasetMetadataIdentifier: featureType.DatasetMetadataURL.CSW.MetadataIdentifier,
 			SourceMetadataIdentifier:  "",
-			Data:                      ConverseV3DataToV2(featureType.Data),
+			Data:                      ConvertV3DataToV2(featureType.Data),
 		}
 
 		if src.Spec.Service.Inspire != nil {

api/v2beta1/wms_conversion.go

@@ -25,11 +25,12 @@ SOFTWARE.
 package v2beta1
 
 import (
-	"fmt"
-	sharedModel "github.com/pdok/smooth-operator/model"
+	"errors"
 	"log"
 	"strconv"
 
+	sharedModel "github.com/pdok/smooth-operator/model"
+
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
@@ -54,18 +55,18 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	if src.Spec.Kubernetes.Autoscaling != nil {
-		dst.Spec.HorizontalPodAutoscalerPatch = ConverseAutoscaling(*src.Spec.Kubernetes.Autoscaling)
+		dst.Spec.HorizontalPodAutoscalerPatch = ConvertAutoscaling(*src.Spec.Kubernetes.Autoscaling)
 	}
 
 	// TODO converse src.Spec.Kubernetes.HealthCheck when we know what the implementation in v3 will be
 	if src.Spec.Kubernetes.Resources != nil {
-		dst.Spec.PodSpecPatch = ConverseResources(*src.Spec.Kubernetes.Resources)
+		dst.Spec.PodSpecPatch = ConvertResources(*src.Spec.Kubernetes.Resources)
 	}
 
-	dst.Spec.Options = ConverseOptionsV2ToV3(src.Spec.Options)
+	dst.Spec.Options = ConvertOptionsV2ToV3(src.Spec.Options)
 
 	service := pdoknlv3.WMSService{
-		BaseURL:           CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
+		URL:               CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
 		OwnerInfoRef:      "pdok",
 		Title:             src.Spec.Service.Title,
 		Abstract:          src.Spec.Service.Abstract,
@@ -144,7 +145,7 @@ func (dst *WMS) ConvertFrom(srcRaw conversion.Hub) error {
 	dst.Spec.Kubernetes = NewV2KubernetesObject(src.Spec.Lifecycle, src.Spec.PodSpecPatch, src.Spec.HorizontalPodAutoscalerPatch)
 
 	if src.Spec.Options != nil {
-		dst.Spec.Options = ConverseOptionsV3ToV2(src.Spec.Options)
+		dst.Spec.Options = ConvertOptionsV3ToV2(src.Spec.Options)
 	}
 
 	service := WMSService{
@@ -169,7 +170,7 @@ func (dst *WMS) ConvertFrom(srcRaw conversion.Hub) error {
 		service.MetadataIdentifier = src.Spec.Service.Inspire.ServiceMetadataURL.CSW.MetadataIdentifier
 	} else {
 		service.Inspire = false
-		// TODO unable to fill in MetadataIdentifier here untill we know how to handle non inspire services
+		// TODO unable to fill in MetadataIdentifier here until we know how to handle non inspire services
 	}
 
 	uuid, ok := src.Annotations[SERVICE_METADATA_IDENTIFIER_ANNOTATION]
@@ -256,7 +257,7 @@ func (v2Service WMSService) GetTopLayer() (*WMSLayer, error) {
 		}
 	}
 
-	return nil, fmt.Errorf("unable to detect the toplayer of this WMS service")
+	return nil, errors.New("unable to detect the toplayer of this WMS service")
 }
 
 func (v2Service WMSService) GetChildLayers(parent WMSLayer) ([]WMSLayer, error) {
@@ -269,7 +270,7 @@ func (v2Service WMSService) GetChildLayers(parent WMSLayer) ([]WMSLayer, error)
 	}
 
 	if len(children) == 0 {
-		return children, fmt.Errorf("no child layers found")
+		return children, errors.New("no child layers found")
 	}
 
 	return children, nil
@@ -372,7 +373,7 @@ func (v2Layer WMSLayer) MapToV3(v2Service WMSService) pdoknlv3.Layer {
 	}
 
 	if v2Layer.Data != nil {
-		layer.Data = Pointer(ConverseV2DataToV3(*v2Layer.Data))
+		layer.Data = Pointer(ConvertV2DataToV3(*v2Layer.Data))
 	} else {
 		childLayersV2, err := v2Service.GetChildLayers(v2Layer)
 		if err != nil {
@@ -463,7 +464,7 @@ func mapV3LayerToV2Layers(v3Layer pdoknlv3.Layer, parent *pdoknlv3.Layer, servic
 		}
 
 		if v3Layer.Data != nil {
-			v2Layer.Data = Pointer(ConverseV3DataToV2(*v3Layer.Data))
+			v2Layer.Data = Pointer(ConvertV3DataToV2(*v3Layer.Data))
 		}
 
 		layers = append(layers, v2Layer)

api/v2beta1/wms_types.go

@@ -109,7 +109,7 @@ type StylingAssets struct {
 	BlobKeys      []string       `json:"blobKeys,omitempty"`
 }
 
-// ConfigMapRef contains all the config map name and all keys in that configmap that are relevant
+// ConfigMapRef contains all the config map name and all keys in that mapserver that are relevant
 // the Keys can be empty, so that the v1 WMS can convert to the v2beta1 WMS
 type ConfigMapRef struct {
 	Name string   `json:"name"`