refactor: use std errors following errorlint rules

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Author: mmorel-35

.golangci.yml

@@ -7,6 +7,7 @@ run:
 linters: 
   default: none
   enable:
+    - errorlint
     - ginkgolinter
     - govet
     - ineffassign
@@ -19,6 +20,14 @@ linters:
     govet:
       enable:
         - nilness
+    revive:
+      enable-all-rules: false
+      enable-default-rules: true
+      max-open-files: 2048
+      rules:
+        - name: errorf
+        - name: unnecessary-format
+        - name: use-errors-new
   exclusions:
     generated: lax
     presets:
@@ -30,32 +39,20 @@ linters:
       - linters:
           - revive
         text: stutters
-      - linters:
-          - revive
-        text: empty-block
-      - linters:
-          - revive
-        text: superfluous-else
-      - linters:
-          - revive
-        text: unused-parameter
       - linters:
           - revive
         text: redefines-builtin-id
-      - linters:
-          - revive
-        text: if-return
     paths:
       - .*\.pb\.go$
+    warn-unused: true
 
 formatters:
   enable:
     - gofmt
     - goimports
   exclusions:
     generated: lax
-    paths:
-      - .*\.pb\.go$
+    warn-unused: true
 
 issues:
   max-issues-per-linter: 0

agent/agent.go

