Run modernize (#21546)

`go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...` executed.

`go generate ./...` ran afterwards to keep generated.

internal/bucket/bandwidth/monitor.go

@@ -21,6 +21,7 @@ package bandwidth
 
 import (
 	"context"
+	"slices"
 	"sync"
 	"time"
 
@@ -83,12 +84,7 @@ func SelectBuckets(buckets ...string) SelectionFunction {
 		}
 	}
 	return func(bucket string) bool {
-		for _, bkt := range buckets {
-			if bkt == bucket {
-				return true
-			}
-		}
-		return false
+		return slices.Contains(buckets, bucket)
 	}
 }
 

internal/bucket/bandwidth/monitor_test.go

@@ -99,7 +99,6 @@ func TestMonitor_GetReport(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			thr := bucketThrottle{

internal/bucket/lifecycle/error.go

@@ -29,7 +29,7 @@ type Error struct {
 
 // Errorf - formats according to a format specifier and returns
 // the string as a value that satisfies error of type tagging.Error
-func Errorf(format string, a ...interface{}) error {
+func Errorf(format string, a ...any) error {
 	return Error{err: fmt.Errorf(format, a...)}
 }
 

internal/bucket/lifecycle/lifecycle_test.go

@@ -738,7 +738,6 @@ func TestEval(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run("", func(t *testing.T) {
 			lc, err := ParseLifecycleConfig(bytes.NewReader([]byte(tc.inputConfig)))
 			if err != nil {
@@ -823,7 +822,6 @@ func TestHasActiveRules(t *testing.T) {
 	}
 
 	for i, tc := range testCases {
-		tc := tc
 		t.Run(fmt.Sprintf("Test_%d", i+1), func(t *testing.T) {
 			lc, err := ParseLifecycleConfig(bytes.NewReader([]byte(tc.inputConfig)))
 			if err != nil {

internal/bucket/object/lock/lock.go

@@ -24,6 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"net/http"
 	"net/textproto"
 	"strings"
@@ -601,9 +602,7 @@ func FilterObjectLockMetadata(metadata map[string]string, filterRetention, filte
 		}
 		if !copied {
 			dst = make(map[string]string, len(metadata))
-			for k, v := range metadata {
-				dst[k] = v
-			}
+			maps.Copy(dst, metadata)
 			copied = true
 		}
 		delete(dst, key)

internal/bucket/object/lock/lock_test.go

@@ -174,7 +174,6 @@ func TestParseObjectLockConfig(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run("", func(t *testing.T) {
 			_, err := ParseObjectLockConfig(strings.NewReader(tt.value))
 			//nolint:gocritic
@@ -219,7 +218,6 @@ func TestParseObjectRetention(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run("", func(t *testing.T) {
 			_, err := ParseObjectRetention(strings.NewReader(tt.value))
 			//nolint:gocritic

internal/bucket/replication/error.go

@@ -29,7 +29,7 @@ type Error struct {
 
 // Errorf - formats according to a format specifier and returns
 // the string as a value that satisfies error of type tagging.Error
-func Errorf(format string, a ...interface{}) error {
+func Errorf(format string, a ...any) error {
 	return Error{err: fmt.Errorf(format, a...)}
 }
 

internal/bucket/replication/replication_test.go

@@ -296,7 +296,6 @@ func TestReplicate(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		testCase := testCase
 		t.Run(testCase.opts.Name, func(t *testing.T) {
 			result := testCase.c.Replicate(testCase.opts)
 			if result != testCase.expectedResult {
@@ -352,7 +351,6 @@ func TestHasActiveRules(t *testing.T) {
 	}
 
 	for i, tc := range testCases {
-		tc := tc
 		t.Run(fmt.Sprintf("Test_%d", i+1), func(t *testing.T) {
 			cfg, err := ParseConfig(bytes.NewReader([]byte(tc.inputConfig)))
 			if err != nil {
@@ -402,7 +400,6 @@ func TestFilterActionableRules(t *testing.T) {
 		},
 	}
 	for _, tc := range testCases {
-		tc := tc
 		cfg, err := ParseConfig(bytes.NewReader([]byte(tc.inputConfig)))
 		if err != nil {
 			t.Fatalf("Got unexpected error: %v", err)

internal/bucket/replication/rule.go

@@ -139,7 +139,7 @@ type Rule struct {
 	Destination               Destination               `xml:"Destination" json:"Destination"`
 	SourceSelectionCriteria   SourceSelectionCriteria   `xml:"SourceSelectionCriteria" json:"SourceSelectionCriteria"`
 	Filter                    Filter                    `xml:"Filter" json:"Filter"`
-	ExistingObjectReplication ExistingObjectReplication `xml:"ExistingObjectReplication,omitempty" json:"ExistingObjectReplication,omitempty"`
+	ExistingObjectReplication ExistingObjectReplication `xml:"ExistingObjectReplication,omitempty" json:"ExistingObjectReplication"`
 }
 
 var (

internal/bucket/replication/rule_test.go

@@ -57,7 +57,6 @@ func TestMetadataReplicate(t *testing.T) {
 	}
 
 	for i, tc := range testCases {
-		tc := tc
 		t.Run(fmt.Sprintf("Test_%d", i+1), func(t *testing.T) {
 			cfg, err := ParseConfig(bytes.NewReader([]byte(tc.inputConfig)))
 			if err != nil {

internal/bucket/versioning/error.go

@@ -29,7 +29,7 @@ type Error struct {
 
 // Errorf - formats according to a format specifier and returns
 // the string as a value that satisfies error of type tagging.Error
-func Errorf(format string, a ...interface{}) error {
+func Errorf(format string, a ...any) error {
 	return Error{err: fmt.Errorf(format, a...)}
 }