modernize for loops

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/crd/known_types.go

@@ -17,6 +17,7 @@ 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 +157,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/deepcopy/traverse.go

@@ -447,8 +447,7 @@ func (c *copyMethodMaker) genSliceDeepCopy(actualName *namingInfo, sliceType *ty
 func (c *copyMethodMaker) genStructDeepCopy(_ *namingInfo, structType *types.Struct) {
 	c.Line("*out = *in")
 
-	for i := 0; i < structType.NumFields(); i++ {
-		field := structType.Field(i)
+	for field := range structType.Fields() {
 
 		// if we have a manual deepcopy, use that
 		hasDeepCopy, copyOnPtr := hasDeepCopyMethod(c.pkg, field.Type())
@@ -769,8 +768,7 @@ func fineToShallowCopy(typeInfo types.Type) bool {
 		return fineToShallowCopy(typeInfo.Underlying())
 	case *types.Struct:
 		// structs are fine to shallow-copy if they have all shallow-copyable fields
-		for i := 0; i < typeInfo.NumFields(); i++ {
-			field := typeInfo.Field(i)
+		for field := range typeInfo.Fields() {
 			if !fineToShallowCopy(field.Type()) {
 				return false
 			}

pkg/genall/help/pretty/print.go

@@ -291,7 +291,7 @@ func writePadding(out io.Writer, typ []byte, amt int) error {
 
 	num := amt / len(typ)
 	rem := amt % len(typ)
-	for i := 0; i < num; i++ {
+	for range num {
 		if _, err := out.Write(typ); err != nil {
 			return err
 		}

pkg/genall/options.go

@@ -18,6 +18,7 @@ package genall
 
 import (
 	"fmt"
+	"maps"
 	"strings"
 
 	"golang.org/x/tools/go/packages"
@@ -100,9 +101,7 @@ func FromOptionsWithConfig(cfg *packages.Config, optionsRegistry *markers.Regist
 	}
 
 	outRules := DirectoryPerGenerator("config", protoRt.GeneratorsByName)
-	for gen, rule := range protoRt.OutputRules.ByGenerator {
-		outRules.ByGenerator[gen] = rule
-	}
+	maps.Copy(outRules.ByGenerator, protoRt.OutputRules.ByGenerator)
 
 	genRuntime.OutputRules = outRules
 	return genRuntime, nil

pkg/markers/collect.go

@@ -36,11 +36,11 @@ type Collector struct {
 }
 
 // MarkerValues are all the values for some set of markers.
-type MarkerValues map[string][]interface{}
+type MarkerValues map[string][]any
 
 // Get fetches the first value that for the given marker, returning
 // nil if no values are available.
-func (v MarkerValues) Get(name string) interface{} {
+func (v MarkerValues) Get(name string) any {
 	vals := v[name]
 	if len(vals) == 0 {
 		return nil
@@ -109,7 +109,7 @@ func (c *Collector) parseMarkersInPackage(nodeMarkersRaw map[ast.Node][]markerCo
 		default:
 			target = DescribesType
 		}
-		markerVals := make(map[string][]interface{})
+		markerVals := make(map[string][]any)
 		for _, markerRaw := range markersRaw {
 			markerText := markerRaw.Text()
 			def := c.Registry.Lookup(markerText, target)

pkg/markers/parse.go

@@ -50,7 +50,7 @@ func peekNoSpace(scanner *sc.Scanner) rune {
 
 var (
 	// interfaceType is a pre-computed reflect.Type representing the empty interface.
-	interfaceType = reflect.TypeOf((*interface{})(nil)).Elem()
+	interfaceType = reflect.TypeOf((*any)(nil)).Elem()
 	rawArgsType   = reflect.TypeOf((*RawArguments)(nil)).Elem()
 )
 
@@ -183,13 +183,13 @@ func makeSliceType(itemType Argument) (reflect.Type, error) {
 	var itemReflectedType reflect.Type
 	switch itemType.Type {
 	case IntType:
-		itemReflectedType = reflect.TypeOf(int(0))
+		itemReflectedType = reflect.TypeFor[int]()
 	case NumberType:
-		itemReflectedType = reflect.TypeOf(float64(0))
+		itemReflectedType = reflect.TypeFor[float64]()
 	case StringType:
-		itemReflectedType = reflect.TypeOf("")
+		itemReflectedType = reflect.TypeFor[string]()
 	case BoolType:
-		itemReflectedType = reflect.TypeOf(false)
+		itemReflectedType = reflect.TypeFor[bool]()
 	case SliceType:
 		subItemType, err := makeSliceType(*itemType.ItemType)
 		if err != nil {

pkg/rbac/parser.go

@@ -24,6 +24,7 @@ package rbac
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 
@@ -308,11 +309,8 @@ func GenerateRoles(ctx *genall.GenerationContext, roleName string) ([]interface{
 
 		// Normalize rule verbs to "*" if any verb in the rule is an asterisk
 		for _, rule := range ruleMap {
-			for _, verb := range rule.Verbs {
-				if verb == "*" {
-					rule.Verbs = []string{"*"}
-					break
-				}
+			if slices.Contains(rule.Verbs, "*") {
+				rule.Verbs = []string{"*"}
 			}
 		}
 		var policyRules []rbacv1.PolicyRule

pkg/rbac/parser_integration_test.go

@@ -19,7 +19,7 @@ import (
 var _ = Describe("ClusterRole generated by the RBAC Generator", func() {
 	// run this test multiple times to make sure the Rule order is stable.
 	const stableTestCount = 5
-	for i := 0; i < stableTestCount; i++ {
+	for range stableTestCount {
 		It("should match the expected result", func() {
 			By("switching into testdata to appease go modules")
 			cwd, err := os.Getwd()