Merge pull request #38 from PDOK/wr/linting

Shalucik · web-flow · commit 9da2f2653ed0 · 2025-05-14T03:19:34.000-04:00
linting todos
diff --git a/api/v2beta1/shared_conversion.go b/api/v2beta1/shared_conversion.go
@@ -36,6 +36,7 @@ func ConvertOptionsV3ToV2(src pdoknlv3.Options) WMSWFSOptions {
 	}
 }
 
+//nolint:gosec
 func ConvertAutoscaling(src Autoscaling) *pdoknlv3.HorizontalPodAutoscalerPatch {
 	var minReplicas *int32
 	if src.MinReplicas != nil {
diff --git a/api/v2beta1/wfs_conversion.go b/api/v2beta1/wfs_conversion.go
@@ -45,6 +45,7 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
 	return src.ToV3(dst)
 }
 
+//nolint:gosec
 func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 	dst.ObjectMeta = src.ObjectMeta
 
diff --git a/api/v2beta1/wms_conversion.go b/api/v2beta1/wms_conversion.go
@@ -49,6 +49,7 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
 	return nil
 }
 
+//nolint:gosec
 func (src *WMS) ToV3(target *pdoknlv3.WMS) {
 	dst := target
 
@@ -424,9 +425,11 @@ func (v2Layer WMSLayer) MapToV3(v2Service WMSService) pdoknlv3.Layer {
 	return layer
 }
 
+//nolint:cyclop
 func mapV3LayerToV2Layers(v3Layer pdoknlv3.Layer, parent *pdoknlv3.Layer, serviceEPSG string) []WMSLayer {
 	var layers []WMSLayer
 
+	//nolint:nestif
 	if parent == nil && v3Layer.Name == nil {
 		// Default top layer, do not include in v2 layers
 		if v3Layer.Layers != nil {
diff --git a/api/v3/wfs_validation.go b/api/v3/wfs_validation.go
@@ -30,6 +30,7 @@ func (wfs *WFS) ValidateCreate() ([]string, error) {
 		wfs.Name, allErrs)
 }
 
+// TODO fix linting (dupl)
 func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
 	warnings := []string{}
 	allErrs := field.ErrorList{}
diff --git a/api/v3/wms_types.go b/api/v3/wms_types.go
@@ -564,6 +564,7 @@ func (wms *WMS) URLPath() string {
 func (wms *WMS) GeoPackages() []*Gpkg {
 	gpkgs := make([]*Gpkg, 0)
 
+	// TODO fix linting (nestif)
 	if wms.Spec.Service.Layer.Layers != nil {
 		for _, layer := range wms.Spec.Service.Layer.Layers {
 			if layer.Data != nil {
diff --git a/api/v3/wms_validation.go b/api/v3/wms_validation.go
@@ -32,6 +32,7 @@ func (wms *WMS) ValidateCreate() ([]string, error) {
 		wms.Name, allErrs)
 }
 
+// TODO fix linting (dupl)
 func (wms *WMS) ValidateUpdate(wmsOld *WMS) ([]string, error) {
 	warnings := []string{}
 	allErrs := field.ErrorList{}
@@ -55,6 +56,7 @@ func (wms *WMS) ValidateUpdate(wmsOld *WMS) ([]string, error) {
 		wms.Name, allErrs)
 }
 
+// TODO fix linting (cyclop)
 func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 	if strings.Contains(wms.GetName(), "wms") {
 		sharedValidation.AddWarning(
@@ -220,6 +222,7 @@ func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 			}
 		}
 
+		// TODO fix linting (nestif)
 		if layer.Visible {
 			hasVisibleLayer = true
 
diff --git a/cmd/main.go b/cmd/main.go
@@ -78,7 +78,7 @@ func init() {
 	// +kubebuilder:scaffold:scheme
 }
 
-//nolint:gocyclo
+// TODO fix linting (cyclop)
 func main() {
 	var metricsAddr string
 	var certDir string
diff --git a/config/crd/update_openapi.go b/config/crd/update_openapi.go
@@ -18,6 +18,7 @@ func main() {
 	updateWMSV3Layers(crdDir)
 }
 
+// TODO fix linting (funlen)
 func updateWMSV3Layers(crdDir string) {
 	path := filepath.Join(crdDir, "pdok.nl_wms.yaml")
 
diff --git a/internal/controller/capabilitiesgenerator/mapper.go b/internal/controller/capabilitiesgenerator/mapper.go
@@ -165,6 +165,7 @@ func mapServiceProvider(provider *smoothoperatorv1.ServiceProvider) (serviceProv
 		}
 	}
 
+	// TODO fix linting (nestif)
 	if provider.ServiceContact != nil {
 		serviceProvider.ServiceContact = &wfs200.ServiceContact{
 			IndividualName: provider.ServiceContact.IndividualName,
@@ -360,6 +361,7 @@ func getDcpType(url string, fillPost bool) *wms130.DCPType {
 	return &result
 }
 
+// TODO fix linting (funlen)
 func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 	result := make([]wms130.Layer, 0)
 	referenceLayer := wms.Spec.Service.Layer
diff --git a/internal/controller/mapfilegenerator/mapper.go b/internal/controller/mapfilegenerator/mapper.go
@@ -220,6 +220,7 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
 	return result, nil
 }
 
+// TODO fix linting (cyclop)
 func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv3.WMS) WMSLayer {
 	layerExtent := serviceExtent
 	if len(serviceLayer.BoundingBoxes) > 0 {
diff --git a/internal/controller/mapserver/deployment.go b/internal/controller/mapserver/deployment.go
@@ -29,6 +29,7 @@ const (
 	mimeTextXML = "text/xml"
 )
 
+// TODO fix linting (funlen)
 func GetVolumesForDeployment[O pdoknlv3.WMSWFS](obj O, configMapNames types.HashedConfigMapNames) []v1.Volume {
 	baseVolume := v1.Volume{Name: "base"}
 	if use, size := mapperutils.UseEphemeralVolume(obj); use {
@@ -215,6 +216,7 @@ func GetEnvVarsForDeployment[O pdoknlv3.WMSWFS](obj O, blobsSecretName string) [
 	}
 }
 
+// TODO fix linting (cyclop,gocritic,revive)
 // Resources for mapserver container
 func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements {
 	resources := v1.ResourceRequirements{
@@ -289,6 +291,7 @@ func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements
 	/**
 	Set ephemeral-storage if there is no ephemeral volume
 	*/
+	// TODO fix linting (nestif)
 	if use, _ := mapperutils.UseEphemeralVolume(obj); !use {
 		ephemeralStorageRequest := mapperutils.EphemeralStorageRequest(obj)
 		if ephemeralStorageRequest != nil {
diff --git a/internal/controller/shared_controller.go b/internal/controller/shared_controller.go
@@ -64,11 +64,11 @@ var (
 	MapserverName = "mapserver"
 
 	// Service ports
-	mapserverPortName              = "mapserver"
-	mapserverPortNr                = 80
-	mapserverWebserviceProxyPortNr = 9111
-	metricPortName                 = "metric"
-	metricPortNr                   = 9117
+	mapserverPortName                    = "mapserver"
+	mapserverPortNr                int32 = 80
+	mapserverWebserviceProxyPortNr       = 9111
+	metricPortName                       = "metric"
+	metricPortNr                   int32 = 9117
 
 	corsHeadersName = "mapserver-headers"
 )
@@ -398,7 +398,7 @@ func mutateIngressRoute[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, ingressRout
 			Kind: "Service",
 			Port: intstr.IntOrString{
 				Type:   intstr.Int,
-				IntVal: int32(mapserverPortNr),
+				IntVal: mapserverPortNr,
 			},
 		},
 	}
@@ -423,7 +423,8 @@ func mutateIngressRoute[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, ingressRout
 					Name: getBareService(obj).GetName(),
 					Kind: "Service",
 					Port: intstr.IntOrString{
-						Type:   intstr.Int,
+						Type: intstr.Int,
+						//nolint:gosec
 						IntVal: int32(mapserverWebserviceProxyPortNr),
 					},
 				},
@@ -760,14 +761,14 @@ func mutateService[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, service *corev1.
 	ports := []corev1.ServicePort{
 		{
 			Name:       mapserverPortName,
-			Port:       int32(mapserverPortNr),
-			TargetPort: intstr.FromInt32(int32(mapserverPortNr)),
+			Port:       mapserverPortNr,
+			TargetPort: intstr.FromInt32(mapserverPortNr),
 			Protocol:   corev1.ProtocolTCP,
 		},
 		{
 			Name:       metricPortName,
-			Port:       int32(metricPortNr),
-			TargetPort: intstr.FromInt32(int32(metricPortNr)),
+			Port:       metricPortNr,
+			TargetPort: intstr.FromInt32(metricPortNr),
 			Protocol:   corev1.ProtocolTCP,
 		},
 	}
@@ -1000,6 +1001,7 @@ func getFinalizerName[O pdoknlv3.WMSWFS](obj O) string {
 	return strings.ToLower(string(obj.Type())) + "." + pdoknlv3.GroupVersion.Group + "/finalizer"
 }
 
+// TODO fix linting (cyclop)
 func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Context, r R, obj O, ownerInfo *smoothoperatorv1.OwnerInfo) (operationResults map[string]controllerutil.OperationResult, err error) {
 	operationResults = make(map[string]controllerutil.OperationResult)
 	reconcilerClient := getReconcilerClient(r)
@@ -1070,6 +1072,7 @@ func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Con
 	}
 	// end region ConfigMap-BlobDownload
 
+	// TODO fix linting (nestif)
 	if obj.Type() == pdoknlv3.ServiceTypeWMS {
 		wms, _ := any(obj).(*pdoknlv3.WMS)
 		wmsReconciler := (*WMSReconciler)(r)
@@ -1205,6 +1208,7 @@ func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Con
 	return operationResults, nil
 }
 
+// TODO fix linting (funlen)
 func deleteAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Context, r R, obj O, ownerInfo *smoothoperatorv1.OwnerInfo) (err error) {
 	bareObjects := getSharedBareObjects(obj)
 	var objects []client.Object
diff --git a/internal/controller/wfs_controller.go b/internal/controller/wfs_controller.go
@@ -67,6 +67,7 @@ type WFSReconciler struct {
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.0/pkg/reconcile
+// TODO fix linting (dupl)
 func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
 	lgr := log.FromContext(ctx)
 	lgr.Info("Starting reconcile for WFS resource", "name", req.NamespacedName)
diff --git a/internal/controller/wms_controller.go b/internal/controller/wms_controller.go
@@ -78,6 +78,7 @@ type WMSReconciler struct {
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.0/pkg/reconcile
+// TODO fix linting (dupl)
 func (r *WMSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
 	lgr := log.FromContext(ctx)
 	lgr.Info("Starting reconcile for WMS resource", "name", req.NamespacedName)
diff --git a/internal/webhook/v3/wfs_webhook.go b/internal/webhook/v3/wfs_webhook.go
@@ -24,6 +24,7 @@ SOFTWARE.
 
 package v3
 
+// TODO fix linting (dupl)
 import (
 	"context"
 	"fmt"
diff --git a/internal/webhook/v3/wms_webhook.go b/internal/webhook/v3/wms_webhook.go
@@ -24,6 +24,7 @@ SOFTWARE.
 
 package v3
 
+// TODO fix linting (dupl)
 import (
 	"context"
 	"fmt"

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ func ConvertOptionsV3ToV2(src pdoknlv3.Options) WMSWFSOptions {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
	`39`	`+//nolint:gosec`
`39`	`40`	`func ConvertAutoscaling(src Autoscaling) *pdoknlv3.HorizontalPodAutoscalerPatch {`
`40`	`41`	`var minReplicas *int32`
`41`	`42`	`if src.MinReplicas != nil {`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {`
`45`	`45`	`return src.ToV3(dst)`
`46`	`46`	`}`
`47`	`47`
	`48`	`+//nolint:gosec`
`48`	`49`	`func (src WFS) ToV3(dst pdoknlv3.WFS) error {`
`49`	`50`	`dst.ObjectMeta = src.ObjectMeta`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ func (wfs *WFS) ValidateCreate() ([]string, error) {`
`30`	`30`	`wfs.Name, allErrs)`
`31`	`31`	`}`
`32`	`32`
	`33`	`+// TODO fix linting (dupl)`
`33`	`34`	`func (wfs WFS) ValidateUpdate(wfsOld WFS) ([]string, error) {`
`34`	`35`	`warnings := []string{}`
`35`	`36`	`allErrs := field.ErrorList{}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ func (wms *WMS) ValidateCreate() ([]string, error) {`
`32`	`32`	`wms.Name, allErrs)`
`33`	`33`	`}`
`34`	`34`
	`35`	`+// TODO fix linting (dupl)`
`35`	`36`	`func (wms WMS) ValidateUpdate(wmsOld WMS) ([]string, error) {`
`36`	`37`	`warnings := []string{}`
`37`	`38`	`allErrs := field.ErrorList{}`
`@@ -55,6 +56,7 @@ func (wms WMS) ValidateUpdate(wmsOld WMS) ([]string, error) {`
`55`	`56`	`wms.Name, allErrs)`
`56`	`57`	`}`
`57`	`58`
	`59`	`+// TODO fix linting (cyclop)`
`58`	`60`	`func ValidateWMS(wms WMS, warnings []string, allErrs *field.ErrorList) {`
`59`	`61`	`if strings.Contains(wms.GetName(), "wms") {`
`60`	`62`	`sharedValidation.AddWarning(`
`@@ -220,6 +222,7 @@ func ValidateWMS(wms WMS, warnings []string, allErrs *field.ErrorList) {`
`220`	`222`	`}`
`221`	`223`	`}`
`222`	`224`
	`225`	`+ // TODO fix linting (nestif)`
`223`	`226`	`if layer.Visible {`
`224`	`227`	`hasVisibleLayer = true`
`225`	`228`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func init() {`
`78`	`78`	`// +kubebuilder:scaffold:scheme`
`79`	`79`	`}`
`80`	`80`
`81`		`-//nolint:gocyclo`
	`81`	`+// TODO fix linting (cyclop)`
`82`	`82`	`func main() {`
`83`	`83`	`var metricsAddr string`
`84`	`84`	`var certDir string`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ func main() {`
`18`	`18`	`updateWMSV3Layers(crdDir)`
`19`	`19`	`}`
`20`	`20`
	`21`	`+// TODO fix linting (funlen)`
`21`	`22`	`func updateWMSV3Layers(crdDir string) {`
`22`	`23`	`path := filepath.Join(crdDir, "pdok.nl_wms.yaml")`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ func mapServiceProvider(provider *smoothoperatorv1.ServiceProvider) (serviceProv`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
	`168`	`+ // TODO fix linting (nestif)`
`168`	`169`	`if provider.ServiceContact != nil {`
`169`	`170`	`serviceProvider.ServiceContact = &wfs200.ServiceContact{`
`170`	`171`	`IndividualName: provider.ServiceContact.IndividualName,`
`@@ -360,6 +361,7 @@ func getDcpType(url string, fillPost bool) *wms130.DCPType {`
`360`	`361`	`return &result`
`361`	`362`	`}`
`362`	`363`
	`364`	`+// TODO fix linting (funlen)`
`363`	`365`	`func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {`
`364`	`366`	`result := make([]wms130.Layer, 0)`
`365`	`367`	`referenceLayer := wms.Spec.Service.Layer`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@ func MapWMSToMapfileGeneratorInput(wms pdoknlv3.WMS, _ smoothoperatorv1.OwnerI`
`220`	`220`	`return result, nil`
`221`	`221`	`}`
`222`	`222`
	`223`	`+// TODO fix linting (cyclop)`
`223`	`224`	`func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv3.WMS) WMSLayer {`
`224`	`225`	`layerExtent := serviceExtent`
`225`	`226`	`if len(serviceLayer.BoundingBoxes) > 0 {`