Upgraded linter to v1.33.0 (kopia#734)

* linter: upgraded to 1.33, disabled some linters

* lint: fixed 'errorlint' errors

This ensures that all error comparisons use errors.Is() or errors.As().
We will be wrapping more errors going forward so it's important that
error checks are not strict everywhere.

Verified that there are no exceptions for errorlint linter which
guarantees that.

* lint: fixed or suppressed wrapcheck errors

* lint: nolintlint and misc cleanups

Co-authored-by: Julio López <[email protected]>

Author: jkowalski

.golangci.yml

@@ -44,6 +44,9 @@ linters:
     - whitespace
     - nlreturn
     - testpackage
+    - exhaustivestruct
+    - paralleltest
+    - tparallel
 
 run:
   skip-dirs:
@@ -52,22 +55,24 @@ run:
 issues:
   exclude-use-default: false
   exclude-rules:
-    - path: _test\.go|testing|test_env
+    - path: _test\.go|testing|tests|test_env|fshasher
       linters:
       - gomnd
       - gocognit
       - funlen
       - errcheck
       - gosec
       - nestif
-      - goerr113
+      - wrapcheck
     - text: "Magic number: 1e"
       linters:
       - gomnd
     - text: "unnecessaryDefer"
-      linters: gocritic
+      linters:
+      - gocritic
     - text: "filepathJoin"
-      linters: gocritic
+      linters:
+      - gocritic
     - text: "weak cryptographic primitive"
       linters:
         - gosec
@@ -86,9 +91,3 @@ issues:
     - path: cli
       linters:
       - gochecknoglobals
-
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
-service:
-  golangci-lint-version: 1.24.x # use the fixed version to not introduce new linters unexpectedly
-

cli/app.go

@@ -176,12 +176,14 @@ func maybeRunMaintenance(ctx context.Context, rep repo.Repository) error {
 		return nil
 	}
 
-	if _, ok := err.(maintenance.NotOwnedError); ok {
+	var noe maintenance.NotOwnedError
+
+	if errors.As(err, &noe) {
 		// do not report the NotOwnedError to the user since this is automatic maintenance.
 		return nil
 	}
 
-	return err
+	return errors.Wrap(err, "error running maintenance")
 }
 
 func advancedCommand(ctx context.Context) {

cli/command_benchmark_compression.go

@@ -7,6 +7,8 @@ import (
 	"io/ioutil"
 	"sort"
 
+	"github.com/pkg/errors"
+
 	"github.com/kopia/kopia/internal/clock"
 	"github.com/kopia/kopia/internal/units"
 	"github.com/kopia/kopia/repo"
@@ -36,7 +38,7 @@ func runBenchmarkCompressionAction(ctx context.Context, rep repo.Repository) err
 	if *benchmarkCompressionDataFile != "" {
 		d, err := ioutil.ReadFile(*benchmarkCompressionDataFile)
 		if err != nil {
-			return err
+			return errors.Wrap(err, "error reading compression data file")
 		}
 
 		data = d

cli/command_benchmark_splitters.go

@@ -6,6 +6,8 @@ import (
 	"sort"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/kopia/kopia/internal/clock"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/repo/splitter"
@@ -42,7 +44,7 @@ func runBenchmarkSplitterAction(ctx context.Context, rep repo.Repository) error
 	for i := 0; i < *benchmarkSplitterBlockCount; i++ {
 		b := make([]byte, *benchmarkSplitterBlockSize)
 		if _, err := rnd.Read(b); err != nil {
-			return err
+			return errors.Wrap(err, "error generating random data")
 		}
 
 		dataBlocks = append(dataBlocks, b)

cli/command_blob_gc.go

@@ -3,6 +3,8 @@ package cli
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/repo/blob"
 	"github.com/kopia/kopia/repo/maintenance"
@@ -28,14 +30,14 @@ func runBlobGarbageCollectCommand(ctx context.Context, rep *repo.DirectRepositor
 
 	n, err := maintenance.DeleteUnreferencedBlobs(ctx, rep, opts)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "error deleting unreferenced blobs")
 	}
 
 	if opts.DryRun && n > 0 {
 		log(ctx).Infof("Pass --delete=yes to delete.")
 	}
 
-	return err
+	return nil
 }
 
 func init() {

cli/command_blob_show.go

@@ -56,9 +56,11 @@ func maybeDecryptBlob(ctx context.Context, w io.Writer, rep *repo.DirectReposito
 		return errors.Wrapf(err, "error getting %v", blobID)
 	}
 
-	_, err = iocopy.Copy(w, bytes.NewReader(d))
+	if _, err := iocopy.Copy(w, bytes.NewReader(d)); err != nil {
+		return errors.Wrap(err, "error copying data")
+	}
 
-	return err
+	return nil
 }
 
 func canDecryptBlob(b blob.ID) bool {

cli/command_blob_stats.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/pkg/errors"
+
 	"github.com/kopia/kopia/internal/units"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/repo/blob"
@@ -49,7 +51,7 @@ func runBlobStatsCommand(ctx context.Context, rep *repo.DirectRepository) error
 			}
 			return nil
 		}); err != nil {
-		return err
+		return errors.Wrap(err, "error listing blobs")
 	}
 
 	sizeToString := units.BytesStringBase10

cli/command_cache_clear.go

@@ -25,11 +25,11 @@ func runCacheClearCommand(ctx context.Context, rep *repo.DirectRepository) error
 			return os.RemoveAll(d)
 		}, retry.Always)
 		if err != nil {
-			return err
+			return errors.Wrap(err, "error removing cache directory")
 		}
 
 		if err := os.MkdirAll(d, 0o700); err != nil {
-			return err
+			return errors.Wrap(err, "error creating cache directory")
 		}
 
 		log(ctx).Infof("Cache cleared.")

cli/command_content_rm.go

@@ -3,6 +3,8 @@ package cli
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
 	"github.com/kopia/kopia/repo"
 )
 
@@ -17,7 +19,7 @@ func runContentRemoveCommand(ctx context.Context, rep *repo.DirectRepository) er
 
 	for _, contentID := range toContentIDs(*contentRemoveIDs) {
 		if err := rep.Content.DeleteContent(ctx, contentID); err != nil {
-			return err
+			return errors.Wrapf(err, "error deleting content %v", contentID)
 		}
 	}
 

cli/command_content_show.go

@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"context"
 
+	"github.com/pkg/errors"
+
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/repo/content"
 )
@@ -27,7 +29,7 @@ func runContentShowCommand(ctx context.Context, rep *repo.DirectRepository) erro
 func contentShow(ctx context.Context, r *repo.DirectRepository, contentID content.ID) error {
 	data, err := r.Content.GetContent(ctx, contentID)
 	if err != nil {
-		return err
+		return errors.Wrapf(err, "error getting content %v", contentID)
 	}
 
 	return showContent(bytes.NewReader(data))