🌱 use modernize linter

Author: HaraldNordgren

.github/workflows/golangci-lint.yml

@@ -33,6 +33,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # tag=v8.0.0
         with:
-          version: v2.5.0
+          version: v2.6.0
           args: --output.text.print-linter-name=true --output.text.colors=true --timeout 10m
           working-directory: ${{matrix.working-directory}}

.golangci.yml

@@ -32,6 +32,7 @@ linters:
     - iotamixing
     - makezero
     - misspell
+    - modernize
     - nakedret
     - nilerr
     - nolintlint

pkg/applyconfiguration/applyconfiguration_integration_test.go

@@ -193,6 +193,9 @@ var _ = Describe("ApplyConfiguration generation from API types", func() {
 			// Make sure the import paths are correct for the newly generated content.
 			content = []byte(strings.ReplaceAll(string(content), "testdata/cronjob/api/v1/applyconfiguration", filepath.Join("testdata/cronjob/api/v1", outputPackage)))
 
+			// Make sure the interface{} is replaced with any.
+			content = []byte(strings.ReplaceAll(string(content), "any", "interface{}"))
+
 			Expect(string(filesInOutput[name])).To(BeComparableTo(string(content)), "Generated files should match the checked in files, diff found in %s", name)
 		}
 	},

pkg/applyconfiguration/testdata/cronjob/api/v1/applyconfiguration/utils.go

