diff --git a/.golangci.yml b/.golangci.yml index 3142828..a9f9bdf 100644 --- a/.golangci.yml +++ b/.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 diff --git a/api/v2beta1/wfs_conversion.go b/api/v2beta1/wfs_conversion.go index 8111134..146e8ce 100644 --- a/api/v2beta1/wfs_conversion.go +++ b/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" diff --git a/api/v2beta1/wms_conversion.go b/api/v2beta1/wms_conversion.go index c57b28b..c9c4da8 100644 --- a/api/v2beta1/wms_conversion.go +++ b/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" ) diff --git a/api/v2beta1/wms_conversion_test.go b/api/v2beta1/wms_conversion_test.go index cc0dfb4..4146204 100644 --- a/api/v2beta1/wms_conversion_test.go +++ b/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) { diff --git a/api/v3/wfs_types.go b/api/v3/wfs_types.go index 1b70793..9662e21 100644 --- a/api/v3/wfs_types.go +++ b/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 } diff --git a/api/v3/wms_types.go b/api/v3/wms_types.go index c298e6f..07a4804 100644 --- a/api/v3/wms_types.go +++ b/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 } diff --git a/api/v3/wms_types_test.go b/api/v3/wms_types_test.go index 85b1792..a637e38 100644 --- a/api/v3/wms_types_test.go +++ b/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) { diff --git a/api/v3/wms_validation_test.go b/api/v3/wms_validation_test.go index 468526d..faeed82 100644 --- a/api/v3/wms_validation_test.go +++ b/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) { diff --git a/cmd/main.go b/cmd/main.go index 012cafc..9edf10a 100644 --- a/cmd/main.go +++ b/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" diff --git a/config/crd/bases/embed.go b/config/crd/bases/embed.go index 8ce7a4d..293b2a5 100644 --- a/config/crd/bases/embed.go +++ b/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" diff --git a/config/crd/update_openapi.go b/config/crd/update_openapi.go index d5984df..86d526e 100644 --- a/config/crd/update_openapi.go +++ b/config/crd/update_openapi.go @@ -1,13 +1,14 @@ package main import ( + "os" + "path/filepath" + "strings" + "github.com/pkg/errors" goyaml "gopkg.in/yaml.v3" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - "os" - "path/filepath" kyaml "sigs.k8s.io/yaml" - "strings" ) // Usage: go run ./update_layersv3_openapi.go @@ -84,7 +85,7 @@ func updateWMSV3Layers(crdDir string) { // Remove the 'status' field from the yaml var rawData map[string]interface{} - goyaml.Unmarshal(updatedContent, &rawData) + _ = goyaml.Unmarshal(updatedContent, &rawData) delete(rawData, "status") f, _ := os.OpenFile(path, os.O_TRUNC|os.O_WRONLY, 0644) diff --git a/internal/controller/blobdownload/blob_download.go b/internal/controller/blobdownload/blob_download.go index d7688af..d92f075 100644 --- a/internal/controller/blobdownload/blob_download.go +++ b/internal/controller/blobdownload/blob_download.go @@ -3,10 +3,11 @@ package blobdownload import ( _ "embed" "fmt" - "k8s.io/utils/strings/slices" "regexp" "strings" + "k8s.io/utils/strings/slices" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "github.com/pdok/mapserver-operator/internal/controller/mapperutils" "github.com/pdok/mapserver-operator/internal/controller/mapserver" diff --git a/internal/controller/capabilitiesgenerator/capabilities_generator.go b/internal/controller/capabilitiesgenerator/capabilities_generator.go index 2332e03..0c679bf 100644 --- a/internal/controller/capabilitiesgenerator/capabilities_generator.go +++ b/internal/controller/capabilitiesgenerator/capabilities_generator.go @@ -2,6 +2,7 @@ package capabilitiesgenerator import ( "fmt" + "gopkg.in/yaml.v3" pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" diff --git a/internal/controller/capabilitiesgenerator/mapper.go b/internal/controller/capabilitiesgenerator/mapper.go index 1c0f1de..45410b8 100644 --- a/internal/controller/capabilitiesgenerator/mapper.go +++ b/internal/controller/capabilitiesgenerator/mapper.go @@ -2,10 +2,11 @@ package capabilitiesgenerator import ( "fmt" - "github.com/pdok/ogc-specifications/pkg/wms130" "strconv" "strings" + "github.com/pdok/ogc-specifications/pkg/wms130" + "github.com/cbroglie/mustache" pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "github.com/pdok/mapserver-operator/internal/controller/mapperutils" diff --git a/internal/controller/featureinfogenerator/featureinfo_generator.go b/internal/controller/featureinfogenerator/featureinfo_generator.go index c8f76ef..ec5803d 100644 --- a/internal/controller/featureinfogenerator/featureinfo_generator.go +++ b/internal/controller/featureinfogenerator/featureinfo_generator.go @@ -3,6 +3,7 @@ package featureinfogenerator import ( "encoding/json" "fmt" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "github.com/pdok/mapserver-operator/internal/controller/mapserver" corev1 "k8s.io/api/core/v1" diff --git a/internal/controller/featureinfogenerator/featureinfo_generator_test.go b/internal/controller/featureinfogenerator/featureinfo_generator_test.go index 94d5cf0..cc1d0e2 100644 --- a/internal/controller/featureinfogenerator/featureinfo_generator_test.go +++ b/internal/controller/featureinfogenerator/featureinfo_generator_test.go @@ -1,9 +1,10 @@ package featureinfogenerator import ( + "testing" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util" - "testing" ) const ( diff --git a/internal/controller/legendgenerator/legend_generator_test.go b/internal/controller/legendgenerator/legend_generator_test.go index 77a1fe8..ebef4e3 100644 --- a/internal/controller/legendgenerator/legend_generator_test.go +++ b/internal/controller/legendgenerator/legend_generator_test.go @@ -1,11 +1,12 @@ package legendgenerator import ( + "testing" + "github.com/pdok/mapserver-operator/api/v2beta1" pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "github.com/stretchr/testify/assert" "sigs.k8s.io/yaml" - "testing" ) func TestGetConfigMapDataNoLegendFix(t *testing.T) { diff --git a/internal/controller/legendgenerator/mapper.go b/internal/controller/legendgenerator/mapper.go index d4c090a..05eabd7 100644 --- a/internal/controller/legendgenerator/mapper.go +++ b/internal/controller/legendgenerator/mapper.go @@ -2,11 +2,13 @@ package legendgenerator import ( "fmt" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" _ "embed" - "sigs.k8s.io/yaml" "strings" + + "sigs.k8s.io/yaml" ) // TODO Reuse default_mapserver.conf from static_files? diff --git a/internal/controller/mapfilegenerator/mapfile_generator_test.go b/internal/controller/mapfilegenerator/mapfile_generator_test.go index a922e22..ad0b738 100644 --- a/internal/controller/mapfilegenerator/mapfile_generator_test.go +++ b/internal/controller/mapfilegenerator/mapfile_generator_test.go @@ -2,11 +2,12 @@ package mapfilegenerator import ( "encoding/json" + "testing" + "github.com/pdok/mapserver-operator/api/v2beta1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "sigs.k8s.io/yaml" - "testing" pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1" diff --git a/internal/controller/mapfilegenerator/mapper.go b/internal/controller/mapfilegenerator/mapper.go index ec68e17..0909943 100644 --- a/internal/controller/mapfilegenerator/mapper.go +++ b/internal/controller/mapfilegenerator/mapper.go @@ -2,10 +2,11 @@ package mapfilegenerator import ( "fmt" - "github.com/pdok/mapserver-operator/api/v2beta1" "strconv" "strings" + "github.com/pdok/mapserver-operator/api/v2beta1" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "github.com/pdok/mapserver-operator/internal/controller/mapperutils" smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1" diff --git a/internal/controller/mapserver/deployment.go b/internal/controller/mapserver/deployment.go index a35d80e..3e5b4a9 100644 --- a/internal/controller/mapserver/deployment.go +++ b/internal/controller/mapserver/deployment.go @@ -7,7 +7,7 @@ import ( 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" + "github.com/pdok/mapserver-operator/internal/controller/static" "github.com/pdok/mapserver-operator/internal/controller/types" smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util" v1 "k8s.io/api/core/v1" @@ -159,7 +159,7 @@ func GetVolumeMountsForDeployment[O pdoknlv3.WMSWFS](obj O, srvDir string) []v1. }, } - staticFiles, _ := static_files.GetStaticFiles() + staticFiles, _ := static.GetStaticFiles() for _, name := range staticFiles { volumeMounts = append(volumeMounts, v1.VolumeMount{ Name: "mapserver", diff --git a/internal/controller/mapserver/deployment_test.go b/internal/controller/mapserver/deployment_test.go index 4a0c998..f0df376 100644 --- a/internal/controller/mapserver/deployment_test.go +++ b/internal/controller/mapserver/deployment_test.go @@ -1,6 +1,8 @@ package mapserver import ( + "testing" + "github.com/pdok/mapserver-operator/api/v2beta1" pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "github.com/pdok/mapserver-operator/internal/controller/types" @@ -9,7 +11,6 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "sigs.k8s.io/yaml" - "testing" _ "embed" ) @@ -130,6 +131,6 @@ func getV3() *pdoknlv3.WFS { panic(err) } var wfs pdoknlv3.WFS - v2wfs.ToV3(&wfs) + _ = v2wfs.ToV3(&wfs) return &wfs } diff --git a/internal/controller/ogcwebserviceproxy/ogc_webservice_proxy_test.go b/internal/controller/ogcwebserviceproxy/ogc_webservice_proxy_test.go index 05715b2..0e16de4 100644 --- a/internal/controller/ogcwebserviceproxy/ogc_webservice_proxy_test.go +++ b/internal/controller/ogcwebserviceproxy/ogc_webservice_proxy_test.go @@ -1,9 +1,10 @@ package ogcwebserviceproxy import ( + "testing" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" controller "github.com/pdok/smooth-operator/pkg/util" - "testing" ) const expectedConfig = `grouplayers: diff --git a/internal/controller/shared_controller.go b/internal/controller/shared_controller.go index 19effd3..35b8cf5 100644 --- a/internal/controller/shared_controller.go +++ b/internal/controller/shared_controller.go @@ -4,6 +4,10 @@ import ( "context" "errors" "fmt" + "strconv" + "strings" + "time" + "github.com/pdok/mapserver-operator/internal/controller/featureinfogenerator" "github.com/pdok/mapserver-operator/internal/controller/legendgenerator" "github.com/pdok/mapserver-operator/internal/controller/mapserver" @@ -11,16 +15,13 @@ import ( "github.com/pdok/mapserver-operator/internal/controller/types" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/resource" - "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" "github.com/pdok/mapserver-operator/internal/controller/mapfilegenerator" "github.com/pdok/mapserver-operator/internal/controller/mapperutils" - "github.com/pdok/mapserver-operator/internal/controller/static_files" + "github.com/pdok/mapserver-operator/internal/controller/static" smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1" "github.com/pdok/smooth-operator/model" smoothoperatork8s "github.com/pdok/smooth-operator/pkg/k8s" @@ -886,7 +887,7 @@ func mutateConfigMap[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *cor configMap.Immutable = smoothoperatorutils.Pointer(true) configMap.Data = map[string]string{} - staticFileName, contents := static_files.GetStaticFiles() + staticFileName, contents := static.GetStaticFiles() for _, name := range staticFileName { content := contents[name] if name == "include.conf" { diff --git a/internal/controller/shared_controller_test.go b/internal/controller/shared_controller_test.go index 8f8a322..bcacf5e 100644 --- a/internal/controller/shared_controller_test.go +++ b/internal/controller/shared_controller_test.go @@ -3,6 +3,7 @@ package controller import ( "context" "fmt" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "github.com/pdok/mapserver-operator/internal/controller/mapserver" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/controller/static_files/files/default_mapserver.conf b/internal/controller/static/files/default_mapserver.conf similarity index 100% rename from internal/controller/static_files/files/default_mapserver.conf rename to internal/controller/static/files/default_mapserver.conf diff --git a/internal/controller/static_files/files/include.conf b/internal/controller/static/files/include.conf similarity index 100% rename from internal/controller/static_files/files/include.conf rename to internal/controller/static/files/include.conf diff --git a/internal/controller/static_files/files/ogc.lua b/internal/controller/static/files/ogc.lua similarity index 100% rename from internal/controller/static_files/files/ogc.lua rename to internal/controller/static/files/ogc.lua diff --git a/internal/controller/static_files/files/scraping-error.xml b/internal/controller/static/files/scraping-error.xml similarity index 100% rename from internal/controller/static_files/files/scraping-error.xml rename to internal/controller/static/files/scraping-error.xml diff --git a/internal/controller/static_files/reader.go b/internal/controller/static/reader.go similarity index 95% rename from internal/controller/static_files/reader.go rename to internal/controller/static/reader.go index 3180670..0b28c89 100644 --- a/internal/controller/static_files/reader.go +++ b/internal/controller/static/reader.go @@ -1,4 +1,4 @@ -package static_files +package static import ( "embed" diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index 6eb0beb..e4ccb88 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -29,6 +29,11 @@ import ( "context" "encoding/json" "errors" + "os" + "os/exec" + "path/filepath" + "testing" + pdoknlv2beta1 "github.com/pdok/mapserver-operator/api/v2beta1" smoothoperator1 "github.com/pdok/smooth-operator/api/v1" smoothoperatorvalidation "github.com/pdok/smooth-operator/pkg/validation" @@ -38,10 +43,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - "os" - "os/exec" - "path/filepath" - "testing" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -76,6 +77,7 @@ func TestControllers(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) + //nolint:fatcontext ctx, cancel = context.WithCancel(context.TODO()) scheme := runtime.NewScheme() diff --git a/internal/controller/wfs_controller.go b/internal/controller/wfs_controller.go index 147458b..fc37cec 100644 --- a/internal/controller/wfs_controller.go +++ b/internal/controller/wfs_controller.go @@ -26,6 +26,7 @@ package controller import ( "context" + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1" smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util" diff --git a/internal/controller/wms_controller.go b/internal/controller/wms_controller.go index fc20722..9df75f9 100644 --- a/internal/controller/wms_controller.go +++ b/internal/controller/wms_controller.go @@ -26,6 +26,7 @@ package controller import ( "context" + "github.com/pdok/mapserver-operator/internal/controller/featureinfogenerator" "github.com/pdok/mapserver-operator/internal/controller/legendgenerator" "github.com/pdok/mapserver-operator/internal/controller/ogcwebserviceproxy" diff --git a/internal/controller/wms_controller_test.go b/internal/controller/wms_controller_test.go index 0618244..38b3efd 100644 --- a/internal/controller/wms_controller_test.go +++ b/internal/controller/wms_controller_test.go @@ -30,6 +30,8 @@ import ( _ "embed" "errors" "fmt" + "slices" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" @@ -50,7 +52,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/yaml" - "slices" ) const ( diff --git a/internal/webhook/v3/shared_webhook.go b/internal/webhook/v3/shared_webhook.go index ae28b60..6a74972 100644 --- a/internal/webhook/v3/shared_webhook.go +++ b/internal/webhook/v3/shared_webhook.go @@ -3,8 +3,9 @@ package v3 import ( "encoding/json" "errors" - pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "os" + + pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" "sigs.k8s.io/yaml" ) diff --git a/internal/webhook/v3/webhook_suite_test.go b/internal/webhook/v3/webhook_suite_test.go index dc4f16f..7e4722a 100644 --- a/internal/webhook/v3/webhook_suite_test.go +++ b/internal/webhook/v3/webhook_suite_test.go @@ -29,14 +29,15 @@ import ( "context" "crypto/tls" "fmt" - pdoknlv2beta1 "github.com/pdok/mapserver-operator/api/v2beta1" - "k8s.io/apimachinery/pkg/runtime" "net" "os" "path/filepath" "testing" "time" + pdoknlv2beta1 "github.com/pdok/mapserver-operator/api/v2beta1" + "k8s.io/apimachinery/pkg/runtime" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -74,6 +75,7 @@ func TestAPIs(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) + //nolint:fatcontext ctx, cancel = context.WithCancel(context.TODO()) scheme := runtime.NewScheme() diff --git a/internal/webhook/v3/wfs_webhook_test.go b/internal/webhook/v3/wfs_webhook_test.go index f029520..d2ce4cb 100644 --- a/internal/webhook/v3/wfs_webhook_test.go +++ b/internal/webhook/v3/wfs_webhook_test.go @@ -27,6 +27,7 @@ package v3 //nolint:revive // Complains about the dot imports import ( "context" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/webhook/v3/wms_webhook.go b/internal/webhook/v3/wms_webhook.go index e1e8dc3..7f10ddd 100644 --- a/internal/webhook/v3/wms_webhook.go +++ b/internal/webhook/v3/wms_webhook.go @@ -27,6 +27,7 @@ package v3 import ( "context" "fmt" + "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" logf "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/internal/webhook/v3/wms_webhook_test.go b/internal/webhook/v3/wms_webhook_test.go index 4ce953d..221c0d7 100644 --- a/internal/webhook/v3/wms_webhook_test.go +++ b/internal/webhook/v3/wms_webhook_test.go @@ -27,6 +27,7 @@ package v3 //nolint:revive // Complains about the dot imports import ( "context" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" pdoknlv3 "github.com/pdok/mapserver-operator/api/v3" diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 321727e..a3d3949 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -173,7 +173,7 @@ var _ = Describe("Manager", Ordered, func() { It("should ensure the metrics endpoint is serving metrics", func() { By("creating a ClusterRoleBinding for the service account to allow access to metrics") - //nolint:gosec + cmd := exec.Command("kubectl", "create", "clusterrolebinding", metricsRoleBindingName, "--clusterrole=mapserver-operator-metrics-reader", fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName), @@ -332,7 +332,7 @@ var _ = Describe("Manager", Ordered, func() { // It uses the Kubernetes TokenRequest API to generate a token by directly sending a request // and parsing the resulting token from the API response. func serviceAccountToken() (string, error) { - //nolint:gosec + const tokenRequestRawString = `{ "apiVersion": "authentication.k8s.io/v1", "kind": "TokenRequest"