@@ -3,6 +3,8 @@ package agent
 import (
 	"bytes"
 	"context"
+	"errors"
+	"fmt"
 	"math/rand"
 	"sync"
 	"time"
@@ -11,7 +13,6 @@ import (
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/log"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -464,7 +465,7 @@ func (a *Agent) handleSessionMessage(ctx context.Context, message *api.SessionMe
 		if !same {
 			a.keys = message.NetworkBootstrapKeys
 			if err := a.config.Executor.SetNetworkBootstrapKeys(a.keys); err != nil {
-				return errors.Wrap(err, "configuring network key failed")
+				return fmt.Errorf("configuring network key failed: %w", err)
 			}
 		}
 	}
@@ -514,7 +515,7 @@ func (a *Agent) UpdateTaskStatus(ctx context.Context, taskID string, status *api
 		go func() {
 			err := session.sendTaskStatus(ctx, taskID, status)
 			if err != nil {
-				if err == errTaskUnknown {
+				if errors.Is(err, errTaskUnknown) {
 					err = nil // dispatcher no longer cares about this task.
 				} else {
 					log.G(ctx).WithError(err).Error("closing session after fatal error")

agent/agent_test.go

@@ -96,9 +96,7 @@ func TestAgentStartStop(t *testing.T) {
 	assert.Equal(t, errAgentNotStarted, agent.Stop(ctx))
 	assert.NoError(t, agent.Start(ctx))
 
-	if err := agent.Start(ctx); err != errAgentStarted {
-		t.Fatalf("expected agent started error: %v", err)
-	}
+	require.ErrorIs(t, agent.Start(ctx), errAgentStarted, "expected agent started")
 
 	assert.NoError(t, agent.Stop(ctx))
 }

agent/config.go

@@ -1,11 +1,12 @@
 package agent
 
 import (
+	"errors"
+
 	"github.com/docker/go-events"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/connectionbroker"
-	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 	"google.golang.org/grpc/credentials"
 )

agent/csi/plugin/manager.go

@@ -2,6 +2,7 @@ package plugin
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 
@@ -57,7 +58,7 @@ func (pm *pluginManager) Get(name string) (NodePlugin, error) {
 
 	plugin, err := pm.getPlugin(name)
 	if err != nil {
-		return nil, fmt.Errorf("cannot get plugin %v: %v", name, err)
+		return nil, fmt.Errorf("cannot get plugin %v: %w", name, err)
 	}
 
 	return plugin, nil
@@ -110,7 +111,7 @@ func (pm *pluginManager) getPlugin(name string) (NodePlugin, error) {
 
 	pa, ok := pc.(plugin.AddrPlugin)
 	if !ok {
-		return nil, fmt.Errorf("plugin does not implement PluginAddr interface")
+		return nil, errors.New("plugin does not implement PluginAddr interface")
 	}
 
 	p := pm.newNodePluginFunc(name, pa, pm.secrets)

agent/csi/volumes.go

@@ -2,6 +2,7 @@ package csi
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"time"
@@ -131,7 +132,7 @@ func (r *volumes) Get(volumeID string) (string, error) {
 	if vs, ok := r.volumes[volumeID]; ok {
 		if vs.remove {
 			// TODO(dperny): use a structured error
-			return "", fmt.Errorf("volume being removed")
+			return "", errors.New("volume being removed")
 		}
 
 		if p, err := r.plugins.Get(vs.volume.Driver.Name); err == nil {

agent/exec/controller.go

@@ -2,14 +2,14 @@ package exec
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/api/equality"
 	"github.com/moby/swarmkit/v2/log"
 	"github.com/moby/swarmkit/v2/protobuf/ptypes"
-	"github.com/pkg/errors"
 )
 
 // Controller controls execution of a task.
@@ -197,7 +197,7 @@ func Do(ctx context.Context, task *api.Task, ctlr Controller) (*api.TaskStatus,
 			exitCode = ec.ExitCode()
 		}
 
-		if cause := errors.Cause(err); cause == context.DeadlineExceeded || cause == context.Canceled {
+		if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
 			return retry()
 		}
 
@@ -308,13 +308,13 @@ func Do(ctx context.Context, task *api.Task, ctlr Controller) (*api.TaskStatus,
 	// the following states may proceed past desired state.
 	switch status.State {
 	case api.TaskStatePreparing:
-		if err := ctlr.Prepare(ctx); err != nil && err != ErrTaskPrepared {
+		if err := ctlr.Prepare(ctx); err != nil && !errors.Is(err, ErrTaskPrepared) {
 			return fatal(err)
 		}
 
 		return transition(api.TaskStateReady, "prepared")
 	case api.TaskStateStarting:
-		if err := ctlr.Start(ctx); err != nil && err != ErrTaskStarted {
+		if err := ctlr.Start(ctx); err != nil && !errors.Is(err, ErrTaskStarted) {
 			return fatal(err)
 		}
 
@@ -355,6 +355,5 @@ func logStateChange(ctx context.Context, desired, previous, next api.TaskState)
 }
 
 func contextDoneError(err error) bool {
-	cause := errors.Cause(err)
-	return cause == context.Canceled || cause == context.DeadlineExceeded
+	return errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)
 }

agent/exec/errors.go

@@ -1,6 +1,6 @@
 package exec
 
-import "github.com/pkg/errors"
+import "errors"
 
 var (
 	// ErrRuntimeUnsupported encountered when a task requires a runtime
@@ -33,7 +33,7 @@ var (
 	// ErrDependencyNotReady is returned if a given dependency can be accessed
 	// through the Getter, but is not yet ready to be used. This is most
 	// relevant for Volumes, which must be staged and published on the node.
-	ErrDependencyNotReady error = errors.New("dependency not ready")
+	ErrDependencyNotReady = errors.New("dependency not ready")
 )
 
 // ExitCoder is implemented by errors that have an exit code.

agent/exec/errors_test.go

@@ -3,17 +3,15 @@ package exec
 import (
 	"fmt"
 	"testing"
-
-	"github.com/pkg/errors"
 )
 
 func TestIsTemporary(t *testing.T) {
 	err := fmt.Errorf("err")
 	err1 := MakeTemporary(fmt.Errorf("err1: %w", err))
 	err2 := fmt.Errorf("err2: %w", err1)
-	err3 := errors.Wrap(err2, "err3")
+	err3 := fmt.Errorf("err3: %w", err2)
 	err4 := fmt.Errorf("err4: %w", err3)
-	err5 := errors.Wrap(err4, "err5")
+	err5 := fmt.Errorf("err5: %w", err4)
 
 	if IsTemporary(nil) {
 		t.Error("expected error to not be a temporary error")

agent/task.go

@@ -2,6 +2,7 @@ package agent
 
 import (
 	"context"
+	"errors"
 	"sync"
 	"time"
 
@@ -160,20 +161,20 @@ func (tm *taskManager) run(ctx context.Context) {
 			default:
 			}
 
-			switch err {
-			case exec.ErrTaskNoop:
+			switch {
+			case errors.Is(err, exec.ErrTaskNoop):
 				if !updated {
 					continue // wait till getting pumped via update.
 				}
-			case exec.ErrTaskRetry:
+			case errors.Is(err, exec.ErrTaskRetry):
 				// TODO(stevvooe): Add exponential backoff with random jitter
 				// here. For now, this backoff is enough to keep the task
 				// manager from running away with the CPU.
 				time.AfterFunc(time.Second, func() {
 					errs <- nil // repump this branch, with no err
 				})
 				continue
-			case nil, context.Canceled, context.DeadlineExceeded:
+			case err == nil, errors.Is(err, context.Canceled), errors.Is(err, context.DeadlineExceeded):
 				// no log in this case
 			default:
 				log.G(ctx).WithError(err).Error("task operation failed")