@@ -26,6 +26,7 @@ import (
 	"encoding"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"net/url"
 	"strconv"
 	"time"
@@ -412,8 +413,8 @@ type ContainsNestedMap struct {
 // +kubebuilder:validation:Type=object
 // +kubebuilder:pruning:PreserveUnknownFields
 type Preserved struct {
-	ConcreteField string                 `json:"concreteField"`
-	Rest          map[string]interface{} `json:"-"`
+	ConcreteField string         `json:"concreteField"`
+	Rest          map[string]any `json:"-"`
 }
 
 func (p *Preserved) UnmarshalJSON(data []byte) error {
@@ -434,10 +435,8 @@ func (p *Preserved) UnmarshalJSON(data []byte) error {
 }
 
 func (p *Preserved) MarshalJSON() ([]byte, error) {
-	full := make(map[string]interface{}, len(p.Rest)+1)
-	for k, v := range p.Rest {
-		full[k] = v
-	}
+	full := make(map[string]any, len(p.Rest)+1)
+	maps.Copy(full, p.Rest)
 	full["concreteField"] = p.ConcreteField
 	return json.Marshal(full)
 }

pkg/applyconfiguration/testdata/cronjob/api/v1/cronjob_types.go

@@ -38,7 +38,7 @@ type ErrorRecorder interface {
 
 // isOrNil checks if val is nil if val is of a nillable type, otherwise,
 // it compares val to valInt (which should probably be the zero value).
-func isOrNil(val reflect.Value, valInt interface{}, zeroInt interface{}) bool {
+func isOrNil(val reflect.Value, valInt any, zeroInt any) bool {
 	switch valKind := val.Kind(); valKind {
 	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
 		return val.IsNil()

pkg/crd/flatten.go

@@ -108,15 +108,15 @@ func (Generator) RegisterMarkers(into *markers.Registry) error {
 }
 
 // transformRemoveCRDStatus ensures we do not write the CRD status field.
-func transformRemoveCRDStatus(obj map[string]interface{}) error {
+func transformRemoveCRDStatus(obj map[string]any) error {
 	delete(obj, "status")
 	return nil
 }
 
 // transformPreserveUnknownFields adds spec.preserveUnknownFields=value.
-func transformPreserveUnknownFields(value bool) func(map[string]interface{}) error {
-	return func(obj map[string]interface{}) error {
-		if spec, ok := obj["spec"].(map[interface{}]interface{}); ok {
+func transformPreserveUnknownFields(value bool) func(map[string]any) error {
+	return func(obj map[string]any) error {
+		if spec, ok := obj["spec"].(map[any]any); ok {
 			spec["preserveUnknownFields"] = value
 		}
 		return nil
@@ -185,7 +185,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 		// Prevent the top level metadata for the CRD to be generate regardless of the intention in the arguments
 		FixTopLevelMetadata(crdRaw)
 
-		versionedCRDs := make([]interface{}, len(crdVersions))
+		versionedCRDs := make([]any, len(crdVersions))
 		for i, ver := range crdVersions {
 			conv, err := AsVersion(crdRaw, schema.GroupVersion{Group: apiext.SchemeGroupVersion.Group, Version: ver})
 			if err != nil {
@@ -202,7 +202,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 			} else {
 				fileName = fmt.Sprintf("%s_%s.%s.yaml", crdRaw.Spec.Group, crdRaw.Spec.Names.Plural, crdVersions[i])
 			}
-			if err := ctx.WriteYAML(fileName, headerText, []interface{}{crd}, yamlOpts...); err != nil {
+			if err := ctx.WriteYAML(fileName, headerText, []any{crd}, yamlOpts...); err != nil {
 				return err
 			}
 		}

pkg/crd/gen.go

@@ -17,6 +17,8 @@ limitations under the License.
 package crd
 
 import (
+	"maps"
+
 	apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-tools/pkg/loader"
@@ -156,13 +158,9 @@ func AddKnownTypes(parser *Parser) {
 	// ensure everything is there before adding to PackageOverrides
 	// TODO(directxman12): this is a bit of a hack, maybe just use constructors?
 	parser.init()
-	for pkgName, override := range KnownPackages {
-		parser.PackageOverrides[pkgName] = override
-	}
+	maps.Copy(parser.PackageOverrides, KnownPackages)
 	// if we want to generate the embedded ObjectMeta in the CRD we need to add the ObjectMetaPackages
 	if parser.GenerateEmbeddedObjectMeta {
-		for pkgName, override := range ObjectMetaPackages {
-			parser.PackageOverrides[pkgName] = override
-		}
+		maps.Copy(parser.PackageOverrides, ObjectMetaPackages)
 	}
 }

pkg/crd/known_types.go

@@ -79,7 +79,7 @@ type hasHelp interface {
 
 // mustMakeAllWithPrefix converts each object into a marker definition using
 // the object's type's with the prefix to form the marker name.
-func mustMakeAllWithPrefix(prefix string, target markers.TargetType, objs ...interface{}) []*definitionWithHelp {
+func mustMakeAllWithPrefix(prefix string, target markers.TargetType, objs ...any) []*definitionWithHelp {
 	defs := make([]*definitionWithHelp, len(objs))
 	for i, obj := range objs {
 		name := prefix + reflect.TypeOf(obj).Name()

pkg/crd/markers/register.go

@@ -233,7 +233,7 @@ type MinProperties int
 
 // Enum specifies that this (scalar) field is restricted to the *exact* values specified here.
 // +controllertools:marker:generateHelp:category="CRD validation"
-type Enum []interface{}
+type Enum []any
 
 // Format specifies additional "complex" formatting for this field.
 //
@@ -265,7 +265,7 @@ type Nullable struct{}
 // submission of the containing CRD to an apiserver.
 // +controllertools:marker:generateHelp:category="CRD validation"
 type Default struct {
-	Value interface{}
+	Value any
 }
 
 // Title sets the title for this field.
@@ -276,7 +276,7 @@ type Default struct {
 // important context about what the schema represents.
 // +controllertools:marker:generateHelp:category="CRD validation"
 type Title struct {
-	Value interface{}
+	Value any
 }
 
 // KubernetesDefault sets the default value for this field.
@@ -290,7 +290,7 @@ type Title struct {
 // submission of the containing CRD to an apiserver.
 // +controllertools:marker:generateHelp:category="CRD validation"
 type KubernetesDefault struct {
-	Value interface{}
+	Value any
 }
 
 // Example sets the example value for this field.
@@ -303,7 +303,7 @@ type KubernetesDefault struct {
 // submission of the containing CRD to an apiserver.
 // +controllertools:marker:generateHelp:category="CRD validation"
 type Example struct {
-	Value interface{}
+	Value any
 }
 
 // XPreserveUnknownFields stops the apiserver from pruning fields which are not specified.