linting

Jelle Dijkstra · Jelle Dijkstra · commit 6c294943c829 · 2025-04-03T11:54:38.000+02:00
diff --git a/api/v2beta1/shared_conversion.go b/api/v2beta1/shared_conversion.go
@@ -2,6 +2,7 @@ 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/v2"
@@ -47,6 +48,7 @@ func ConvertOptionsV3ToV2(src *pdoknlv3.Options) WMSWFSOptions {
 func ConvertAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscalerSpec {
 	var minReplicas *int32
 	if src.MinReplicas != nil {
+		//nolint:gosec
 		minReplicas = Pointer(int32(*src.MinReplicas))
 	}
 
diff --git a/api/v2beta1/wfs_conversion.go b/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"
diff --git a/api/v2beta1/wms_conversion.go b/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"
@@ -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
diff --git a/api/v3/shared_types.go b/api/v3/shared_types.go
@@ -1,14 +1,16 @@
 package v3
 
 import (
+	//nolint:gosec
 	"crypto/sha1"
 	"encoding/hex"
 	"io"
+	"net/url"
+	"strings"
+
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"net/url"
-	"strings"
 )
 
 var host string
@@ -160,6 +162,7 @@ func (d *Data) GetGeometryType() *string {
 }
 
 func Sha1HashOfName[O WMSWFS](obj O) string {
+	//nolint:gosec
 	s := sha1.New()
 	_, _ = io.WriteString(s, obj.GetName())
 
diff --git a/api/v3/wfs_validation.go b/api/v3/wfs_validation.go
@@ -2,8 +2,9 @@ package v3
 
 import (
 	"fmt"
-	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
 	"strings"
+
+	sharedValidation "github.com/pdok/smooth-operator/pkg/validation"
 )
 
 func (wfs *WFS) ValidateCreate() ([]string, error) {
@@ -36,11 +37,11 @@ func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
 
 	// Check service.baseURL did not change
 	if wfs.Spec.Service.URL != wfsOld.Spec.Service.URL {
-		reasons = append(reasons, fmt.Sprintf("service.baseURL is immutable"))
+		reasons = append(reasons, "service.baseURL is immutable")
 	}
 
 	if (wfs.Spec.Service.Inspire == nil && wfsOld.Spec.Service.Inspire != nil) || (wfs.Spec.Service.Inspire != nil && wfsOld.Spec.Service.Inspire == nil) {
-		reasons = append(reasons, fmt.Sprintf("services cannot change from inspire to not inspire or the other way around"))
+		reasons = append(reasons, "services cannot change from inspire to not inspire or the other way around")
 	}
 
 	validateWFS(wfs, &warnings, &reasons)
@@ -65,7 +66,7 @@ func validateWFS(wfs *WFS, warnings *[]string, reasons *[]string) {
 	}
 
 	if service.Mapfile == nil && service.DefaultCrs != "EPSG:28992" && service.Bbox == nil {
-		*reasons = append(*reasons, fmt.Sprintf("service.bbox.defaultCRS is required when service.defaultCRS is not 'EPSG:28992'"))
+		*reasons = append(*reasons, "service.bbox.defaultCRS is required when service.defaultCRS is not 'EPSG:28992'")
 	}
 
 	if service.Mapfile != nil {
diff --git a/api/v3/wms_types.go b/api/v3/wms_types.go
@@ -25,13 +25,14 @@ SOFTWARE.
 package v3
 
 import (
+	"maps"
+	"slices"
+	"sort"
+
 	shared_model "github.com/pdok/smooth-operator/model"
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"maps"
-	"slices"
-	"sort"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
diff --git a/cmd/main.go b/cmd/main.go
@@ -258,7 +258,7 @@ func main() {
 			os.Exit(1)
 		}
 	}
-	//nolint:goconst
+
 	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
 		if err = webhookpdoknlv3.SetupWFSWebhookWithManager(mgr); err != nil {
 			setupLog.Error(err, "unable to create webhook", "webhook", "WFS")
diff --git a/config/samples/samples.go b/config/samples/samples.go
@@ -2,6 +2,7 @@ package samples
 
 import (
 	_ "embed"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"sigs.k8s.io/yaml"
 )
diff --git a/internal/controller/blobdownload/blob_download.go b/internal/controller/blobdownload/blob_download.go
@@ -3,14 +3,15 @@ package blobdownload
 import (
 	_ "embed"
 	"fmt"
+	"regexp"
+	"strings"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/mapperutils"
 	"github.com/pdok/mapserver-operator/internal/controller/mapserver"
 	"github.com/pdok/mapserver-operator/internal/controller/utils"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"regexp"
-	"strings"
 )
 
 const (
diff --git a/internal/controller/blobdownload/blob_download_test.go b/internal/controller/blobdownload/blob_download_test.go
@@ -1,10 +1,11 @@
 package blobdownload
 
 import (
-	v3 "github.com/pdok/mapserver-operator/api/v3"
-	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	"strings"
 	"testing"
+
+	v3 "github.com/pdok/mapserver-operator/api/v3"
+	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 )
 
 const (
diff --git a/internal/controller/capabilitiesgenerator/capabilities_generator.go b/internal/controller/capabilitiesgenerator/capabilities_generator.go
@@ -3,6 +3,7 @@ package capabilitiesgenerator
 import (
 	"errors"
 	"fmt"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/mapserver"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
diff --git a/internal/controller/capabilitiesgenerator/capabilities_generator_test.go b/internal/controller/capabilitiesgenerator/capabilities_generator_test.go
@@ -5,8 +5,9 @@ import (
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	"testing"
+
+	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 )
 
 const (
diff --git a/internal/controller/capabilitiesgenerator/mapper.go b/internal/controller/capabilitiesgenerator/mapper.go
@@ -2,15 +2,16 @@ package capabilitiesgenerator
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/cbroglie/mustache"
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/mapperutils"
 	capabilitiesgenerator "github.com/pdok/ogc-capabilities-generator/pkg/config"
 	"github.com/pdok/ogc-specifications/pkg/wfs200"
 	"github.com/pdok/ogc-specifications/pkg/wsc110"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
-	"strconv"
-	"strings"
 )
 
 const (
diff --git a/internal/controller/mapfilegenerator/mapfile_generator.go b/internal/controller/mapfilegenerator/mapfile_generator.go
@@ -4,12 +4,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/mapserver"
 	"github.com/pdok/mapserver-operator/internal/controller/utils"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
 	corev1 "k8s.io/api/core/v1"
-	"strings"
 )
 
 func GetMapfileGeneratorInitContainer[O pdoknlv3.WMSWFS](obj O, image, postgisConfigName, postgisSecretName, srvDir string) (*corev1.Container, error) {
diff --git a/internal/controller/mapfilegenerator/mapfile_generator_test.go b/internal/controller/mapfilegenerator/mapfile_generator_test.go
@@ -1,12 +1,13 @@
 package mapfilegenerator
 
 import (
+	"testing"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
 	shared_model "github.com/pdok/smooth-operator/model"
 	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"testing"
 )
 
 const (
diff --git a/internal/controller/mapfilegenerator/mapper.go b/internal/controller/mapfilegenerator/mapper.go
@@ -1,12 +1,13 @@
 package mapfilegenerator
 
 import (
+	"strconv"
+	"strings"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/mapperutils"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
 	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
-	"strconv"
-	"strings"
 )
 
 const (
diff --git a/internal/controller/mapperutils/utils.go b/internal/controller/mapperutils/utils.go
@@ -2,10 +2,11 @@ package mapperutils
 
 import (
 	"fmt"
+	"strings"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"strings"
 )
 
 // Use ephemeral volume when ephemeral storage is greater then 10Gi
diff --git a/internal/controller/mapserver/deployment.go b/internal/controller/mapserver/deployment.go
@@ -1,6 +1,8 @@
 package mapserver
 
 import (
+	"os"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/mapperutils"
 	"github.com/pdok/mapserver-operator/internal/controller/static_files"
@@ -10,7 +12,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"os"
 )
 
 const (
diff --git a/internal/controller/shared_controller.go b/internal/controller/shared_controller.go
@@ -3,6 +3,10 @@ package controller
 import (
 	"context"
 	"errors"
+	"strconv"
+	"strings"
+	"time"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/blobdownload"
 	"github.com/pdok/mapserver-operator/internal/controller/capabilitiesgenerator"
@@ -27,9 +31,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"strconv"
-	"strings"
-	"time"
 )
 
 const (
diff --git a/internal/controller/static_files/reader.go b/internal/controller/static_files/reader.go
@@ -2,7 +2,6 @@ package static_files
 
 import (
 	"embed"
-	"fmt"
 )
 
 //go:embed files
@@ -13,7 +12,7 @@ func GetStaticFiles() map[string][]byte {
 
 	files, _ := embeddedFiles.ReadDir("files")
 	for _, f := range files {
-		content, _ := embeddedFiles.ReadFile(fmt.Sprintf("files/%s", f.Name()))
+		content, _ := embeddedFiles.ReadFile("files/" + f.Name())
 		result[f.Name()] = content
 	}
 
diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go
@@ -28,13 +28,14 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	traefikiov1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefikio/v1alpha1"
-	"golang.org/x/tools/go/packages"
 	"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"
 
diff --git a/internal/controller/wfs_controller.go b/internal/controller/wfs_controller.go
@@ -27,6 +27,7 @@ package controller
 import (
 	"context"
 	"fmt"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/blobdownload"
 	"github.com/pdok/mapserver-operator/internal/controller/capabilitiesgenerator"
diff --git a/internal/controller/wfs_controller_test.go b/internal/controller/wfs_controller_test.go
@@ -29,6 +29,8 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
+	"slices"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pdok/mapserver-operator/internal/controller/mapserver"
@@ -46,7 +48,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/yaml"
-	"slices"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -475,7 +476,7 @@ var _ = Describe("WFS Controller", func() {
 			Expect(middlewareCorsHeaders.Name).Should(Equal(wfs.GetName() + "-mapserver-headers"))
 			Expect(middlewareCorsHeaders.Namespace).Should(Equal("default"))
 			checkLabels(middlewareCorsHeaders.GetLabels())
-			//Expect(middlewareCorsHeaders.Spec.Headers.FrameDeny).Should(Equal(true))
+			// Expect(middlewareCorsHeaders.Spec.Headers.FrameDeny).Should(Equal(true))
 			Expect(middlewareCorsHeaders.Spec.Headers.CustomResponseHeaders["Access-Control-Allow-Headers"]).Should(Equal("Content-Type"))
 			Expect(middlewareCorsHeaders.Spec.Headers.CustomResponseHeaders["Access-Control-Allow-Method"]).Should(Equal("GET, HEAD, OPTIONS"))
 			Expect(middlewareCorsHeaders.Spec.Headers.CustomResponseHeaders["Access-Control-Allow-Origin"]).Should(Equal("*"))
diff --git a/internal/controller/wms_controller_test.go b/internal/controller/wms_controller_test.go
diff --git a/internal/webhook/v3/wfs_webhook.go b/internal/webhook/v3/wfs_webhook.go
diff --git a/internal/webhook/v3/wfs_webhook_test.go b/internal/webhook/v3/wfs_webhook_test.go
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,12 @@ SOFTWARE.`
`25`	`25`	`package v2beta1`
`26`	`26`
`27`	`27`	`import (`
`28`		`- "fmt"`
`29`		`- sharedModel "github.com/pdok/smooth-operator/model"`
	`28`	`+ "errors"`
`30`	`29`	`"log"`
`31`	`30`	`"strconv"`
`32`	`31`
	`32`	`+ sharedModel "github.com/pdok/smooth-operator/model"`
	`33`	`+`
`33`	`34`	`"sigs.k8s.io/controller-runtime/pkg/conversion"`
`34`	`35`
`35`	`36`	`pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"`
`@@ -256,7 +257,7 @@ func (v2Service WMSService) GetTopLayer() (*WMSLayer, error) {`
`256`	`257`	`}`
`257`	`258`	`}`
`258`	`259`
`259`		`- return nil, fmt.Errorf("unable to detect the toplayer of this WMS service")`
	`260`	`+ return nil, errors.New("unable to detect the toplayer of this WMS service")`
`260`	`261`	`}`
`261`	`262`
`262`	`263`	`func (v2Service WMSService) GetChildLayers(parent WMSLayer) ([]WMSLayer, error) {`
`@@ -269,7 +270,7 @@ func (v2Service WMSService) GetChildLayers(parent WMSLayer) ([]WMSLayer, error)`
`269`	`270`	`}`
`270`	`271`
`271`	`272`	`if len(children) == 0 {`
`272`		`- return children, fmt.Errorf("no child layers found")`
	`273`	`+ return children, errors.New("no child layers found")`
`273`	`274`	`}`
`274`	`275`
`275`	`276`	`return children, nil`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@ package v3`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- sharedValidation "github.com/pdok/smooth-operator/pkg/validation"`
`6`	`5`	`"strings"`
	`6`	`+`
	`7`	`+ sharedValidation "github.com/pdok/smooth-operator/pkg/validation"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func (wfs *WFS) ValidateCreate() ([]string, error) {`
`@@ -36,11 +37,11 @@ func (wfs WFS) ValidateUpdate(wfsOld WFS) ([]string, error) {`
`36`	`37`
`37`	`38`	`// Check service.baseURL did not change`
`38`	`39`	`if wfs.Spec.Service.URL != wfsOld.Spec.Service.URL {`
`39`		`- reasons = append(reasons, fmt.Sprintf("service.baseURL is immutable"))`
	`40`	`+ reasons = append(reasons, "service.baseURL is immutable")`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`if (wfs.Spec.Service.Inspire == nil && wfsOld.Spec.Service.Inspire != nil) \|\| (wfs.Spec.Service.Inspire != nil && wfsOld.Spec.Service.Inspire == nil) {`
`43`		`- reasons = append(reasons, fmt.Sprintf("services cannot change from inspire to not inspire or the other way around"))`
	`44`	`+ reasons = append(reasons, "services cannot change from inspire to not inspire or the other way around")`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`validateWFS(wfs, &warnings, &reasons)`
`@@ -65,7 +66,7 @@ func validateWFS(wfs WFS, warnings []string, reasons *[]string) {`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`if service.Mapfile == nil && service.DefaultCrs != "EPSG:28992" && service.Bbox == nil {`
`68`		`- reasons = append(reasons, fmt.Sprintf("service.bbox.defaultCRS is required when service.defaultCRS is not 'EPSG:28992'"))`
	`69`	`+ reasons = append(reasons, "service.bbox.defaultCRS is required when service.defaultCRS is not 'EPSG:28992'")`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`if service.Mapfile != nil {`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ func main() {`
`258`	`258`	`os.Exit(1)`
`259`	`259`	`}`
`260`	`260`	`}`
`261`		`- //nolint:goconst`
	`261`	`+`
`262`	`262`	`if os.Getenv("ENABLE_WEBHOOKS") != "false" {`
`263`	`263`	`if err = webhookpdoknlv3.SetupWFSWebhookWithManager(mgr); err != nil {`
`264`	`264`	`setupLog.Error(err, "unable to create webhook", "webhook", "WFS")`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package samples`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`_ "embed"`
	`5`	`+`
`5`	`6`	`pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"`
`6`	`7`	`"sigs.k8s.io/yaml"`
`7`	`8`	`)`