Tests

Author: Jelle Dijkstra

.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

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

@@ -15,9 +15,9 @@ 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 {

api/v2beta1/wfs_conversion.go

@@ -190,7 +190,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 {

api/v2beta1/wms_conversion.go

@@ -169,7 +169,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]

api/v3/shared_types.go

@@ -2,6 +2,7 @@ package v3
 
 import (
 	"crypto/sha1"
+	"encoding/hex"
 	"io"
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
@@ -31,7 +32,7 @@ type WMSWFS interface {
 	Options() *Options
 	HasPostgisData() bool
 	// Sha1 hash of the objects name
-	Id() string
+	ID() string
 }
 
 type Mapfile struct {
@@ -109,19 +110,19 @@ func GetHost() string {
 }
 
 func GetBaseURLPath[T *WFS | *WMS](o T) string {
-	var serviceUrl string
+	var serviceURL string
 	switch any(o).(type) {
 	case *WFS:
 		if WFS, ok := any(o).(*WFS); ok {
-			serviceUrl = WFS.Spec.Service.URL
+			serviceURL = WFS.Spec.Service.URL
 		}
 	case *WMS:
 		if WMS, ok := any(o).(*WMS); ok {
-			serviceUrl = WMS.Spec.Service.URL
+			serviceURL = WMS.Spec.Service.URL
 		}
 	}
 
-	parsed, _ := url.Parse(serviceUrl)
+	parsed, _ := url.Parse(serviceURL)
 	return strings.TrimPrefix(parsed.Path, "/")
 }
 
@@ -160,7 +161,7 @@ func (d *Data) GetGeometryType() *string {
 
 func Sha1HashOfName[O WMSWFS](obj O) string {
 	s := sha1.New()
-	io.WriteString(s, obj.GetName())
+	_, _ = io.WriteString(s, obj.GetName())
 
-	return string(s.Sum(nil))
+	return hex.EncodeToString(s.Sum(nil))
 }

api/v3/wfs_types.go

@@ -147,6 +147,6 @@ func (wfs *WFS) Options() *Options {
 	return wfs.Spec.Options
 }
 
-func (wfs *WFS) Id() string {
+func (wfs *WFS) ID() string {
 	return Sha1HashOfName(wfs)
 }

api/v3/wfs_validation.go

@@ -19,9 +19,9 @@ func (wfs *WFS) ValidateCreate() ([]string, error) {
 
 	if len(reasons) > 0 {
 		return warnings, fmt.Errorf("%s", strings.Join(reasons, ". "))
-	} else {
-		return warnings, nil
 	}
+
+	return warnings, nil
 }
 
 func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
@@ -47,9 +47,9 @@ func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
 
 	if len(reasons) > 0 {
 		return warnings, fmt.Errorf("%s", strings.Join(reasons, ". "))
-	} else {
-		return warnings, nil
 	}
+
+	return warnings, nil
 }
 
 func validateWFS(wfs *WFS, warnings *[]string, reasons *[]string) {

api/v3/wms_types.go

@@ -217,15 +217,15 @@ func (wms *WMS) GetUniqueTiffBlobKeys() []string {
 func (wms *WMS) GetAuthority() *Authority {
 	if wms.Spec.Service.Layer.Authority != nil {
 		return wms.Spec.Service.Layer.Authority
-	} else {
-		for _, childLayer := range *wms.Spec.Service.Layer.Layers {
-			if childLayer.Authority != nil {
-				return childLayer.Authority
-			} else if childLayer.Layers != nil {
-				for _, grandChildLayer := range *childLayer.Layers {
-					if grandChildLayer.Authority != nil {
-						return grandChildLayer.Authority
-					}
+	}
+
+	for _, childLayer := range *wms.Spec.Service.Layer.Layers {
+		if childLayer.Authority != nil {
+			return childLayer.Authority
+		} else if childLayer.Layers != nil {
+			for _, grandChildLayer := range *childLayer.Layers {
+				if grandChildLayer.Authority != nil {
+					return grandChildLayer.Authority
 				}
 			}
 		}
@@ -263,6 +263,6 @@ func (wms *WMS) Options() *Options {
 	return wms.Spec.Options
 }
 
-func (wms *WMS) Id() string {
+func (wms *WMS) ID() string {
 	return Sha1HashOfName(wms)
 }