chore(ci): upgraded to go 1.22 (#3746)

Upgrades go to 1.22 and switches to new-style for loops

---------

Co-authored-by: Julio López <1953782+julio-lopez@users.noreply.github.com>

Makefile

@@ -268,6 +268,7 @@ dev-deps:
 	GO111MODULE=off go get -u github.com/sqs/goreturns
 
 test-with-coverage: export KOPIA_COVERAGE_TEST=1
+test-with-coverage: export GOEXPERIMENT=nocoverageredesign
 test-with-coverage: export TESTING_ACTION_EXE ?= $(TESTING_ACTION_EXE)
 test-with-coverage: $(gotestsum) $(TESTING_ACTION_EXE)
 	$(GO_TEST) $(UNIT_TEST_RACE_FLAGS) -tags testing -count=$(REPEAT_TEST) -short -covermode=atomic -coverprofile=coverage.txt --coverpkg $(COVERAGE_PACKAGES) -timeout $(UNIT_TESTS_TIMEOUT) ./...

cli/command_benchmark.go

@@ -57,11 +57,9 @@ func runInParallelNoResult[A any](args []A, run func(arg A)) {
 func runInParallel[A any, T any](args []A, run func(arg A) T) T {
 	var wg sync.WaitGroup
 
-	for i := 0; i < len(args)-1; i++ {
+	for _, arg := range args[1:] {
 		wg.Add(1)
 
-		arg := args[i]
-
 		go func() {
 			defer wg.Done()
 
@@ -70,7 +68,7 @@ func runInParallel[A any, T any](args []A, run func(arg A) T) T {
 	}
 
 	// run one on the main goroutine and N-1 in parallel.
-	v := run(args[len(args)-1])
+	v := run(args[0])
 
 	wg.Wait()
 
@@ -80,7 +78,7 @@ func runInParallel[A any, T any](args []A, run func(arg A) T) T {
 func makeOutputBuffers(n, capacity int) []*bytes.Buffer {
 	var res []*bytes.Buffer
 
-	for i := 0; i < n; i++ {
+	for range n {
 		res = append(res, bytes.NewBuffer(make([]byte, 0, capacity)))
 	}
 

cli/command_benchmark_compression.go

@@ -186,7 +186,7 @@ func (c *commandBenchmarkCompression) runCompression(ctx context.Context, data [
 				input          = bytes.NewReader(nil)
 			)
 
-			for i := 0; i < cnt; i++ {
+			for i := range cnt {
 				compressed.Reset()
 				input.Reset(data)
 
@@ -268,7 +268,7 @@ func (c *commandBenchmarkCompression) runDecompression(ctx context.Context, data
 		run := func(decompressed *bytes.Buffer) int64 {
 			input := bytes.NewReader(nil)
 
-			for i := 0; i < cnt; i++ {
+			for range cnt {
 				decompressed.Reset()
 				input.Reset(compressedInputBytes)
 

cli/command_benchmark_crypto.go

@@ -97,7 +97,7 @@ func (c *commandBenchmarkCrypto) runBenchmark(ctx context.Context) []cryptoBench
 				var encryptOutput gather.WriteBuffer
 				defer encryptOutput.Close()
 
-				for i := 0; i < hashCount; i++ {
+				for range hashCount {
 					contentID := hf(hashOutput[:0], input)
 
 					if encerr := enc.Encrypt(input, contentID, &encryptOutput); encerr != nil {

cli/command_benchmark_ecc.go

@@ -70,7 +70,7 @@ func (c *commandBenchmarkEcc) runBenchmark(ctx context.Context) []eccBenchResult
 	var results []eccBenchResult
 
 	data := make([]byte, c.blockSize)
-	for i := uint64(0); i < uint64(c.blockSize); i++ {
+	for i := range uint64(c.blockSize) {
 		data[i] = byte(i%255 + 1)
 	}
 
@@ -99,7 +99,7 @@ func (c *commandBenchmarkEcc) runBenchmark(ctx context.Context) []eccBenchResult
 				var tmp gather.WriteBuffer
 				defer tmp.Close()
 
-				for i := 0; i < repeat; i++ {
+				for range repeat {
 					if encerr := impl.Encrypt(input, nil, &tmp); encerr != nil {
 						log(ctx).Errorf("encoding failed: %v", encerr)
 						break
@@ -125,7 +125,7 @@ func (c *commandBenchmarkEcc) runBenchmark(ctx context.Context) []eccBenchResult
 				var tmp gather.WriteBuffer
 				defer tmp.Close()
 
-				for i := 0; i < repeat; i++ {
+				for range repeat {
 					if decerr := impl.Decrypt(input, nil, &tmp); decerr != nil {
 						log(ctx).Errorf("decoding failed: %v", decerr)
 						break

cli/command_benchmark_encryption.go

@@ -89,7 +89,7 @@ func (c *commandBenchmarkEncryption) runBenchmark(ctx context.Context) []cryptoB
 			var encryptOutput gather.WriteBuffer
 			defer encryptOutput.Close()
 
-			for i := 0; i < hashCount; i++ {
+			for range hashCount {
 				if encerr := enc.Encrypt(input, hashOutput[:32], &encryptOutput); encerr != nil {
 					log(ctx).Errorf("encryption failed: %v", encerr)
 					break

cli/command_benchmark_hashing.go

@@ -81,7 +81,7 @@ func (c *commandBenchmarkHashing) runBenchmark(ctx context.Context) []cryptoBenc
 		runInParallelNoInputNoResult(c.parallel, func() {
 			var hashOutput [hashing.MaxHashSize]byte
 
-			for i := 0; i < hashCount; i++ {
+			for range hashOutput {
 				hf(hashOutput[:0], input)
 			}
 		})

cli/command_benchmark_splitters.go

@@ -66,7 +66,7 @@ func (c *commandBenchmarkSplitters) run(ctx context.Context) error { //nolint:fu
 
 	rnd := rand.New(rand.NewSource(c.randSeed)) //nolint:gosec
 
-	for i := 0; i < c.blockCount; i++ {
+	for range c.blockCount {
 		b := make([]byte, c.blockSize)
 		if _, err := rnd.Read(b); err != nil {
 			return errors.Wrap(err, "error generating random data")
@@ -85,10 +85,9 @@ func (c *commandBenchmarkSplitters) run(ctx context.Context) error { //nolint:fu
 
 			var segmentLengths []int
 
-			for _, data := range dataBlocks {
+			for _, d := range dataBlocks {
 				s := fact()
 
-				d := data
 				for len(d) > 0 {
 					n := s.NextSplitPoint(d)
 					if n < 0 {

cli/command_blob_stats.go

@@ -34,7 +34,7 @@ func (c *commandBlobStats) run(ctx context.Context, rep repo.DirectRepository) e
 
 	var sizeThresholds []int64
 
-	for i := 0; i < 8; i++ {
+	for range 8 {
 		sizeThresholds = append(sizeThresholds, sizeThreshold)
 		countMap[sizeThreshold] = 0
 		sizeThreshold *= 10

cli/command_cache_sync.go

@@ -27,7 +27,7 @@ func (c *commandCacheSync) run(ctx context.Context, rep repo.DirectRepositoryWri
 	ch := make(chan blob.ID, c.parallel)
 
 	// workers that will prefetch blobs.
-	for i := 0; i < c.parallel; i++ {
+	for range c.parallel {
 		eg.Go(func() error {
 			for blobID := range ch {
 				if err := rep.ContentManager().MetadataCache().PrefetchBlob(ctx, blobID); err != nil {

cli/command_content_stats.go

@@ -38,7 +38,7 @@ func (c *commandContentStats) run(ctx context.Context, rep repo.DirectRepository
 		sizeBuckets   []uint32
 	)
 
-	for i := 0; i < 8; i++ {
+	for range 8 {
 		sizeBuckets = append(sizeBuckets, sizeThreshold)
 		sizeThreshold *= 10
 	}

cli/command_index_inspect.go

@@ -91,7 +91,7 @@ func (c *commandIndexInspect) inspectAllBlobs(ctx context.Context, rep repo.Dire
 
 	var eg errgroup.Group
 
-	for i := 0; i < c.parallel; i++ {
+	for range c.parallel {
 		eg.Go(func() error {
 			for bm := range indexesCh {
 				if err := c.inspectSingleIndexBlob(ctx, rep, bm.BlobID, output); err != nil {

cli/command_index_recover.go

@@ -141,9 +141,7 @@ func (c *commandIndexRecover) recoverIndexesFromAllPacks(ctx context.Context, re
 	})
 
 	// N goroutines to recover from incoming blobs.
-	for i := 0; i < c.parallel; i++ {
-		worker := i
-
+	for worker := range c.parallel {
 		eg.Go(func() error {
 			cnt := 0
 

cli/command_policy_set_test.go

@@ -452,7 +452,6 @@ func TestSetSchedulingPolicyFromFlags(t *testing.T) {
 			expChangeCount: 0,
 		},
 	} {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			changeCount := 0
 

cli/command_repository_sync.go

@@ -229,9 +229,7 @@ func (c *commandRepositorySyncTo) runSyncBlobs(ctx context.Context, src blob.Rea
 
 	tt := timetrack.Start()
 
-	for i := 0; i < c.repositorySyncParallelism; i++ {
-		workerID := i
-
+	for workerID := range c.repositorySyncParallelism {
 		eg.Go(func() error {
 			for m := range copyCh {
 				log(ctx).Debugf("[%v] Copying %v (%v bytes)...\n", workerID, m.BlobID, m.Length)

cli/command_snapshot_fix_test.go

@@ -286,8 +286,6 @@ func TestSnapshotFix(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		tc := tc
-
 		t.Run(tc.name, func(t *testing.T) {
 			runner := testenv.NewInProcRunner(t)
 			env := testenv.NewCLITest(t, testenv.RepoFormatNotImportant, runner)
@@ -434,7 +432,7 @@ func mustWriteFileWithRepeatedData(t *testing.T, fname string, repeat int, data
 
 	defer f.Close()
 
-	for i := 0; i < repeat; i++ {
+	for range repeat {
 		_, err := f.Write(data)
 		require.NoError(t, err)
 	}

cli/password.go

@@ -94,7 +94,7 @@ func (c *App) getPasswordFromFlags(ctx context.Context, isCreate, allowPersisten
 
 // askPass presents a given prompt and asks the user for password.
 func askPass(out io.Writer, prompt string) (string, error) {
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		fmt.Fprint(out, prompt)
 
 		passBytes, err := term.ReadPassword(int(os.Stdin.Fd()))

fs/cachefs/cache_test.go

@@ -46,7 +46,7 @@ func (cs *cacheSource) setEntryCount(id string, cnt int) {
 
 	var fakeEntry fs.Entry
 
-	for i := 0; i < cnt; i++ {
+	for range cnt {
 		fakeEntries = append(fakeEntries, fakeEntry)
 	}
 

fs/ignorefs/ignorefs_test.go

@@ -496,7 +496,6 @@ var cases = []struct {
 
 func TestIgnoreFS(t *testing.T) {
 	for _, tc := range cases {
-		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			root := setupFilesystem(tc.skipDefaultFiles)
 			originalFiles := walkTree(t, root)

fs/localfs/local_fs_test.go

@@ -157,7 +157,7 @@ func TestIterateNonExistent(t *testing.T) {
 func testIterate(t *testing.T, nFiles int) {
 	tmp := testutil.TempDirectory(t)
 
-	for i := 0; i < nFiles; i++ {
+	for i := range nFiles {
 		assertNoError(t, os.WriteFile(filepath.Join(tmp, fmt.Sprintf("f%v", i)), []byte{1, 2, 3}, 0o777))
 	}
 

fs/localfs/localfs_benchmark_test.go

@@ -47,15 +47,15 @@ func benchmarkReadDirWithCount(b *testing.B, fileCount int) {
 
 	td := b.TempDir()
 
-	for i := 0; i < fileCount; i++ {
+	for range fileCount {
 		os.WriteFile(filepath.Join(td, uuid.NewString()), []byte{1, 2, 3, 4}, 0o644)
 	}
 
 	b.StartTimer()
 
 	ctx := context.Background()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		dir, _ := localfs.Directory(td)
 		fs.IterateEntries(ctx, dir, func(context.Context, fs.Entry) error {
 			return nil

go.mod

@@ -1,6 +1,6 @@
 module github.com/kopia/kopia
 
-go 1.21
+go 1.22
 
 require (
 	cloud.google.com/go/storage v1.40.0

internal/auth/authz_test.go

@@ -168,7 +168,6 @@ func verifyLegacyAuthorizer(ctx context.Context, t *testing.T, rep repo.Reposito
 	}
 
 	for _, tc := range cases {
-		tc := tc
 		t.Run(tc.usernameAtHost, func(t *testing.T) {
 			a := authorizer.Authorize(ctx, rep, tc.usernameAtHost)
 

internal/bigmap/bigmap_internal_test.go

@@ -67,7 +67,7 @@ func TestGrowingMap(t *testing.T) {
 	h := sha256.New()
 
 	// insert 20K hashes
-	for i := 0; i < 20000; i++ {
+	for i := range 20000 {
 		var keybuf, valbuf, valbuf2 [sha256.Size]byte
 
 		k := sha256Key(h, keybuf[:0], i)
@@ -110,7 +110,7 @@ func TestGrowingSet(t *testing.T) {
 	h := sha256.New()
 
 	// insert 20K hashes
-	for i := 0; i < 20000; i++ {
+	for i := range 20000 {
 		var keybuf [sha256.Size]byte
 
 		k := sha256Key(h, keybuf[:0], i)
@@ -175,7 +175,7 @@ func benchmarkInternalMap(b *testing.B, m *internalMap, someVal []byte) {
 		keyBuf [sha256.Size]byte
 	)
 
-	for i := 0; i < b.N; i++ {
+	for i := range b.N {
 		// generate key=sha256(i) without allocations.
 		h.Reset()
 		binary.LittleEndian.PutUint64(num[:], uint64(i))
@@ -187,8 +187,8 @@ func benchmarkInternalMap(b *testing.B, m *internalMap, someVal []byte) {
 
 	valBuf := make([]byte, 10)
 
-	for j := 0; j < 4; j++ {
-		for i := 0; i < b.N; i++ {
+	for range 4 {
+		for i := range b.N {
 			// generate key=sha256(i) without allocations.
 			h.Reset()
 			binary.LittleEndian.PutUint64(num[:], uint64(i))
@@ -223,7 +223,7 @@ func benchmarkSyncMap(b *testing.B, someVal []byte) {
 
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for i := range b.N {
 		// generate key=sha256(i) without allocations.
 		h.Reset()
 		binary.LittleEndian.PutUint64(num[:], uint64(i))
@@ -233,8 +233,8 @@ func benchmarkSyncMap(b *testing.B, someVal []byte) {
 		m.Store(string(key), append([]byte{}, someVal...))
 	}
 
-	for j := 0; j < 4; j++ {
-		for i := 0; i < b.N; i++ {
+	for range 4 {
+		for i := range b.N {
 			// generate key=sha256(i) without allocations.
 			h.Reset()
 			binary.LittleEndian.PutUint64(num[:], uint64(i))

internal/bigmap/bigmap_map_test.go

@@ -28,7 +28,7 @@ func TestGrowingMap(t *testing.T) {
 	h := sha256.New()
 
 	// insert 20K hashes
-	for i := 0; i < 20000; i++ {
+	for i := range 20000 {
 		var keybuf, valbuf, valbuf2 [sha256.Size]byte
 
 		k := sha256Key(h, keybuf[:0], i)
@@ -102,7 +102,7 @@ func benchmarkMap(b *testing.B, m *bigmap.Map, someVal []byte) {
 		keyBuf [sha256.Size]byte
 	)
 
-	for i := 0; i < b.N; i++ {
+	for i := range b.N {
 		// generate key=sha256(i) without allocations.
 		h.Reset()
 		binary.LittleEndian.PutUint64(num[:], uint64(i))
@@ -114,8 +114,8 @@ func benchmarkMap(b *testing.B, m *bigmap.Map, someVal []byte) {
 
 	valBuf := make([]byte, 10)
 
-	for j := 0; j < 4; j++ {
-		for i := 0; i < b.N; i++ {
+	for range 4 {
+		for i := range b.N {
 			// generate key=sha256(i) without allocations.
 			h.Reset()
 			binary.LittleEndian.PutUint64(num[:], uint64(i))