Some linting

damienmulder · damienmulder · commit b65123617185 · 2025-03-04T17:13:32.000+01:00
diff --git a/api/v2beta1/atom_conversion.go b/api/v2beta1/atom_conversion.go
@@ -298,12 +298,12 @@ func (dst *Atom) ConvertFrom(srcRaw conversion.Hub) error {
 func createBaseURL(host string, general General) (baseURL string) {
 	atomURI := fmt.Sprintf("%s/%s", general.DatasetOwner, general.Dataset)
 	if general.Theme != nil {
-		atomURI += fmt.Sprintf("/%s", *general.Theme)
+		atomURI += "/" + *general.Theme
 	}
 	atomURI += "/atom"
 
 	if general.ServiceVersion != nil {
-		atomURI += fmt.Sprintf("/%s", *general.ServiceVersion)
+		atomURI += "/" + *general.ServiceVersion
 	}
 
 	baseURL = fmt.Sprintf("%s/%s/index.xml", strings.TrimSuffix(host, "/"), atomURI)
diff --git a/api/v3/atom_types.go b/api/v3/atom_types.go
@@ -26,9 +26,10 @@ package v3
 
 import (
 	"fmt"
+	"strings"
+
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -199,7 +200,7 @@ func GetAtomBaseURLHost() string {
 	return baseURLHost
 }
 
-func (r *Atom) GetURI() (URI string) {
+func (r *Atom) GetURI() (uri string) {
 	datasetOwner := "unknown"
 	if v, ok := r.ObjectMeta.Labels["dataset-owner"]; ok {
 		datasetOwner = v
@@ -208,14 +209,14 @@ func (r *Atom) GetURI() (URI string) {
 	if v, ok := r.ObjectMeta.Labels["dataset"]; ok {
 		dataset = v
 	}
-	URI = fmt.Sprintf("%s/%s", datasetOwner, dataset)
+	uri = fmt.Sprintf("%s/%s", datasetOwner, dataset)
 
 	if v, ok := r.ObjectMeta.Labels["theme"]; ok {
-		URI += fmt.Sprintf("/%s", v)
+		uri += "/" + v
 	}
-	URI += "/atom"
+	uri += "/atom"
 	if v, ok := r.ObjectMeta.Labels["service-version"]; ok {
-		URI += fmt.Sprintf("/%s", v)
+		uri += "/" + v
 	}
 	return
 }
diff --git a/cmd/main.go b/cmd/main.go
@@ -68,7 +68,7 @@ func init() {
 	// +kubebuilder:scaffold:scheme
 }
 
-// nolint:gocyclo
+//nolint:gocyclo
 func main() {
 	var metricsAddr string
 	var metricsCertPath, metricsCertName, metricsCertKey string
@@ -235,15 +235,15 @@ func main() {
 		os.Exit(1)
 	}
 
-	// nolint:goconst
+	//nolint:goconst
 	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
 		if err = webhookpdoknlv2beta1.SetupAtomWebhookWithManager(mgr); err != nil {
 			setupLog.Error(err, "unable to create webhook", "webhook", "Atom")
 			os.Exit(1)
 		}
 	}
 
-	// nolint:goconst
+	//nolint:goconst
 	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
 		if err = webhookpdoknlv3.SetupAtomWebhookWithManager(mgr); err != nil {
 			setupLog.Error(err, "unable to create webhook", "webhook", "Atom")
diff --git a/internal/controller/atom_controller.go b/internal/controller/atom_controller.go
@@ -27,11 +27,12 @@ package controller
 import (
 	"context"
 	"fmt"
+	"strconv"
+	"time"
+
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"strconv"
-	"time"
 
 	v1 "k8s.io/api/policy/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -692,11 +693,11 @@ func getGeneratorConfig(atom *pdoknlv3.Atom, ownerInfo *smoothoperatorv1.OwnerIn
 		return "", fmt.Errorf("failed to map the V3 atom to generator config: %w", err)
 	}
 
-	if yamlConfig, err := yaml.Marshal(&atomGeneratorConfig); err != nil {
+	yamlConfig, err := yaml.Marshal(&atomGeneratorConfig)
+	if err != nil {
 		return "", fmt.Errorf("failed to marshal the generator config to yaml: %w", err)
-	} else {
-		return string(yamlConfig), nil
 	}
+	return string(yamlConfig), nil
 }
 
 func getMatchRuleForIndex(atom *pdoknlv3.Atom) string {
diff --git a/internal/controller/atom_controller_test.go b/internal/controller/atom_controller_test.go
@@ -64,7 +64,6 @@ var fullAtom = pdoknlv3.Atom{
 		Labels: map[string]string{
 			"dataset":       "test-dataset",
 			"dataset-owner": "test-datasetowner",
-			//"app":           "atom",
 		},
 	},
 	Spec: pdoknlv3.AtomSpec{
diff --git a/internal/controller/atom_generator/mapping.go b/internal/controller/atom_generator/mapping.go
@@ -1,13 +1,14 @@
 package atom_generator
 
 import (
-	"fmt"
+	"errors"
+	"strings"
+	"time"
+
 	"github.com/cbroglie/mustache"
 	atom_feed "github.com/pdok/atom-generator/feeds"
 	pdoknlv3 "github.com/pdok/atom-operator/api/v3"
 	v1 "github.com/pdok/smooth-operator/api/v1"
-	"strings"
-	"time"
 )
 
 func MapAtomV3ToAtomGeneratorConfig(atom pdoknlv3.Atom, ownerInfo v1.OwnerInfo) (atomGeneratorConfig atom_feed.Feeds, err error) {
@@ -65,7 +66,7 @@ func MapAtomV3ToAtomGeneratorConfig(atom pdoknlv3.Atom, ownerInfo v1.OwnerInfo)
 
 func getLatestUpdate(feeds []pdoknlv3.DatasetFeed) (string, error) {
 	if len(feeds) == 0 {
-		return "", fmt.Errorf("Atom heeft geen dataset feeds.")
+		return "", errors.New("Atom heeft geen dataset feeds.")
 	}
 	updateTime := feeds[0].Entries[0].Updated
 	for _, datasetFeed := range feeds {
@@ -190,7 +191,7 @@ func getCSWDescribedbyLink(atom pdoknlv3.Atom, language string, ownerInfo v1.Own
 			}, nil
 		}
 	}
-	return atom_feed.Link{}, fmt.Errorf("OwnerInfo heeft geen CSW template")
+	return atom_feed.Link{}, errors.New("OwnerInfo heeft geen CSW template")
 }
 
 func getSearchLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerInfo) (atom_feed.Link, error) {
@@ -209,7 +210,7 @@ func getSearchLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerInfo)
 			}, nil
 		}
 	}
-	return atom_feed.Link{}, fmt.Errorf("OwnerInfo heeft geen opensearch template")
+	return atom_feed.Link{}, errors.New("OwnerInfo heeft geen opensearch template")
 }
 
 func getHTMLRelatedLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerInfo) (atom_feed.Link, error) {
@@ -227,5 +228,5 @@ func getHTMLRelatedLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerI
 			}, nil
 		}
 	}
-	return atom_feed.Link{}, fmt.Errorf("OwnerInfo heeft geen html template")
+	return atom_feed.Link{}, errors.New("OwnerInfo heeft geen html template")
 }
