make fix-golangci-lint

Signed-off-by: Erik Godding Boye <[email protected]>

Author: erikgb

.golangci.yaml

@@ -11,6 +11,10 @@ linters:
     paths: [third_party, builtin$, examples$]
     warn-unused: true
   settings:
+    modernize:
+      disable:
+        # TODO(erikgb): Consider if the omitzero linter makes sense in this project
+        - omitzero
     staticcheck:
       checks: ["all", "-ST1000", "-ST1001", "-ST1003", "-ST1005", "-ST1012", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-QF1001", "-QF1003", "-QF1008"]
   enable:

internal/versionchecker/test/getpodfromtemplate_test.go

@@ -18,6 +18,7 @@ package versionchecker
 
 import (
 	"fmt"
+	"maps"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -63,9 +64,7 @@ func getPodFromTemplate(template *v1.PodTemplateSpec, parentObject runtime.Objec
 
 func getPodsLabelSet(template *v1.PodTemplateSpec) labels.Set {
 	desiredLabels := make(labels.Set)
-	for k, v := range template.Labels {
-		desiredLabels[k] = v
-	}
+	maps.Copy(desiredLabels, template.Labels)
 	return desiredLabels
 }
 
@@ -77,9 +76,7 @@ func getPodsFinalizers(template *v1.PodTemplateSpec) []string {
 
 func getPodsAnnotationSet(template *v1.PodTemplateSpec) labels.Set {
 	desiredAnnotations := make(labels.Set)
-	for k, v := range template.Annotations {
-		desiredAnnotations[k] = v
-	}
+	maps.Copy(desiredAnnotations, template.Annotations)
 	return desiredAnnotations
 }
 

internal/versionchecker/test/testdata/fetch.go

@@ -203,9 +203,9 @@ func (inv *Inventory) read(manifestsPath string) error {
 	// Split the rest of the file into the manifests
 	manfestsBytes = fileSplit[1]
 
-	manifests := bytes.Split(manfestsBytes, []byte("---\n# [CHK_VERSIONS]: "))
+	manifests := bytes.SplitSeq(manfestsBytes, []byte("---\n# [CHK_VERSIONS]: "))
 
-	for _, manifest := range manifests {
+	for manifest := range manifests {
 		if len(manifest) == 0 {
 			continue
 		}
@@ -232,8 +232,8 @@ func (inv *Inventory) read(manifestsPath string) error {
 		manifestHash := hex.EncodeToString(manifestHasher.Sum([]byte{}))
 
 		// Split the versions
-		versionsSplit := strings.Split(versions, ",")
-		for _, version := range versionsSplit {
+		versionsSplit := strings.SplitSeq(versions, ",")
+		for version := range versionsSplit {
 			version = strings.TrimSpace(version)
 			version = semver.Canonical(version)
 
@@ -385,7 +385,7 @@ func cleanupManifests(manifests []byte, version string) ([]byte, error) {
 
 	decoder := yaml.NewDecoder(bytes.NewBuffer(manifests))
 	for {
-		var manifest map[string]interface{}
+		var manifest map[string]any
 
 		err := decoder.Decode(&manifest)
 		if errors.Is(err, io.EOF) {
@@ -407,10 +407,10 @@ func cleanupManifests(manifests []byte, version string) ([]byte, error) {
 		case "CustomResourceDefinition":
 			// remove all CRD schemas from yaml file
 			switch spec := manifest["spec"].(type) {
-			case map[string]interface{}:
-				spec["versions"] = []interface{}{}
-			case map[interface{}]interface{}:
-				spec["versions"] = []interface{}{}
+			case map[string]any:
+				spec["versions"] = []any{}
+			case map[any]any:
+				spec["versions"] = []any{}
 			}
 
 			// remove status from CRD

internal/versionchecker/test/versionchecker_test.go

@@ -70,7 +70,7 @@ func loadManifests(t *testing.T) []testManifest {
 	testManifestBytes = split[1]
 
 	var manifests []testManifest
-	for _, manifest := range bytes.Split(testManifestBytes, []byte("---\n# [CHK_VERSIONS]: ")) {
+	for manifest := range bytes.SplitSeq(testManifestBytes, []byte("---\n# [CHK_VERSIONS]: ")) {
 		if len(manifest) == 0 {
 			continue
 		}

pkg/convert/internal/apis/acme/fuzzer/fuzzer.go

@@ -26,8 +26,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for the apps api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
 		func(s *acme.Order, c randfill.Continue) {
 			c.FillNoCustom(s) // fuzz self without calling this function again
 

pkg/convert/internal/apis/certmanager/fuzzer/fuzzer.go

@@ -27,8 +27,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for the apps api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return append(acmefuzzer.Funcs(codecs), []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return append(acmefuzzer.Funcs(codecs), []any{
 		func(s *certmanager.Certificate, c randfill.Continue) {
 			c.FillNoCustom(s) // fuzz self without calling this function again
 

pkg/convert/internal/apis/meta/fuzzer/fuzzer.go

@@ -21,6 +21,6 @@ import (
 )
 
 // Funcs returns the fuzzer functions for the apps api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{}
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{}
 }

pkg/convert/scheme.go

@@ -46,13 +46,13 @@ var Scheme = func() *runtime.Scheme {
 	utilruntime.Must(metainternalversion.AddToScheme(scheme))
 
 	// Adds the conversion between internalmeta.List and corev1.List
-	_ = scheme.AddConversionFunc((*corev1.List)(nil), (*metainternalversion.List)(nil), func(a, b interface{}, scope conversion.Scope) error {
+	_ = scheme.AddConversionFunc((*corev1.List)(nil), (*metainternalversion.List)(nil), func(a, b any, scope conversion.Scope) error {
 		metaList := &metav1.List{}
 		metaList.Items = a.(*corev1.List).Items
 		return metainternalversion.Convert_v1_List_To_internalversion_List(metaList, b.(*metainternalversion.List), scope)
 	})
 
-	_ = scheme.AddConversionFunc((*metainternalversion.List)(nil), (*corev1.List)(nil), func(a, b interface{}, scope conversion.Scope) error {
+	_ = scheme.AddConversionFunc((*metainternalversion.List)(nil), (*corev1.List)(nil), func(a, b any, scope conversion.Scope) error {
 		metaList := &metav1.List{}
 		err := metainternalversion.Convert_internalversion_List_To_v1_List(a.(*metainternalversion.List), metaList, scope)
 		if err != nil {

pkg/install/helm/settings.go

@@ -116,7 +116,7 @@ func (n *NormalisedEnvSettings) InitActionConfiguration() error {
 		n.Factory.RESTClientGetter,
 		n.Factory.Namespace,
 		os.Getenv("HELM_DRIVER"),
-		func(format string, v ...interface{}) {
+		func(format string, v ...any) {
 			n.logger.Info(fmt.Sprintf(format, v...))
 		},
 	)

pkg/status/certificate/certificate.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	cmacme "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"
@@ -271,12 +272,12 @@ func StatusFromResources(data *Data) *CertificateStatus {
 
 // formatStringSlice takes in a string slice and formats the contents of the slice
 // into a single string where each element of the slice is prefixed with "- " and on a new line
-func formatStringSlice(strings []string) string {
-	result := ""
-	for _, str := range strings {
-		result += "- " + str + "\n"
+func formatStringSlice(strs []string) string {
+	var result strings.Builder
+	for _, str := range strs {
+		result.WriteString("- " + str + "\n")
 	}
-	return result
+	return result.String()
 }
 
 // formatTimeString returns the time as a string