Merge pull request #3584 from tonistiigi/go1.25-lint

update linters for go1.25 base version

Author: crazy-max

.golangci.yml

@@ -87,6 +87,9 @@ linters:
       - linters:
           - revive
         text: stutters
+      - linters:
+          - revive
+        text: var-naming
       - linters:
           - revive
         text: empty-block

bake/hclparser/gohcl/schema.go

@@ -140,11 +140,11 @@ func getFieldTags(ty reflect.Type) *fieldTags {
 			continue
 		}
 
-		comma := strings.Index(tag, ",")
+		before, after, ok := strings.Cut(tag, ",")
 		var name, kind string
-		if comma != -1 {
-			name = tag[:comma]
-			kind = tag[comma+1:]
+		if ok {
+			name = before
+			kind = after
 		} else {
 			name = tag
 			kind = "attr"

bake/hclparser/gohcl/types.go

@@ -9,11 +9,8 @@ import (
 	"github.com/hashicorp/hcl/v2"
 )
 
-var victimExpr hcl.Expression
-var victimBody hcl.Body
-
-var exprType = reflect.TypeOf(&victimExpr).Elem()
-var bodyType = reflect.TypeOf(&victimBody).Elem()
-var blockType = reflect.TypeOf((*hcl.Block)(nil)) //nolint:unused
-var attrType = reflect.TypeOf((*hcl.Attribute)(nil))
-var attrsType = reflect.TypeOf(hcl.Attributes(nil))
+var exprType = reflect.TypeFor[hcl.Expression]()
+var bodyType = reflect.TypeFor[hcl.Body]()
+var blockType = reflect.TypeFor[*hcl.Block]() //nolint:unused
+var attrType = reflect.TypeFor[*hcl.Attribute]()
+var attrsType = reflect.TypeFor[hcl.Attributes]()

bake/hclparser/stdlib_test.go

@@ -34,7 +34,6 @@ func TestIndexOf(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			got, err := indexOfFunc().Call([]cty.Value{test.input, test.key})
 			if test.wantErr {
@@ -85,7 +84,6 @@ func TestBasename(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			got, err := basenameFunc().Call([]cty.Value{test.input})
 			if test.wantErr {
@@ -136,7 +134,6 @@ func TestDirname(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			got, err := dirnameFunc().Call([]cty.Value{test.input})
 			if test.wantErr {
@@ -190,7 +187,6 @@ func TestSanitize(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			got, err := sanitizeFunc().Call([]cty.Value{test.input})
 			require.NoError(t, err)
@@ -251,7 +247,6 @@ func TestSemverCmp(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			got, err := semvercmpFunc().Call([]cty.Value{test.version, test.constraint})
 			if test.wantErr {

bake/hclparser/type_implied.go

@@ -133,8 +133,8 @@ func impliedStructType(rt reflect.Type, path cty.Path) (cty.Type, error) {
 }
 
 var (
-	valueType  = reflect.TypeOf(cty.Value{})
-	stringType = reflect.TypeOf("")
+	valueType  = reflect.TypeFor[cty.Value]()
+	stringType = reflect.TypeFor[string]()
 )
 
 // structTagIndices interrogates the fields of the given type (which must

build/build.go

@@ -395,7 +395,6 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opts map[
 			var insecurePush bool
 
 			for i, dp := range dps {
-				i, dp := i, dp
 				node := dp.Node()
 				so := reqForNodes[k][i].so
 				if multiDriver {

build/resolver/driver.go

@@ -131,7 +131,6 @@ func (r *nodeResolver) Resolve(ctx context.Context, optPlatforms map[string][]oc
 		eg, egCtx := errgroup.WithContext(ctx)
 		workers := make([][]ocispecs.Platform, len(clients))
 		for i, c := range clients {
-			i, c := i, c
 			if c == nil {
 				continue
 			}
@@ -269,7 +268,6 @@ func (r *nodeResolver) boot(ctx context.Context, idxs []int, pw progress.Writer)
 	eg, ctx := errgroup.WithContext(ctx)
 
 	for i, idx := range idxs {
-		i, idx := i, idx
 		eg.Go(func() error {
 			c, err := r.clients.g.Do(ctx, fmt.Sprint(idx), func(ctx context.Context) (*client.Client, error) {
 				if r.nodes[idx].Driver == nil {

commands/dap.go

@@ -102,7 +102,8 @@ func dapAttachCmd() *cobra.Command {
 				return err
 			}
 
-			conn, err := net.Dial("unix", args[0])
+			dialer := net.Dialer{}
+			conn, err := dialer.DialContext(cmd.Context(), "unix", args[0])
 			if err != nil {
 				return err
 			}

commands/history/trace.go

@@ -156,7 +156,8 @@ func runTrace(ctx context.Context, dockerCli command.Cli, opts traceOptions) err
 		return nil
 	}
 
-	ln, err := net.Listen("tcp", opts.addr)
+	lc := net.ListenConfig{}
+	ln, err := lc.Listen(ctx, "tcp", opts.addr)
 	if err != nil {
 		return err
 	}

commands/history/utils.go

@@ -425,8 +425,8 @@ func timeBasedFilter(key, value, sep string) (matchFunc, error) {
 
 func cutAny(s string, seps ...string) (before, after, sep string, found bool) {
 	for _, sep := range seps {
-		if idx := strings.Index(s, sep); idx != -1 {
-			return s[:idx], s[idx+len(sep):], sep, true
+		if before0, after0, ok := strings.Cut(s, sep); ok {
+			return before0, after0, sep, true
 		}
 	}
 	return s, "", "", false