Merge pull request #36 from PDOK/wr/linting-1

linting simpel

Author: Shalucik

.golangci.yml

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

api/v2beta1/wfs_conversion.go

@@ -25,9 +25,10 @@ SOFTWARE.
 package v2beta1
 
 import (
-	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	"log"
 
+	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
+
 	sharedModel "github.com/pdok/smooth-operator/model"
 
 	"sigs.k8s.io/controller-runtime/pkg/conversion"

api/v2beta1/wms_conversion.go

@@ -26,12 +26,13 @@ package v2beta1
 
 import (
 	"errors"
-	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	"log"
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
 	"strconv"
 	"strings"
 
+	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	sharedModel "github.com/pdok/smooth-operator/model"
 )

api/v2beta1/wms_conversion_test.go

@@ -1,10 +1,11 @@
 package v2beta1
 
 import (
+	"testing"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/yaml"
-	"testing"
 )
 
 func TestV2ToV3(t *testing.T) {

api/v3/wfs_types.go

@@ -245,6 +245,7 @@ func (wfs *WFS) GeoPackages() []*Gpkg {
 	return gpkgs
 }
 
+//nolint:revive
 func (wfs *WFS) GetBaseUrl() string {
 	return wfs.Spec.Service.URL
 }

api/v3/wms_types.go

@@ -25,12 +25,13 @@ SOFTWARE.
 package v3
 
 import (
-	shared_model "github.com/pdok/smooth-operator/model"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"maps"
 	"slices"
 	"sort"
+
+	shared_model "github.com/pdok/smooth-operator/model"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -582,6 +583,7 @@ func (wms *WMS) GeoPackages() []*Gpkg {
 	return gpkgs
 }
 
+//nolint:revive
 func (wms *WMS) GetBaseUrl() string {
 	return wms.Spec.Service.URL
 }

api/v3/wms_types_test.go

@@ -1,11 +1,12 @@
 package v3
 
 import (
+	"reflect"
+	"testing"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/pdok/smooth-operator/model"
 	controller "github.com/pdok/smooth-operator/pkg/util"
-	"reflect"
-	"testing"
 )
 
 func TestLayer_setInheritedBoundingBoxes(t *testing.T) {

api/v3/wms_validation_test.go

@@ -1,9 +1,10 @@
 package v3
 
 import (
-	controller "github.com/pdok/smooth-operator/pkg/util"
 	"reflect"
 	"testing"
+
+	controller "github.com/pdok/smooth-operator/pkg/util"
 )
 
 func Test_getEqualChildStyleNames(t *testing.T) {

cmd/main.go

@@ -20,16 +20,18 @@ import (
 	"crypto/tls"
 	"errors"
 	"flag"
+	"os"
+
 	"github.com/go-logr/zapr"
 	"github.com/pdok/smooth-operator/pkg/integrations/logging"
 	"github.com/peterbourgon/ff"
 	"go.uber.org/zap/zapcore"
-	"os"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"github.com/pdok/mapserver-operator/internal/controller/mapfilegenerator"
 	smoothoperator "github.com/pdok/smooth-operator/api/v1"
 	traefikiov1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefikio/v1alpha1"
+
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"

config/crd/bases/embed.go

@@ -2,6 +2,7 @@ package bases
 
 import (
 	_ "embed"
+
 	"github.com/pdok/smooth-operator/pkg/validation"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"sigs.k8s.io/yaml"