diff --git a/internal/controller/atom_generator/mapping_test.go b/internal/controller/atom_generator/mapping_test.go
@@ -1,11 +1,12 @@
 package atom_generator
 
 import (
+	"reflect"
+	"testing"
+
 	"github.com/pdok/atom-generator/feeds"
 	v3 "github.com/pdok/atom-operator/api/v3"
 	v1 "github.com/pdok/smooth-operator/api/v1"
-	"reflect"
-	"testing"
 )
 
 func TestMapAtomV3ToAtomGeneratorConfig(t *testing.T) {
@@ -57,7 +58,7 @@ func TestMapAtomV3ToAtomGeneratorConfig(t *testing.T) {
 										{
 											TechnicalName: "https://service.pdok.nl/bzk/geologie/bro-geotechnisch-sondeeronderzoek/atom/bro_geotechnisch_sondeeronderzoek_cpt_inspire_geharmoniseerd_geologie.xml",
 											Title:         "BRO - Geotechnisch sondeeronderzoek (CPT) INSPIRE geharmoniseerd - Geologie",
-											Content:       "Gegevens van geotechnisch sondeeronderzoek (kenset) zoals opgeslagen in de Basis Registratie Ondergrond (BRO). Geotechnisch sondeeronderzoek (in het Engels Cone Penetration Test, afgekort tot CPT) is onderzoek dat tot doel heeft informatie over de bodemkundige of geologische opbouw van de ondergrond te verwerven, waarbij in het veld metingen aan de ondergrond worden gedaan door een kegelvormige sonde de grond in te drukken. Traditioneel is het doel met de sonde de weerstand en de wrijving die de conus op de weg naar beneden ondervind te bepalen om daaruit mechanische eigenschappen van de ondergrond af te leiden. In de loop van de tijd is de sonde zo geevolueerd dat een breed scala aan metingen verricht kan worden. Voor meer informatie raadpleeg www.basisregistratieondergrond.nl",
+											Content:       "Gegevens van geotechnisch sondeeronderzoek (kenset) zoals opgeslagen in de Basis Registratie Ondergrond (BRO). Geotechnisch sondeeronderzoek (in het Engels Cone Penetration Test, afgekort tot CPT) is onderzoek dat tot doel heeft informative over de bodemkundige of geologische opbouw van de ondergrond te verwerven, waarbij in het veld metingen aan de ondergrond worden gedaan door een kegelvormige sonde de grond in te drukken. Traditioneel is het doel met de sonde de weerstand en de wrijving die de conus op de weg naar beneden ondervind te bepalen om daaruit mechanische eigenschappen van de ondergrond af te leiden. In de loop van de tijd is de sonde zo geevolueerd dat een breed scala aan metingen verricht kan worden. Voor meer informative raadpleeg www.basisregistratieondergrond.nl",
 											DownloadLinks: []v3.DownloadLink{},
 										},
 									},
diff --git a/internal/controller/utils.go b/internal/controller/utils.go
@@ -28,11 +28,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
+	"regexp"
+
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
-	"maps"
-	"regexp"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
diff --git a/internal/webhook/v2beta1/atom_webhook.go b/internal/webhook/v2beta1/atom_webhook.go
@@ -31,8 +31,9 @@ import (
 	pdoknlv2beta1 "github.com/pdok/atom-operator/api/v2beta1"
 )
 
-// nolint:unused
 // log is for logging in this package.
+//
+//nolint:unused
 var atomlog = logf.Log.WithName("atom-resource")
 
 // SetupAtomWebhookWithManager registers the webhook for Atom in the manager.
diff --git a/internal/webhook/v3/atom_webhook.go b/internal/webhook/v3/atom_webhook.go
@@ -31,8 +31,9 @@ import (
 	pdoknlv3 "github.com/pdok/atom-operator/api/v3"
 )
 
-// nolint:unused
 // log is for logging in this package.
+//
+//nolint:unused
 var atomlog = logf.Log.WithName("atom-resource")
 
 // SetupAtomWebhookWithManager registers the webhook for Atom in the manager.
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -61,7 +61,7 @@ var _ = BeforeSuite(func() {
 	_ = utils.UncommentCode("config/default/kustomization.yaml", "#- ../prometheus", "#")
 
 	By("building the manager(Operator) image")
-	cmd := exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", projectImage))
+	cmd := exec.Command("make", "docker-build", "IMG="+projectImage)
 	_, err := utils.Run(cmd)
 	ExpectWithOffset(1, err).NotTo(HaveOccurred(), "Failed to build the manager(Operator) image")
 
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -66,7 +66,7 @@ var _ = Describe("Manager", Ordered, func() {
 		Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
 
 		By("deploying the controller-manager")
-		cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
+		cmd = exec.Command("make", "deploy", "IMG="+projectImage)
 		_, err = utils.Run(cmd)
 		Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
 	})
@@ -308,7 +308,7 @@ func serviceAccountToken() (string, error) {
 	}`
 
 	// Temporary file to store the token request
-	secretName := fmt.Sprintf("%s-token-request", serviceAccountName)
+	secretName := serviceAccountName + "-token-request"
 	tokenRequestFile := filepath.Join("/tmp", secretName)
 	err := os.WriteFile(tokenRequestFile, []byte(tokenRequestRawString), os.FileMode(0o644))
 	if err != nil {
diff --git a/test/utils/utils.go b/test/utils/utils.go
@@ -54,7 +54,7 @@ func Run(cmd *exec.Cmd) (string, error) {
 	_, _ = fmt.Fprintf(GinkgoWriter, "running: %s\n", command)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		return string(output), fmt.Errorf("%s failed with error: (%v) %s", command, err, string(output))
+		return string(output), fmt.Errorf("%s failed with error: (%w) %s", command, err, string(output))
 	}
 
 	return string(output), nil
@@ -205,7 +205,7 @@ func GetProjectDir() (string, error) {
 // of the target content. The target content may span multiple lines.
 func UncommentCode(filename, target, prefix string) error {
 	// false positive
-	// nolint:gosec
+	//nolint:gosec
 	content, err := os.ReadFile(filename)
 	if err != nil {
 		return err
@@ -246,6 +246,6 @@ func UncommentCode(filename, target, prefix string) error {
 		return err
 	}
 	// false positive
-	// nolint:gosec
+	//nolint:gosec
 	return os.WriteFile(filename, out.Bytes(), 0644)
 }

Original file line number	Diff line number	Diff line change
`@@ -298,12 +298,12 @@ func (dst *Atom) ConvertFrom(srcRaw conversion.Hub) error {`
`298`	`298`	`func createBaseURL(host string, general General) (baseURL string) {`
`299`	`299`	`atomURI := fmt.Sprintf("%s/%s", general.DatasetOwner, general.Dataset)`
`300`	`300`	`if general.Theme != nil {`
`301`		`- atomURI += fmt.Sprintf("/%s", *general.Theme)`
	`301`	`+ atomURI += "/" + *general.Theme`
`302`	`302`	`}`
`303`	`303`	`atomURI += "/atom"`
`304`	`304`
`305`	`305`	`if general.ServiceVersion != nil {`
`306`		`- atomURI += fmt.Sprintf("/%s", *general.ServiceVersion)`
	`306`	`+ atomURI += "/" + *general.ServiceVersion`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`baseURL = fmt.Sprintf("%s/%s/index.xml", strings.TrimSuffix(host, "/"), atomURI)`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,10 @@ package v3`
`26`	`26`
`27`	`27`	`import (`
`28`	`28`	`"fmt"`
	`29`	`+ "strings"`
	`30`	`+`
`29`	`31`	`corev1 "k8s.io/api/core/v1"`
`30`	`32`	`"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"`
`31`		`- "strings"`
`32`	`33`
`33`	`34`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`34`	`35`	`)`
`@@ -199,7 +200,7 @@ func GetAtomBaseURLHost() string {`
`199`	`200`	`return baseURLHost`
`200`	`201`	`}`
`201`	`202`
`202`		`-func (r *Atom) GetURI() (URI string) {`
	`203`	`+func (r *Atom) GetURI() (uri string) {`
`203`	`204`	`datasetOwner := "unknown"`
`204`	`205`	`if v, ok := r.ObjectMeta.Labels["dataset-owner"]; ok {`
`205`	`206`	`datasetOwner = v`
`@@ -208,14 +209,14 @@ func (r *Atom) GetURI() (URI string) {`
`208`	`209`	`if v, ok := r.ObjectMeta.Labels["dataset"]; ok {`
`209`	`210`	`dataset = v`
`210`	`211`	`}`
`211`		`- URI = fmt.Sprintf("%s/%s", datasetOwner, dataset)`
	`212`	`+ uri = fmt.Sprintf("%s/%s", datasetOwner, dataset)`
`212`	`213`
`213`	`214`	`if v, ok := r.ObjectMeta.Labels["theme"]; ok {`
`214`		`- URI += fmt.Sprintf("/%s", v)`
	`215`	`+ uri += "/" + v`
`215`	`216`	`}`
`216`		`- URI += "/atom"`
	`217`	`+ uri += "/atom"`
`217`	`218`	`if v, ok := r.ObjectMeta.Labels["service-version"]; ok {`
`218`		`- URI += fmt.Sprintf("/%s", v)`
	`219`	`+ uri += "/" + v`
`219`	`220`	`}`
`220`	`221`	`return`
`221`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func init() {`
`68`	`68`	`// +kubebuilder:scaffold:scheme`
`69`	`69`	`}`
`70`	`70`
`71`		`-// nolint:gocyclo`
	`71`	`+//nolint:gocyclo`
`72`	`72`	`func main() {`
`73`	`73`	`var metricsAddr string`
`74`	`74`	`var metricsCertPath, metricsCertName, metricsCertKey string`
`@@ -235,15 +235,15 @@ func main() {`
`235`	`235`	`os.Exit(1)`
`236`	`236`	`}`
`237`	`237`
`238`		`- // nolint:goconst`
	`238`	`+ //nolint:goconst`
`239`	`239`	`if os.Getenv("ENABLE_WEBHOOKS") != "false" {`
`240`	`240`	`if err = webhookpdoknlv2beta1.SetupAtomWebhookWithManager(mgr); err != nil {`
`241`	`241`	`setupLog.Error(err, "unable to create webhook", "webhook", "Atom")`
`242`	`242`	`os.Exit(1)`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`
`246`		`- // nolint:goconst`
	`246`	`+ //nolint:goconst`
`247`	`247`	`if os.Getenv("ENABLE_WEBHOOKS") != "false" {`
`248`	`248`	`if err = webhookpdoknlv3.SetupAtomWebhookWithManager(mgr); err != nil {`
`249`	`249`	`setupLog.Error(err, "unable to create webhook", "webhook", "Atom")`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`package atom_generator`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "fmt"`
	`4`	`+ "errors"`
	`5`	`+ "strings"`
	`6`	`+ "time"`
	`7`	`+`
`5`	`8`	`"github.com/cbroglie/mustache"`
`6`	`9`	`atom_feed "github.com/pdok/atom-generator/feeds"`
`7`	`10`	`pdoknlv3 "github.com/pdok/atom-operator/api/v3"`
`8`	`11`	`v1 "github.com/pdok/smooth-operator/api/v1"`
`9`		`- "strings"`
`10`		`- "time"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`func MapAtomV3ToAtomGeneratorConfig(atom pdoknlv3.Atom, ownerInfo v1.OwnerInfo) (atomGeneratorConfig atom_feed.Feeds, err error) {`
`@@ -65,7 +66,7 @@ func MapAtomV3ToAtomGeneratorConfig(atom pdoknlv3.Atom, ownerInfo v1.OwnerInfo)`
`65`	`66`
`66`	`67`	`func getLatestUpdate(feeds []pdoknlv3.DatasetFeed) (string, error) {`
`67`	`68`	`if len(feeds) == 0 {`
`68`		`- return "", fmt.Errorf("Atom heeft geen dataset feeds.")`
	`69`	`+ return "", errors.New("Atom heeft geen dataset feeds.")`
`69`	`70`	`}`
`70`	`71`	`updateTime := feeds[0].Entries[0].Updated`
`71`	`72`	`for _, datasetFeed := range feeds {`
`@@ -190,7 +191,7 @@ func getCSWDescribedbyLink(atom pdoknlv3.Atom, language string, ownerInfo v1.Own`
`190`	`191`	`}, nil`
`191`	`192`	`}`
`192`	`193`	`}`
`193`		`- return atom_feed.Link{}, fmt.Errorf("OwnerInfo heeft geen CSW template")`
	`194`	`+ return atom_feed.Link{}, errors.New("OwnerInfo heeft geen CSW template")`
`194`	`195`	`}`
`195`	`196`
`196`	`197`	`func getSearchLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerInfo) (atom_feed.Link, error) {`
`@@ -209,7 +210,7 @@ func getSearchLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerInfo)`
`209`	`210`	`}, nil`
`210`	`211`	`}`
`211`	`212`	`}`
`212`		`- return atom_feed.Link{}, fmt.Errorf("OwnerInfo heeft geen opensearch template")`
	`213`	`+ return atom_feed.Link{}, errors.New("OwnerInfo heeft geen opensearch template")`
`213`	`214`	`}`
`214`	`215`
`215`	`216`	`func getHTMLRelatedLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerInfo) (atom_feed.Link, error) {`
`@@ -227,5 +228,5 @@ func getHTMLRelatedLink(atom pdoknlv3.Atom, language string, ownerInfo v1.OwnerI`
`227`	`228`	`}, nil`
`228`	`229`	`}`
`229`	`230`	`}`
`230`		`- return atom_feed.Link{}, fmt.Errorf("OwnerInfo heeft geen html template")`
	`231`	`+ return atom_feed.Link{}, errors.New("OwnerInfo heeft geen html template")`
`231`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,9 @@ import (`
`31`	`31`	`pdoknlv2beta1 "github.com/pdok/atom-operator/api/v2beta1"`
`32`	`32`	`)`
`33`	`33`
`34`		`-// nolint:unused`
`35`	`34`	`// log is for logging in this package.`
	`35`	`+//`
	`36`	`+//nolint:unused`
`36`	`37`	`var atomlog = logf.Log.WithName("atom-resource")`
`37`	`38`
`38`	`39`	`// SetupAtomWebhookWithManager registers the webhook for Atom in the manager.`