From 225149d2150ae73fdacc49aadc842c768aa3659c Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Tue, 28 Jul 2026 08:23:38 +0200 Subject: [PATCH] refactor: use std errors following errorlint rules Signed-off-by: Matthieu MOREL --- .golangci.yml | 25 +- agent/agent.go | 7 +- agent/agent_test.go | 4 +- agent/config.go | 3 +- agent/csi/plugin/manager.go | 5 +- agent/csi/volumes.go | 3 +- agent/exec/controller.go | 11 +- agent/exec/errors.go | 4 +- agent/exec/errors_test.go | 6 +- agent/task.go | 9 +- agent/worker.go | 7 +- agent/worker_test.go | 7 +- api/ca.pb.go | 17 +- api/control.pb.go | 173 +++++------ api/dispatcher.pb.go | 25 +- api/genericresource/resource_management.go | 5 +- api/genericresource/validate.go | 3 +- api/health.pb.go | 5 +- api/logbroker.pb.go | 13 +- api/raft.pb.go | 21 +- api/resource.pb.go | 9 +- api/storeobject.go | 2 +- api/watch.pb.go | 5 +- ca/certificates.go | 56 ++-- ca/config.go | 29 +- ca/config_test.go | 20 +- ca/external.go | 19 +- ca/keyreadwriter.go | 10 +- ca/reconciler.go | 10 +- ca/renewer.go | 2 +- ca/server.go | 18 +- ca/server_test.go | 10 +- ca/testutils/externalutils.go | 5 +- ca/transport.go | 2 +- design/store.md | 4 +- go.mod | 1 - go.sum | 2 - identity/randomid.go | 2 +- integration/cluster_test.go | 6 +- integration/integration_test.go | 4 +- integration/node_test.go | 4 +- manager/allocator/network.go | 61 ++-- manager/controlapi/config.go | 13 +- manager/controlapi/extension.go | 13 +- manager/controlapi/network.go | 5 +- manager/controlapi/resource.go | 21 +- manager/controlapi/secret.go | 13 +- manager/controlapi/service.go | 16 +- manager/controlapi/task.go | 3 +- manager/controlapi/volume_test.go | 2 +- manager/deks.go | 14 +- manager/deks_test.go | 6 +- manager/dispatcher/assignments.go | 4 +- manager/dispatcher/dispatcher.go | 12 +- manager/dispatcher/dispatcher_test.go | 2 +- manager/drivers/provider.go | 6 +- manager/drivers/secrets.go | 5 +- manager/encryption/encryption.go | 16 +- manager/encryption/fernet.go | 3 +- manager/encryption/nacl.go | 3 +- manager/keymanager/keymanager.go | 5 +- manager/logbroker/broker.go | 2 +- manager/manager.go | 34 ++- manager/state/raft/raft.go | 36 +-- manager/state/raft/storage.go | 23 +- manager/state/raft/storage/snapwrap.go | 13 +- manager/state/raft/storage/storage.go | 22 +- manager/state/raft/storage/storage_test.go | 4 +- manager/state/raft/storage/walwrap.go | 24 +- manager/state/raft/testutils/testutils.go | 13 +- .../state/raft/transport/mock_raft_test.go | 5 +- manager/state/raft/transport/peer.go | 14 +- manager/state/raft/transport/transport.go | 15 +- manager/state/store/memory.go | 4 +- manager/state/store/resources.go | 5 +- node/node.go | 22 +- node/node_test.go | 7 +- protobuf/plugin/raftproxy/raftproxy.go | 19 +- protobuf/plugin/raftproxy/test/service.pb.go | 23 +- remotes/remotes.go | 4 +- remotes/remotes_test.go | 9 +- swarmd/cmd/swarm-rafttool/dump.go | 4 +- swarmd/cmd/swarm-rafttool/renewcert.go | 14 +- swarmd/cmd/swarmctl/cluster/unlockkey.go | 2 +- swarmd/cmd/swarmctl/node/activate.go | 3 +- swarmd/cmd/swarmctl/node/demote.go | 3 +- swarmd/cmd/swarmctl/node/drain.go | 3 +- swarmd/cmd/swarmctl/node/pause.go | 3 +- swarmd/cmd/swarmctl/node/promote.go | 3 +- swarmd/cmd/swarmctl/node/update.go | 3 +- .../cmd/swarmctl/service/flagparser/config.go | 5 +- .../cmd/swarmctl/service/flagparser/mode.go | 4 +- .../swarmctl/service/flagparser/placement.go | 4 +- .../cmd/swarmctl/service/flagparser/port.go | 9 +- .../cmd/swarmctl/service/flagparser/secret.go | 5 +- .../cmd/swarmctl/service/flagparser/tmpfs.go | 11 +- swarmd/cmd/swarmctl/service/logs.go | 8 +- swarmd/dockerexec/adapter.go | 8 +- swarmd/dockerexec/controller.go | 34 +-- .../dockerexec/controller_integration_test.go | 5 +- swarmd/dockerexec/controller_test.go | 9 +- template/context.go | 6 +- template/context_test.go | 5 +- template/expand.go | 25 +- template/getter.go | 8 +- testutils/poll.go | 4 +- vendor/github.com/pkg/errors/.gitignore | 24 -- vendor/github.com/pkg/errors/.travis.yml | 10 - vendor/github.com/pkg/errors/LICENSE | 23 -- vendor/github.com/pkg/errors/Makefile | 44 --- vendor/github.com/pkg/errors/README.md | 59 ---- vendor/github.com/pkg/errors/appveyor.yml | 32 -- vendor/github.com/pkg/errors/errors.go | 288 ------------------ vendor/github.com/pkg/errors/go113.go | 38 --- vendor/github.com/pkg/errors/stack.go | 177 ----------- vendor/modules.txt | 3 - watch/queue/queue.go | 3 +- watch/sinks.go | 6 +- 118 files changed, 670 insertions(+), 1319 deletions(-) delete mode 100644 vendor/github.com/pkg/errors/.gitignore delete mode 100644 vendor/github.com/pkg/errors/.travis.yml delete mode 100644 vendor/github.com/pkg/errors/LICENSE delete mode 100644 vendor/github.com/pkg/errors/Makefile delete mode 100644 vendor/github.com/pkg/errors/README.md delete mode 100644 vendor/github.com/pkg/errors/appveyor.yml delete mode 100644 vendor/github.com/pkg/errors/errors.go delete mode 100644 vendor/github.com/pkg/errors/go113.go delete mode 100644 vendor/github.com/pkg/errors/stack.go diff --git a/.golangci.yml b/.golangci.yml index 9add6fc6f9..7010e5ec76 100644 --- a/.golangci.yml +++ b/.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,23 +39,12 @@ 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: @@ -54,8 +52,7 @@ formatters: - goimports exclusions: generated: lax - paths: - - .*\.pb\.go$ + warn-unused: true issues: max-issues-per-linter: 0 diff --git a/agent/agent.go b/agent/agent.go index 9acec60bfe..57127ba831 100644 --- a/agent/agent.go +++ b/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") diff --git a/agent/agent_test.go b/agent/agent_test.go index 441f0d3277..a2e4ccbd69 100644 --- a/agent/agent_test.go +++ b/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)) } diff --git a/agent/config.go b/agent/config.go index 3afb2383a5..dcdfd32a29 100644 --- a/agent/config.go +++ b/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" ) diff --git a/agent/csi/plugin/manager.go b/agent/csi/plugin/manager.go index b4fc047263..66ce5594f2 100644 --- a/agent/csi/plugin/manager.go +++ b/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) diff --git a/agent/csi/volumes.go b/agent/csi/volumes.go index 97539286df..bb175310c7 100644 --- a/agent/csi/volumes.go +++ b/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 { diff --git a/agent/exec/controller.go b/agent/exec/controller.go index ef0a3a4a7b..f6c26ca481 100644 --- a/agent/exec/controller.go +++ b/agent/exec/controller.go @@ -2,6 +2,7 @@ package exec import ( "context" + "errors" "fmt" "time" @@ -9,7 +10,6 @@ import ( "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) } diff --git a/agent/exec/errors.go b/agent/exec/errors.go index f57629161f..95d058c837 100644 --- a/agent/exec/errors.go +++ b/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. diff --git a/agent/exec/errors_test.go b/agent/exec/errors_test.go index 45a237fdd4..1695ea12c9 100644 --- a/agent/exec/errors_test.go +++ b/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") diff --git a/agent/task.go b/agent/task.go index a000410445..8952f41b5d 100644 --- a/agent/task.go +++ b/agent/task.go @@ -2,6 +2,7 @@ package agent import ( "context" + "errors" "sync" "time" @@ -160,12 +161,12 @@ 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. @@ -173,7 +174,7 @@ func (tm *taskManager) run(ctx context.Context) { 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") diff --git a/agent/worker.go b/agent/worker.go index 9b04c055ba..68ca739047 100644 --- a/agent/worker.go +++ b/agent/worker.go @@ -2,6 +2,7 @@ package agent import ( "context" + "errors" "slices" "sync" @@ -240,7 +241,7 @@ func reconcileTaskState(ctx context.Context, w *worker, assignments []*api.Assig } if mgr, ok := w.taskManagers[task.ID]; ok { - if err := mgr.Update(ctx, task); err != nil && err != ErrClosed { + if err := mgr.Update(ctx, task); err != nil && !errors.Is(err, ErrClosed) { log.G(ctx).WithError(err).Error("failed updating assigned task") } } else { @@ -248,7 +249,7 @@ func reconcileTaskState(ctx context.Context, w *worker, assignments []*api.Assig // storage and replace it with our status, if we have it. status, err := GetTaskStatus(tx, task.ID) if err != nil { - if err != errTaskUnknown { + if !errors.Is(err, errTaskUnknown) { return err } @@ -570,7 +571,7 @@ func (w *worker) updateTaskStatus(ctx context.Context, tx *bolt.Tx, taskID strin // dance of too-tightly-coupled concurrent parts, fixing tht race is // fraught with hazards. instead, we'll recognize that it can occur, // log the error, and then ignore it. - if err == errTaskUnknown { + if errors.Is(err, errTaskUnknown) { // log at info level. debug logging in docker is already really // verbose, so many people disable it. the race that causes this // behavior should be very rare, but if it occurs, we should know diff --git a/agent/worker_test.go b/agent/worker_test.go index 40de4adc75..5c444b5039 100644 --- a/agent/worker_test.go +++ b/agent/worker_test.go @@ -2,7 +2,6 @@ package agent import ( "context" - "errors" "net" "testing" @@ -256,7 +255,7 @@ func TestWorkerAssign(t *testing.T) { for _, volume := range testcase.expectedVolumes { _, err := executor.Volumes().Get(volume.VolumeID) assert.Error(t, err) - assert.True(t, errors.Is(err, exec.ErrDependencyNotReady)) + assert.ErrorIs(t, err, exec.ErrDependencyNotReady) } } } @@ -387,7 +386,7 @@ func TestWorkerWait(t *testing.T) { for _, volume := range expectedVolumes { _, err := executor.Volumes().Get(volume.VolumeID) assert.Error(t, err) - assert.True(t, errors.Is(err, exec.ErrDependencyNotReady)) + assert.ErrorIs(t, err, exec.ErrDependencyNotReady) } err := worker.Assign(ctx, nil) @@ -766,7 +765,7 @@ func TestWorkerUpdate(t *testing.T) { _, err := executor.Volumes().Get(volume.VolumeID) // volumes should not be ready yet, so we expect an error. assert.Error(t, err) - assert.True(t, errors.Is(err, exec.ErrDependencyNotReady), "error: %v", err) + assert.ErrorIs(t, err, exec.ErrDependencyNotReady) } } } diff --git a/api/ca.pb.go b/api/ca.pb.go index 42e77d893d..dbec3b1fa2 100644 --- a/api/ca.pb.go +++ b/api/ca.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -1161,7 +1162,7 @@ func (p *raftProxyCAServer) GetRootCACertificate(ctx context.Context, r *GetRoot conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -1182,7 +1183,7 @@ func (p *raftProxyCAServer) GetRootCACertificate(ctx context.Context, r *GetRoot } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetRootCACertificate(ctx, r) } return nil, err @@ -1196,7 +1197,7 @@ func (p *raftProxyCAServer) GetUnlockKey(ctx context.Context, r *GetUnlockKeyReq conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -1217,7 +1218,7 @@ func (p *raftProxyCAServer) GetUnlockKey(ctx context.Context, r *GetUnlockKeyReq } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetUnlockKey(ctx, r) } return nil, err @@ -1303,7 +1304,7 @@ func (p *raftProxyNodeCAServer) IssueNodeCertificate(ctx context.Context, r *Iss conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -1324,7 +1325,7 @@ func (p *raftProxyNodeCAServer) IssueNodeCertificate(ctx context.Context, r *Iss } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.IssueNodeCertificate(ctx, r) } return nil, err @@ -1338,7 +1339,7 @@ func (p *raftProxyNodeCAServer) NodeCertificateStatus(ctx context.Context, r *No conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -1359,7 +1360,7 @@ func (p *raftProxyNodeCAServer) NodeCertificateStatus(ctx context.Context, r *No } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.NodeCertificateStatus(ctx, r) } return nil, err diff --git a/api/control.pb.go b/api/control.pb.go index 384e82f0f4..4273a7de9a 100644 --- a/api/control.pb.go +++ b/api/control.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -12175,7 +12176,7 @@ func (p *raftProxyControlServer) GetNode(ctx context.Context, r *GetNodeRequest) conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12196,7 +12197,7 @@ func (p *raftProxyControlServer) GetNode(ctx context.Context, r *GetNodeRequest) } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetNode(ctx, r) } return nil, err @@ -12210,7 +12211,7 @@ func (p *raftProxyControlServer) ListNodes(ctx context.Context, r *ListNodesRequ conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12231,7 +12232,7 @@ func (p *raftProxyControlServer) ListNodes(ctx context.Context, r *ListNodesRequ } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListNodes(ctx, r) } return nil, err @@ -12245,7 +12246,7 @@ func (p *raftProxyControlServer) UpdateNode(ctx context.Context, r *UpdateNodeRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12266,7 +12267,7 @@ func (p *raftProxyControlServer) UpdateNode(ctx context.Context, r *UpdateNodeRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateNode(ctx, r) } return nil, err @@ -12280,7 +12281,7 @@ func (p *raftProxyControlServer) RemoveNode(ctx context.Context, r *RemoveNodeRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12301,7 +12302,7 @@ func (p *raftProxyControlServer) RemoveNode(ctx context.Context, r *RemoveNodeRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveNode(ctx, r) } return nil, err @@ -12315,7 +12316,7 @@ func (p *raftProxyControlServer) GetTask(ctx context.Context, r *GetTaskRequest) conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12336,7 +12337,7 @@ func (p *raftProxyControlServer) GetTask(ctx context.Context, r *GetTaskRequest) } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetTask(ctx, r) } return nil, err @@ -12350,7 +12351,7 @@ func (p *raftProxyControlServer) ListTasks(ctx context.Context, r *ListTasksRequ conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12371,7 +12372,7 @@ func (p *raftProxyControlServer) ListTasks(ctx context.Context, r *ListTasksRequ } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListTasks(ctx, r) } return nil, err @@ -12385,7 +12386,7 @@ func (p *raftProxyControlServer) RemoveTask(ctx context.Context, r *RemoveTaskRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12406,7 +12407,7 @@ func (p *raftProxyControlServer) RemoveTask(ctx context.Context, r *RemoveTaskRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveTask(ctx, r) } return nil, err @@ -12420,7 +12421,7 @@ func (p *raftProxyControlServer) GetService(ctx context.Context, r *GetServiceRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12441,7 +12442,7 @@ func (p *raftProxyControlServer) GetService(ctx context.Context, r *GetServiceRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetService(ctx, r) } return nil, err @@ -12455,7 +12456,7 @@ func (p *raftProxyControlServer) ListServices(ctx context.Context, r *ListServic conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12476,7 +12477,7 @@ func (p *raftProxyControlServer) ListServices(ctx context.Context, r *ListServic } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListServices(ctx, r) } return nil, err @@ -12490,7 +12491,7 @@ func (p *raftProxyControlServer) CreateService(ctx context.Context, r *CreateSer conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12511,7 +12512,7 @@ func (p *raftProxyControlServer) CreateService(ctx context.Context, r *CreateSer } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.CreateService(ctx, r) } return nil, err @@ -12525,7 +12526,7 @@ func (p *raftProxyControlServer) UpdateService(ctx context.Context, r *UpdateSer conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12546,7 +12547,7 @@ func (p *raftProxyControlServer) UpdateService(ctx context.Context, r *UpdateSer } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateService(ctx, r) } return nil, err @@ -12560,7 +12561,7 @@ func (p *raftProxyControlServer) RemoveService(ctx context.Context, r *RemoveSer conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12581,7 +12582,7 @@ func (p *raftProxyControlServer) RemoveService(ctx context.Context, r *RemoveSer } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveService(ctx, r) } return nil, err @@ -12595,7 +12596,7 @@ func (p *raftProxyControlServer) ListServiceStatuses(ctx context.Context, r *Lis conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12616,7 +12617,7 @@ func (p *raftProxyControlServer) ListServiceStatuses(ctx context.Context, r *Lis } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListServiceStatuses(ctx, r) } return nil, err @@ -12630,7 +12631,7 @@ func (p *raftProxyControlServer) GetNetwork(ctx context.Context, r *GetNetworkRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12651,7 +12652,7 @@ func (p *raftProxyControlServer) GetNetwork(ctx context.Context, r *GetNetworkRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetNetwork(ctx, r) } return nil, err @@ -12665,7 +12666,7 @@ func (p *raftProxyControlServer) ListNetworks(ctx context.Context, r *ListNetwor conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12686,7 +12687,7 @@ func (p *raftProxyControlServer) ListNetworks(ctx context.Context, r *ListNetwor } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListNetworks(ctx, r) } return nil, err @@ -12700,7 +12701,7 @@ func (p *raftProxyControlServer) CreateNetwork(ctx context.Context, r *CreateNet conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12721,7 +12722,7 @@ func (p *raftProxyControlServer) CreateNetwork(ctx context.Context, r *CreateNet } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.CreateNetwork(ctx, r) } return nil, err @@ -12735,7 +12736,7 @@ func (p *raftProxyControlServer) RemoveNetwork(ctx context.Context, r *RemoveNet conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12756,7 +12757,7 @@ func (p *raftProxyControlServer) RemoveNetwork(ctx context.Context, r *RemoveNet } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveNetwork(ctx, r) } return nil, err @@ -12770,7 +12771,7 @@ func (p *raftProxyControlServer) GetCluster(ctx context.Context, r *GetClusterRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12791,7 +12792,7 @@ func (p *raftProxyControlServer) GetCluster(ctx context.Context, r *GetClusterRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetCluster(ctx, r) } return nil, err @@ -12805,7 +12806,7 @@ func (p *raftProxyControlServer) ListClusters(ctx context.Context, r *ListCluste conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12826,7 +12827,7 @@ func (p *raftProxyControlServer) ListClusters(ctx context.Context, r *ListCluste } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListClusters(ctx, r) } return nil, err @@ -12840,7 +12841,7 @@ func (p *raftProxyControlServer) UpdateCluster(ctx context.Context, r *UpdateClu conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12861,7 +12862,7 @@ func (p *raftProxyControlServer) UpdateCluster(ctx context.Context, r *UpdateClu } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateCluster(ctx, r) } return nil, err @@ -12875,7 +12876,7 @@ func (p *raftProxyControlServer) GetSecret(ctx context.Context, r *GetSecretRequ conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12896,7 +12897,7 @@ func (p *raftProxyControlServer) GetSecret(ctx context.Context, r *GetSecretRequ } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetSecret(ctx, r) } return nil, err @@ -12910,7 +12911,7 @@ func (p *raftProxyControlServer) UpdateSecret(ctx context.Context, r *UpdateSecr conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12931,7 +12932,7 @@ func (p *raftProxyControlServer) UpdateSecret(ctx context.Context, r *UpdateSecr } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateSecret(ctx, r) } return nil, err @@ -12945,7 +12946,7 @@ func (p *raftProxyControlServer) ListSecrets(ctx context.Context, r *ListSecrets conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -12966,7 +12967,7 @@ func (p *raftProxyControlServer) ListSecrets(ctx context.Context, r *ListSecrets } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListSecrets(ctx, r) } return nil, err @@ -12980,7 +12981,7 @@ func (p *raftProxyControlServer) CreateSecret(ctx context.Context, r *CreateSecr conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13001,7 +13002,7 @@ func (p *raftProxyControlServer) CreateSecret(ctx context.Context, r *CreateSecr } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.CreateSecret(ctx, r) } return nil, err @@ -13015,7 +13016,7 @@ func (p *raftProxyControlServer) RemoveSecret(ctx context.Context, r *RemoveSecr conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13036,7 +13037,7 @@ func (p *raftProxyControlServer) RemoveSecret(ctx context.Context, r *RemoveSecr } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveSecret(ctx, r) } return nil, err @@ -13050,7 +13051,7 @@ func (p *raftProxyControlServer) GetConfig(ctx context.Context, r *GetConfigRequ conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13071,7 +13072,7 @@ func (p *raftProxyControlServer) GetConfig(ctx context.Context, r *GetConfigRequ } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetConfig(ctx, r) } return nil, err @@ -13085,7 +13086,7 @@ func (p *raftProxyControlServer) UpdateConfig(ctx context.Context, r *UpdateConf conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13106,7 +13107,7 @@ func (p *raftProxyControlServer) UpdateConfig(ctx context.Context, r *UpdateConf } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateConfig(ctx, r) } return nil, err @@ -13120,7 +13121,7 @@ func (p *raftProxyControlServer) ListConfigs(ctx context.Context, r *ListConfigs conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13141,7 +13142,7 @@ func (p *raftProxyControlServer) ListConfigs(ctx context.Context, r *ListConfigs } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListConfigs(ctx, r) } return nil, err @@ -13155,7 +13156,7 @@ func (p *raftProxyControlServer) CreateConfig(ctx context.Context, r *CreateConf conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13176,7 +13177,7 @@ func (p *raftProxyControlServer) CreateConfig(ctx context.Context, r *CreateConf } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.CreateConfig(ctx, r) } return nil, err @@ -13190,7 +13191,7 @@ func (p *raftProxyControlServer) RemoveConfig(ctx context.Context, r *RemoveConf conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13211,7 +13212,7 @@ func (p *raftProxyControlServer) RemoveConfig(ctx context.Context, r *RemoveConf } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveConfig(ctx, r) } return nil, err @@ -13225,7 +13226,7 @@ func (p *raftProxyControlServer) GetExtension(ctx context.Context, r *GetExtensi conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13246,7 +13247,7 @@ func (p *raftProxyControlServer) GetExtension(ctx context.Context, r *GetExtensi } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetExtension(ctx, r) } return nil, err @@ -13260,7 +13261,7 @@ func (p *raftProxyControlServer) CreateExtension(ctx context.Context, r *CreateE conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13281,7 +13282,7 @@ func (p *raftProxyControlServer) CreateExtension(ctx context.Context, r *CreateE } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.CreateExtension(ctx, r) } return nil, err @@ -13295,7 +13296,7 @@ func (p *raftProxyControlServer) RemoveExtension(ctx context.Context, r *RemoveE conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13316,7 +13317,7 @@ func (p *raftProxyControlServer) RemoveExtension(ctx context.Context, r *RemoveE } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveExtension(ctx, r) } return nil, err @@ -13330,7 +13331,7 @@ func (p *raftProxyControlServer) GetResource(ctx context.Context, r *GetResource conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13351,7 +13352,7 @@ func (p *raftProxyControlServer) GetResource(ctx context.Context, r *GetResource } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetResource(ctx, r) } return nil, err @@ -13365,7 +13366,7 @@ func (p *raftProxyControlServer) UpdateResource(ctx context.Context, r *UpdateRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13386,7 +13387,7 @@ func (p *raftProxyControlServer) UpdateResource(ctx context.Context, r *UpdateRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateResource(ctx, r) } return nil, err @@ -13400,7 +13401,7 @@ func (p *raftProxyControlServer) ListResources(ctx context.Context, r *ListResou conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13421,7 +13422,7 @@ func (p *raftProxyControlServer) ListResources(ctx context.Context, r *ListResou } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListResources(ctx, r) } return nil, err @@ -13435,7 +13436,7 @@ func (p *raftProxyControlServer) CreateResource(ctx context.Context, r *CreateRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13456,7 +13457,7 @@ func (p *raftProxyControlServer) CreateResource(ctx context.Context, r *CreateRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.CreateResource(ctx, r) } return nil, err @@ -13470,7 +13471,7 @@ func (p *raftProxyControlServer) RemoveResource(ctx context.Context, r *RemoveRe conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13491,7 +13492,7 @@ func (p *raftProxyControlServer) RemoveResource(ctx context.Context, r *RemoveRe } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveResource(ctx, r) } return nil, err @@ -13505,7 +13506,7 @@ func (p *raftProxyControlServer) CreateVolume(ctx context.Context, r *CreateVolu conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13526,7 +13527,7 @@ func (p *raftProxyControlServer) CreateVolume(ctx context.Context, r *CreateVolu } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.CreateVolume(ctx, r) } return nil, err @@ -13540,7 +13541,7 @@ func (p *raftProxyControlServer) GetVolume(ctx context.Context, r *GetVolumeRequ conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13561,7 +13562,7 @@ func (p *raftProxyControlServer) GetVolume(ctx context.Context, r *GetVolumeRequ } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetVolume(ctx, r) } return nil, err @@ -13575,7 +13576,7 @@ func (p *raftProxyControlServer) UpdateVolume(ctx context.Context, r *UpdateVolu conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13596,7 +13597,7 @@ func (p *raftProxyControlServer) UpdateVolume(ctx context.Context, r *UpdateVolu } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateVolume(ctx, r) } return nil, err @@ -13610,7 +13611,7 @@ func (p *raftProxyControlServer) ListVolumes(ctx context.Context, r *ListVolumes conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13631,7 +13632,7 @@ func (p *raftProxyControlServer) ListVolumes(ctx context.Context, r *ListVolumes } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ListVolumes(ctx, r) } return nil, err @@ -13645,7 +13646,7 @@ func (p *raftProxyControlServer) RemoveVolume(ctx context.Context, r *RemoveVolu conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -13666,7 +13667,7 @@ func (p *raftProxyControlServer) RemoveVolume(ctx context.Context, r *RemoveVolu } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.RemoveVolume(ctx, r) } return nil, err diff --git a/api/dispatcher.pb.go b/api/dispatcher.pb.go index 00542edd9d..5475046121 100644 --- a/api/dispatcher.pb.go +++ b/api/dispatcher.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -2525,7 +2526,7 @@ func (p *raftProxyDispatcherServer) Session(r *SessionRequest, stream Dispatcher ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -2550,7 +2551,7 @@ func (p *raftProxyDispatcherServer) Session(r *SessionRequest, stream Dispatcher for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -2567,7 +2568,7 @@ func (p *raftProxyDispatcherServer) Heartbeat(ctx context.Context, r *HeartbeatR conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -2588,7 +2589,7 @@ func (p *raftProxyDispatcherServer) Heartbeat(ctx context.Context, r *HeartbeatR } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.Heartbeat(ctx, r) } return nil, err @@ -2602,7 +2603,7 @@ func (p *raftProxyDispatcherServer) UpdateTaskStatus(ctx context.Context, r *Upd conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -2623,7 +2624,7 @@ func (p *raftProxyDispatcherServer) UpdateTaskStatus(ctx context.Context, r *Upd } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateTaskStatus(ctx, r) } return nil, err @@ -2637,7 +2638,7 @@ func (p *raftProxyDispatcherServer) UpdateVolumeStatus(ctx context.Context, r *U conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -2658,7 +2659,7 @@ func (p *raftProxyDispatcherServer) UpdateVolumeStatus(ctx context.Context, r *U } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.UpdateVolumeStatus(ctx, r) } return nil, err @@ -2681,7 +2682,7 @@ func (p *raftProxyDispatcherServer) Tasks(r *TasksRequest, stream Dispatcher_Tas ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -2706,7 +2707,7 @@ func (p *raftProxyDispatcherServer) Tasks(r *TasksRequest, stream Dispatcher_Tas for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -2732,7 +2733,7 @@ func (p *raftProxyDispatcherServer) Assignments(r *AssignmentsRequest, stream Di ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -2757,7 +2758,7 @@ func (p *raftProxyDispatcherServer) Assignments(r *AssignmentsRequest, stream Di for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { diff --git a/api/genericresource/resource_management.go b/api/genericresource/resource_management.go index 86a358363f..144658330c 100644 --- a/api/genericresource/resource_management.go +++ b/api/genericresource/resource_management.go @@ -1,6 +1,7 @@ package genericresource import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -15,7 +16,7 @@ func Claim(nodeAvailableResources, taskAssigned *[]*api.GenericResource, for _, res := range taskReservations { tr := res.GetDiscreteResourceSpec() if tr == nil { - return fmt.Errorf("task should only hold Discrete type") + return errors.New("task should only hold Discrete type") } // Select the resources @@ -86,7 +87,7 @@ func Reclaim(nodeAvailableResources *[]*api.GenericResource, taskAssigned, nodeR func reclaimResources(nodeAvailableResources *[]*api.GenericResource, taskAssigned []*api.GenericResource) error { // The node could have been updated if nodeAvailableResources == nil { - return fmt.Errorf("node no longer has any resources") + return errors.New("node no longer has any resources") } for _, res := range taskAssigned { diff --git a/api/genericresource/validate.go b/api/genericresource/validate.go index 909ac3e7ee..7507e8035b 100644 --- a/api/genericresource/validate.go +++ b/api/genericresource/validate.go @@ -1,6 +1,7 @@ package genericresource import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -24,7 +25,7 @@ func ValidateTask(resources *api.Resources) error { func HasEnough(nodeRes []*api.GenericResource, taskRes *api.GenericResource) (bool, error) { t := taskRes.GetDiscreteResourceSpec() if t == nil { - return false, fmt.Errorf("task should only hold Discrete type") + return false, errors.New("task should only hold Discrete type") } if nodeRes == nil { diff --git a/api/health.pb.go b/api/health.pb.go index b5795d4da0..c2f0a3eef5 100644 --- a/api/health.pb.go +++ b/api/health.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -445,7 +446,7 @@ func (p *raftProxyHealthServer) Check(ctx context.Context, r *HealthCheckRequest conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -466,7 +467,7 @@ func (p *raftProxyHealthServer) Check(ctx context.Context, r *HealthCheckRequest } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.Check(ctx, r) } return nil, err diff --git a/api/logbroker.pb.go b/api/logbroker.pb.go index 05cacafd78..68840d5839 100644 --- a/api/logbroker.pb.go +++ b/api/logbroker.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -1798,7 +1799,7 @@ func (p *raftProxyLogsServer) SubscribeLogs(r *SubscribeLogsRequest, stream Logs ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -1823,7 +1824,7 @@ func (p *raftProxyLogsServer) SubscribeLogs(r *SubscribeLogsRequest, stream Logs for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -1921,7 +1922,7 @@ func (p *raftProxyLogBrokerServer) ListenSubscriptions(r *ListenSubscriptionsReq ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -1946,7 +1947,7 @@ func (p *raftProxyLogBrokerServer) ListenSubscriptions(r *ListenSubscriptionsReq for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -1972,7 +1973,7 @@ func (p *raftProxyLogBrokerServer) PublishLogs(stream LogBroker_PublishLogsServe ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -1997,7 +1998,7 @@ func (p *raftProxyLogBrokerServer) PublishLogs(stream LogBroker_PublishLogsServe for { msg, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { diff --git a/api/raft.pb.go b/api/raft.pb.go index c4904b4a34..b986497f6d 100644 --- a/api/raft.pb.go +++ b/api/raft.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" proto "github.com/gogo/protobuf/proto" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" @@ -2159,7 +2160,7 @@ func (p *raftProxyRaftServer) ProcessRaftMessage(ctx context.Context, r *Process conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -2180,7 +2181,7 @@ func (p *raftProxyRaftServer) ProcessRaftMessage(ctx context.Context, r *Process } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ProcessRaftMessage(ctx, r) } return nil, err @@ -2203,7 +2204,7 @@ func (p *raftProxyRaftServer) StreamRaftMessage(stream Raft_StreamRaftMessageSer ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -2228,7 +2229,7 @@ func (p *raftProxyRaftServer) StreamRaftMessage(stream Raft_StreamRaftMessageSer for { msg, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -2251,7 +2252,7 @@ func (p *raftProxyRaftServer) ResolveAddress(ctx context.Context, r *ResolveAddr conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -2272,7 +2273,7 @@ func (p *raftProxyRaftServer) ResolveAddress(ctx context.Context, r *ResolveAddr } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.ResolveAddress(ctx, r) } return nil, err @@ -2358,7 +2359,7 @@ func (p *raftProxyRaftMembershipServer) Join(ctx context.Context, r *JoinRequest conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -2379,7 +2380,7 @@ func (p *raftProxyRaftMembershipServer) Join(ctx context.Context, r *JoinRequest } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.Join(ctx, r) } return nil, err @@ -2393,7 +2394,7 @@ func (p *raftProxyRaftMembershipServer) Leave(ctx context.Context, r *LeaveReque conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -2414,7 +2415,7 @@ func (p *raftProxyRaftMembershipServer) Leave(ctx context.Context, r *LeaveReque } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.Leave(ctx, r) } return nil, err diff --git a/api/resource.pb.go b/api/resource.pb.go index 3466e44073..2514372441 100644 --- a/api/resource.pb.go +++ b/api/resource.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -637,7 +638,7 @@ func (p *raftProxyResourceAllocatorServer) AttachNetwork(ctx context.Context, r conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -658,7 +659,7 @@ func (p *raftProxyResourceAllocatorServer) AttachNetwork(ctx context.Context, r } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.AttachNetwork(ctx, r) } return nil, err @@ -672,7 +673,7 @@ func (p *raftProxyResourceAllocatorServer) DetachNetwork(ctx context.Context, r conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -693,7 +694,7 @@ func (p *raftProxyResourceAllocatorServer) DetachNetwork(ctx context.Context, r } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.DetachNetwork(ctx, r) } return nil, err diff --git a/api/storeobject.go b/api/storeobject.go index c797bc575f..3dfe4a2167 100644 --- a/api/storeobject.go +++ b/api/storeobject.go @@ -75,7 +75,7 @@ func customIndexer(kind string, annotations *Annotations) (bool, [][]byte, error func fromArgs(args ...any) ([]byte, error) { if len(args) != 1 { - return nil, fmt.Errorf("must provide only a single argument") + return nil, errors.New("must provide only a single argument") } arg, ok := args[0].(string) if !ok { diff --git a/api/watch.pb.go b/api/watch.pb.go index 9203d58db1..597ecfa847 100644 --- a/api/watch.pb.go +++ b/api/watch.pb.go @@ -5,6 +5,7 @@ package api import ( context "context" + errors "errors" fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" @@ -2231,7 +2232,7 @@ func (p *raftProxyWatchServer) Watch(r *WatchRequest, stream Watch_WatchServer) ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -2256,7 +2257,7 @@ func (p *raftProxyWatchServer) Watch(r *WatchRequest, stream Watch_WatchServer) for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { diff --git a/ca/certificates.go b/ca/certificates.go index b47a722a81..54838a9d13 100644 --- a/ca/certificates.go +++ b/ca/certificates.go @@ -12,6 +12,7 @@ import ( "crypto/x509" "encoding/asn1" "encoding/pem" + "errors" "fmt" "io" "os" @@ -31,7 +32,6 @@ import ( "github.com/moby/swarmkit/v2/connectionbroker" "github.com/moby/swarmkit/v2/ioutils" "github.com/opencontainers/go-digest" - "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" @@ -200,13 +200,13 @@ func (rca *RootCA) Signer() (*LocalSigner, error) { func (rca *RootCA) IssueAndSaveNewCertificates(kw KeyWriter, cn, ou, org string) (*tls.Certificate, *IssuerInfo, error) { csr, key, err := GenerateNewCSR() if err != nil { - return nil, nil, errors.Wrap(err, "error when generating new node certs") + return nil, nil, fmt.Errorf("error when generating new node certs: %w", err) } // Obtain a signed Certificate certChain, err := rca.ParseValidateAndSignCSR(csr, cn, ou, org) if err != nil { - return nil, nil, errors.Wrap(err, "failed to sign node certificate") + return nil, nil, fmt.Errorf("failed to sign node certificate: %w", err) } signer, err := rca.Signer() if err != nil { // should never happen, since if ParseValidateAndSignCSR did not fail this root CA must have a signer @@ -236,7 +236,7 @@ func (rca *RootCA) RequestAndSaveNewCertificates(ctx context.Context, kw KeyWrit // Create a new key/pair and CSR csr, key, err := GenerateNewCSR() if err != nil { - return nil, nil, errors.Wrap(err, "error when generating new node certs") + return nil, nil, fmt.Errorf("error when generating new node certs: %w", err) } // Get the remote manager to issue a CA signed certificate for this node @@ -276,7 +276,8 @@ func (rca *RootCA) RequestAndSaveNewCertificates(ctx context.Context, kw KeyWrit // TODO(cyli): - right now we need the invalid certificate in order to determine whether or not we should // download a new root, because we only want to do that in the case of workers. When we have a single // codepath for updating the root CAs for both managers and workers, this snippet can go. - if _, ok := err.(x509.UnknownAuthorityError); ok { + var uae x509.UnknownAuthorityError + if errors.As(err, &uae) { if parsedCerts, parseErr := helpers.ParseCertificatesPEM(signedCert); parseErr == nil && len(parsedCerts) > 0 { return nil, nil, x509UnknownAuthError{ error: err, @@ -390,7 +391,7 @@ func (rca *RootCA) ParseValidateAndSignCSR(csrBytes []byte, cn, ou, org string) } cert, err := signer.Sign(signRequest) if err != nil { - return nil, errors.Wrap(err, "failed to sign node certificate") + return nil, fmt.Errorf("failed to sign node certificate: %w", err) } return append(cert, rca.Intermediates...), nil @@ -416,7 +417,7 @@ func (rca *RootCA) CrossSignCACertificate(otherCAPEM []byte) ([]byte, error) { template.SignatureAlgorithm = signer.parsedCert.SignatureAlgorithm // make sure we can sign with the signer key derBytes, err := x509.CreateCertificate(cryptorand.Reader, template, signer.parsedCert, template.PublicKey, signer.cryptoSigner) if err != nil { - return nil, errors.Wrap(err, "could not cross-sign new CA certificate using old CA material") + return nil, fmt.Errorf("could not cross-sign new CA certificate using old CA material: %w", err) } return pem.EncodeToMemory(&pem.Block{ @@ -441,7 +442,7 @@ func NewRootCA(rootCertBytes, signCertBytes, signKeyBytes []byte, certExpiry tim // Parse all the certificates in the cert bundle parsedCerts, err := helpers.ParseCertificatesPEM(rootCertBytes) if err != nil { - return RootCA{}, errors.Wrap(err, "invalid root certificates") + return RootCA{}, fmt.Errorf("invalid root certificates: %w", err) } // Check to see if we have at least one valid cert if len(parsedCerts) < 1 { @@ -458,7 +459,7 @@ func NewRootCA(rootCertBytes, signCertBytes, signKeyBytes []byte, certExpiry tim selfpool := x509.NewCertPool() selfpool.AddCert(cert) if _, err := cert.Verify(x509.VerifyOptions{Roots: selfpool}); err != nil { - return RootCA{}, errors.Wrap(err, "error while validating Root CA Certificate") + return RootCA{}, fmt.Errorf("error while validating Root CA Certificate: %w", err) } pool.AddCert(cert) } @@ -473,7 +474,7 @@ func NewRootCA(rootCertBytes, signCertBytes, signKeyBytes []byte, certExpiry tim if len(intermediates) > 0 { parsedIntermediates, _, err = ValidateCertChain(pool, intermediates, false) if err != nil { - return RootCA{}, errors.Wrap(err, "invalid intermediate chain") + return RootCA{}, fmt.Errorf("invalid intermediate chain: %w", err) } intermediatePool = x509.NewCertPool() for _, cert := range parsedIntermediates { @@ -527,30 +528,28 @@ func ValidateCertChain(rootPool *x509.CertPool, certs []byte, allowExpired bool) // Manual expiry validation because we want more information on which certificate in the chain is expired, and // because this is an easier way to allow expired certs. if now.Before(cert.NotBefore) { - return nil, nil, errors.Wrapf( - x509.CertificateInvalidError{ + return nil, nil, fmt.Errorf( + "certificate (%d - %s) not valid before %s, and it is currently %s: %w", + i+1, cert.Subject.CommonName, cert.NotBefore.UTC().Format(time.RFC1123), now.Format(time.RFC1123), x509.CertificateInvalidError{ Cert: cert, Reason: x509.Expired, - }, - "certificate (%d - %s) not valid before %s, and it is currently %s", - i+1, cert.Subject.CommonName, cert.NotBefore.UTC().Format(time.RFC1123), now.Format(time.RFC1123)) + }) } if !allowExpired && now.After(cert.NotAfter) { - return nil, nil, errors.Wrapf( - x509.CertificateInvalidError{ + return nil, nil, fmt.Errorf( + "certificate (%d - %s) not valid after %s, and it is currently %s: %w", + i+1, cert.Subject.CommonName, cert.NotAfter.UTC().Format(time.RFC1123), now.Format(time.RFC1123), x509.CertificateInvalidError{ Cert: cert, Reason: x509.Expired, - }, - "certificate (%d - %s) not valid after %s, and it is currently %s", - i+1, cert.Subject.CommonName, cert.NotAfter.UTC().Format(time.RFC1123), now.Format(time.RFC1123)) + }) } if i > 0 { // check that the previous cert was signed by this cert prevCert := parsedCerts[i-1] if err := prevCert.CheckSignatureFrom(cert); err != nil { - return nil, nil, errors.Wrapf(err, "certificates do not form a chain: (%d - %s) is not signed by (%d - %s)", - i, prevCert.Subject.CommonName, i+1, cert.Subject.CommonName) + return nil, nil, fmt.Errorf("certificates do not form a chain: (%d - %s) is not signed by (%d - %s): %w", + i, prevCert.Subject.CommonName, i+1, cert.Subject.CommonName, err) } if intermediatePool == nil { @@ -588,7 +587,8 @@ func ValidateCertChain(rootPool *x509.CertPool, certs []byte, allowExpired bool) return parsedCerts, chains, nil } } - if invalid, ok := err.(x509.CertificateInvalidError); ok && invalid.Reason == x509.Expired { + var invalid x509.CertificateInvalidError + if errors.As(err, &invalid) && invalid.Reason == x509.Expired { return nil, nil, errors.New("there is no time span for which all of the certificates, including a root, are valid") } return nil, nil, err @@ -609,7 +609,7 @@ func newLocalSigner(keyBytes, certBytes []byte, certExpiry time.Duration, rootPo parsedCerts, err := helpers.ParseCertificatesPEM(certBytes) if err != nil { - return nil, errors.Wrap(err, "invalid signing CA cert") + return nil, fmt.Errorf("invalid signing CA cert: %w", err) } if len(parsedCerts) == 0 { return nil, errors.New("no valid signing CA certificates found") @@ -622,13 +622,13 @@ func newLocalSigner(keyBytes, certBytes []byte, certExpiry time.Duration, rootPo Intermediates: intermediatePool, } if _, err := parsedCerts[0].Verify(opts); err != nil { - return nil, errors.Wrap(err, "error while validating signing CA certificate against roots and intermediates") + return nil, fmt.Errorf("error while validating signing CA certificate against roots and intermediates: %w", err) } // The key should not be encrypted, but it could be in PKCS8 format rather than PKCS1 priv, err := helpers.ParsePrivateKeyPEM(keyBytes) if err != nil { - return nil, errors.Wrap(err, "malformed private key") + return nil, fmt.Errorf("malformed private key: %w", err) } // We will always use the first certificate inside of the root bundle as the active one @@ -741,13 +741,13 @@ func GetRemoteCA(ctx context.Context, d digest.Digest, connBroker *connectionbro if d != "" { verifier := d.Verifier() if err != nil { - return RootCA{}, errors.Wrap(err, "unexpected error getting digest verifier") + return RootCA{}, fmt.Errorf("unexpected error getting digest verifier: %w", err) } io.Copy(verifier, bytes.NewReader(response.Certificate)) if !verifier.Verified() { - return RootCA{}, errors.Errorf("remote CA does not match fingerprint. Expected: %s", d.Encoded()) + return RootCA{}, fmt.Errorf("remote CA does not match fingerprint. Expected: %s", d.Encoded()) } } diff --git a/ca/config.go b/ca/config.go index 8311048173..60d1ca3ae2 100644 --- a/ca/config.go +++ b/ca/config.go @@ -5,6 +5,7 @@ import ( cryptorand "crypto/rand" "crypto/tls" "crypto/x509" + "errors" "fmt" "math/big" "math/rand" @@ -17,7 +18,6 @@ import ( cfconfig "github.com/cloudflare/cfssl/config" events "github.com/docker/go-events" "github.com/opencontainers/go-digest" - "github.com/pkg/errors" "google.golang.org/grpc/credentials" "github.com/moby/swarmkit/v2/api" @@ -185,7 +185,7 @@ func validateRootCAAndTLSCert(rootCA *RootCA, tlsKeyPair *tls.Certificate) error for i, derBytes := range tlsKeyPair.Certificate { parsed, err := x509.ParseCertificate(derBytes) if err != nil { - return errors.Wrap(err, "could not validate new root certificates due to parse error") + return fmt.Errorf("could not validate new root certificates due to parse error: %w", err) } if i == 0 { leafCert = parsed @@ -201,7 +201,7 @@ func validateRootCAAndTLSCert(rootCA *RootCA, tlsKeyPair *tls.Certificate) error Intermediates: intermediatePool, } if _, err := leafCert.Verify(opts); err != nil { - return errors.Wrap(err, "new root CA does not match existing TLS credentials") + return fmt.Errorf("new root CA does not match existing TLS credentials: %w", err) } return nil } @@ -285,20 +285,20 @@ func (s *SecurityConfig) updateTLSCredentials(certificate *tls.Certificate, issu certs := []tls.Certificate{*certificate} clientConfig, err := NewClientTLSConfig(certs, s.rootCA.Pool, ManagerRole) if err != nil { - return errors.Wrap(err, "failed to create a new client config using the new root CA") + return fmt.Errorf("failed to create a new client config using the new root CA: %w", err) } serverConfig, err := NewServerTLSConfig(certs, s.rootCA.Pool) if err != nil { - return errors.Wrap(err, "failed to create a new server config using the new root CA") + return fmt.Errorf("failed to create a new server config using the new root CA: %w", err) } if err := s.ClientTLSCreds.loadNewTLSConfig(clientConfig); err != nil { - return errors.Wrap(err, "failed to update the client credentials") + return fmt.Errorf("failed to update the client credentials: %w", err) } if err := s.ServerTLSCreds.loadNewTLSConfig(serverConfig); err != nil { - return errors.Wrap(err, "failed to update the server TLS credentials") + return fmt.Errorf("failed to update the server TLS credentials: %w", err) } s.certificate = certificate @@ -376,7 +376,7 @@ func GenerateJoinToken(rootCA *RootCA, fips bool) string { var secretBytes [generatedSecretEntropyBytes]byte if _, err := cryptorand.Read(secretBytes[:]); err != nil { - panic(fmt.Errorf("failed to read random bytes: %v", err)) + panic(fmt.Errorf("failed to read random bytes: %w", err)) } var nn, dgst big.Int @@ -525,8 +525,8 @@ func (rootCA RootCA) CreateSecurityConfig(ctx context.Context, krw *KeyReadWrite proposedRole := ManagerRole tlsKeyPair, issuerInfo, err := rootCA.IssueAndSaveNewCertificates(krw, cn, proposedRole, org) - switch errors.Cause(err) { - case ErrNoValidSigner: + switch { + case errors.Is(err, ErrNoValidSigner): config.RetryInterval = GetCertRetryInterval // Request certificate issuance from a remote CA. // Last argument is nil because at this point we don't have any valid TLS creds @@ -535,7 +535,7 @@ func (rootCA RootCA) CreateSecurityConfig(ctx context.Context, krw *KeyReadWrite log.G(ctx).WithError(err).Error("failed to request and save new certificate") return nil, nil, err } - case nil: + case err == nil: log.G(ctx).WithFields(log.Fields{ "node.id": cn, "node.role": proposedRole, @@ -604,7 +604,8 @@ func RenewTLSConfigNow(ctx context.Context, s *SecurityConfig, connBroker *conne ConnBroker: connBroker, Credentials: s.ClientTLSCreds, }) - if wrappedError, ok := err.(x509UnknownAuthError); ok { + var wrappedError x509UnknownAuthError + if errors.As(err, &wrappedError) { var newErr error tlsKeyPair, issuerInfo, newErr = updateRootThenUpdateCert(ctx, s, connBroker, rootPaths, wrappedError.failedLeafCert) if newErr != nil { @@ -717,7 +718,7 @@ func ParseRole(apiRole api.NodeRole) (string, error) { case api.NodeRoleWorker: return WorkerRole, nil default: - return "", errors.Errorf("failed to parse api role: %v", apiRole) + return "", fmt.Errorf("failed to parse api role: %v", apiRole) } } @@ -729,6 +730,6 @@ func FormatRole(role string) (api.NodeRole, error) { case strings.ToLower(WorkerRole): return api.NodeRoleWorker, nil default: - return 0, errors.Errorf("failed to parse role: %s", role) + return 0, fmt.Errorf("failed to parse role: %s", role) } } diff --git a/ca/config_test.go b/ca/config_test.go index 4df27a8516..ea6f44f7ae 100644 --- a/ca/config_test.go +++ b/ca/config_test.go @@ -5,6 +5,7 @@ import ( "context" "crypto/tls" "crypto/x509" + "errors" "net" "os" "path/filepath" @@ -13,11 +14,13 @@ import ( "testing" "time" + cfconfig "github.com/cloudflare/cfssl/config" + "github.com/cloudflare/cfssl/helpers" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/credentials" - cfconfig "github.com/cloudflare/cfssl/config" - "github.com/cloudflare/cfssl/helpers" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/ca" cautils "github.com/moby/swarmkit/v2/ca/testutils" @@ -25,9 +28,6 @@ import ( "github.com/moby/swarmkit/v2/manager/state" "github.com/moby/swarmkit/v2/manager/state/store" "github.com/moby/swarmkit/v2/testutils" - "github.com/pkg/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestDownloadRootCASuccess(t *testing.T) { @@ -236,11 +236,12 @@ func TestLoadSecurityConfigExpiredCert(t *testing.T) { _, _, err = ca.LoadSecurityConfig(tc.Context, tc.RootCA, krw, false) require.Error(t, err) - require.IsType(t, x509.CertificateInvalidError{}, errors.Cause(err)) + var cie x509.CertificateInvalidError + require.ErrorAs(t, err, &cie) _, _, err = ca.LoadSecurityConfig(tc.Context, tc.RootCA, krw, true) require.Error(t, err) - require.IsType(t, x509.CertificateInvalidError{}, errors.Cause(err)) + require.ErrorAs(t, err, &cie) // a cert that is expired is not valid if expiry is not allowed invalidCert = cautils.ReDateCert(t, certBytes, tc.RootCA.Certs, s.Key, now.Add(-2*time.Minute), now.Add(-1*time.Minute)) @@ -248,7 +249,7 @@ func TestLoadSecurityConfigExpiredCert(t *testing.T) { _, _, err = ca.LoadSecurityConfig(tc.Context, tc.RootCA, krw, false) require.Error(t, err) - require.IsType(t, x509.CertificateInvalidError{}, errors.Cause(err)) + require.ErrorAs(t, err, &cie) // but it is valid if expiry is allowed _, cancel, err := ca.LoadSecurityConfig(tc.Context, tc.RootCA, krw, true) @@ -797,7 +798,8 @@ func TestRenewTLSConfigUpdatesRootNonUnknownAuthError(t *testing.T) { err = ca.RenewTLSConfigNow(tc.Context, secConfig, fakeCAServer.getConnBroker(), tc.Paths.RootCA) require.Error(t, err) - require.IsType(t, x509.CertificateInvalidError{}, errors.Cause(err)) + var cie x509.CertificateInvalidError + require.ErrorAs(t, err, &cie) require.NoError(t, <-signErr) } diff --git a/ca/external.go b/ca/external.go index 9c56a59e5d..44ff8e70d9 100644 --- a/ca/external.go +++ b/ca/external.go @@ -9,6 +9,8 @@ import ( "encoding/hex" "encoding/json" "encoding/pem" + "errors" + "fmt" "io" "net/http" "sync" @@ -19,7 +21,6 @@ import ( "github.com/cloudflare/cfssl/csr" "github.com/cloudflare/cfssl/signer" "github.com/moby/swarmkit/v2/log" - "github.com/pkg/errors" "golang.org/x/net/context/ctxhttp" ) @@ -114,7 +115,7 @@ func (eca *ExternalCA) Sign(ctx context.Context, req signer.SignRequest) (cert [ csrJSON, err := json.Marshal(req) if err != nil { - return nil, errors.Wrap(err, "unable to JSON-encode CFSSL signing request") + return nil, fmt.Errorf("unable to JSON-encode CFSSL signing request: %w", err) } // Try each configured proxy URL. Return after the first success. If @@ -186,29 +187,29 @@ func (eca *ExternalCA) CrossSignRootCA(ctx context.Context, rca RootCA) ([]byte, func makeExternalSignRequest(ctx context.Context, client *http.Client, url string, csrJSON []byte) (cert []byte, err error) { resp, err := ctxhttp.Post(ctx, client, url, "application/json", bytes.NewReader(csrJSON)) if err != nil { - return nil, recoverableErr{err: errors.Wrap(err, "unable to perform certificate signing request")} + return nil, recoverableErr{err: fmt.Errorf("unable to perform certificate signing request: %w", err)} } defer resp.Body.Close() b := io.LimitReader(resp.Body, CertificateMaxSize) body, err := io.ReadAll(b) if err != nil { - return nil, recoverableErr{err: errors.Wrap(err, "unable to read CSR response body")} + return nil, recoverableErr{err: fmt.Errorf("unable to read CSR response body: %w", err)} } if resp.StatusCode != http.StatusOK { - return nil, recoverableErr{err: errors.Errorf("unexpected status code in CSR response: %d - %s", resp.StatusCode, string(body))} + return nil, recoverableErr{err: fmt.Errorf("unexpected status code in CSR response: %d - %s", resp.StatusCode, string(body))} } var apiResponse api.Response if err := json.Unmarshal(body, &apiResponse); err != nil { log.G(ctx).Debugf("unable to JSON-parse CFSSL API response body: %s", string(body)) - return nil, recoverableErr{err: errors.Wrap(err, "unable to parse JSON response")} + return nil, recoverableErr{err: fmt.Errorf("unable to parse JSON response: %w", err)} } if !apiResponse.Success || apiResponse.Result == nil { if len(apiResponse.Errors) > 0 { - return nil, errors.Errorf("response errors: %v", apiResponse.Errors) + return nil, fmt.Errorf("response errors: %v", apiResponse.Errors) } return nil, errors.New("certificate signing request failed") @@ -216,12 +217,12 @@ func makeExternalSignRequest(ctx context.Context, client *http.Client, url strin result, ok := apiResponse.Result.(map[string]any) if !ok { - return nil, errors.Errorf("invalid result type: %T", apiResponse.Result) + return nil, fmt.Errorf("invalid result type: %T", apiResponse.Result) } certPEM, ok := result["certificate"].(string) if !ok { - return nil, errors.Errorf("invalid result certificate field type: %T", result["certificate"]) + return nil, fmt.Errorf("invalid result certificate field type: %T", result["certificate"]) } return []byte(certPEM), nil diff --git a/ca/keyreadwriter.go b/ca/keyreadwriter.go index 55f7d6ba4a..cdac405624 100644 --- a/ca/keyreadwriter.go +++ b/ca/keyreadwriter.go @@ -1,20 +1,20 @@ package ca import ( + "crypto/tls" "crypto/x509" "encoding/pem" + "errors" + "fmt" "os" "path/filepath" "strconv" "strings" "sync" - "crypto/tls" - "github.com/moby/swarmkit/v2/ca/keyutils" "github.com/moby/swarmkit/v2/ca/pkcs8" "github.com/moby/swarmkit/v2/ioutils" - "github.com/pkg/errors" ) const ( @@ -195,7 +195,7 @@ func (k *KeyReadWriter) Read() ([]byte, []byte, error) { if k.headersObj != nil { newHeaders, err := k.headersObj.UnmarshalHeaders(keyBlock.Headers, k.kekData) if err != nil { - return nil, nil, errors.Wrap(err, "unable to read TLS key headers") + return nil, nil, fmt.Errorf("unable to read TLS key headers: %w", err) } k.headersObj = newHeaders } @@ -385,7 +385,7 @@ func (k *KeyReadWriter) readKey() (*pem.Block, error) { } derBytes, err := k.keyFormatter.DecryptPEMBlock(keyBlock, k.kekData.KEK) - if err == keyutils.ErrFIPSUnsupportedKeyFormat { + if errors.Is(err, keyutils.ErrFIPSUnsupportedKeyFormat) { return nil, err } else if err != nil { return nil, ErrInvalidKEK{Wrapped: err} diff --git a/ca/reconciler.go b/ca/reconciler.go index 01a9558ece..ae1c7f361c 100644 --- a/ca/reconciler.go +++ b/ca/reconciler.go @@ -3,6 +3,7 @@ package ca import ( "bytes" "context" + "errors" "fmt" "reflect" "sync" @@ -13,7 +14,6 @@ import ( "github.com/moby/swarmkit/v2/api/equality" "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/state/store" - "github.com/pkg/errors" ) // IssuanceStateRotateMaxBatchSize is the maximum number of nodes we'll tell to rotate their certificates in any given update @@ -54,7 +54,7 @@ func IssuerFromAPIRootCA(rootCA *api.RootCA) (*IssuerInfo, error) { } issuerCerts, err := helpers.ParseCertificatesPEM(wantedIssuer) if err != nil { - return nil, errors.Wrap(err, "invalid certificate in cluster root CA object") + return nil, fmt.Errorf("invalid certificate in cluster root CA object: %w", err) } if len(issuerCerts) == 0 { return nil, errors.New("invalid certificate in cluster root CA object") @@ -166,7 +166,7 @@ func (r *rootRotationReconciler) runReconcilerLoop(ctx context.Context, loopRoot return } log.G(r.ctx).WithError(err).Error("could not complete root rotation") - if err == errRootRotationChanged { + if errors.Is(err, errRootRotationChanged) { // if the root rotation has changed, this loop will be cancelled anyway, so may as well abort early return } @@ -222,7 +222,7 @@ func (r *rootRotationReconciler) finishRootRotation(tx store.Tx, expectedRootCA updatedRootCA, err := NewRootCA(cluster.RootCA.RootRotation.CACert, signerCert, cluster.RootCA.RootRotation.CAKey, DefaultNodeCertExpiration, nil) if err != nil { - return errors.Wrap(err, "invalid cluster root rotation object") + return fmt.Errorf("invalid cluster root rotation object: %w", err) } cluster.RootCA = api.RootCA{ CACert: cluster.RootCA.RootRotation.CACert, @@ -249,7 +249,7 @@ func (r *rootRotationReconciler) batchUpdateNodes(toUpdate []*api.Node) error { for _, n := range toUpdate { if err := batch.Update(func(tx store.Tx) error { return store.UpdateNode(tx, n) - }); err != nil && err != store.ErrSequenceConflict { + }); err != nil && !errors.Is(err, store.ErrSequenceConflict) { log.G(r.ctx).WithError(err).Errorf("unable to update node %s to request a certificate rotation", n.ID) } } diff --git a/ca/renewer.go b/ca/renewer.go index 1eacab16df..69ad035204 100644 --- a/ca/renewer.go +++ b/ca/renewer.go @@ -2,13 +2,13 @@ package ca import ( "context" + "errors" "sync" "time" "github.com/docker/go-events" "github.com/moby/swarmkit/v2/connectionbroker" "github.com/moby/swarmkit/v2/log" - "github.com/pkg/errors" ) // RenewTLSExponentialBackoff sets the exponential backoff when trying to renew TLS certificates that have expired diff --git a/ca/server.go b/ca/server.go index 9ae1de5156..13c627e315 100644 --- a/ca/server.go +++ b/ca/server.go @@ -5,6 +5,8 @@ import ( "context" "crypto/subtle" "crypto/x509" + "errors" + "fmt" "sync" "time" @@ -14,7 +16,6 @@ import ( "github.com/moby/swarmkit/v2/identity" "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/state/store" - "github.com/pkg/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -332,7 +333,7 @@ func (s *Server) IssueNodeCertificate(ctx context.Context, request *api.IssueNod }).Debugf("new certificate entry added") break } - if err != store.ErrExist { + if !errors.Is(err, store.ErrExist) { return nil, err } if i == maxRetries { @@ -695,7 +696,7 @@ func (s *Server) UpdateRootCA(ctx context.Context, cluster *api.Cluster, reconci // Attempt to update our local RootCA with the new parameters updatedRootCA, err := RootCAFromAPI(rCA, expiry) if err != nil { - return errors.Wrap(err, "invalid Root CA object in cluster") + return fmt.Errorf("invalid Root CA object in cluster: %w", err) } s.localRootCA = &updatedRootCA @@ -791,7 +792,7 @@ func (s *Server) signNodeCert(ctx context.Context, node *api.Node) error { // Try using the external CA first. cert, err := externalCA.Sign(ctx, PrepareCSR(rawCSR, cn, ou, org)) - if err == ErrNoExternalCAURLs { + if errors.Is(err, ErrNoExternalCAURLs) { // No external CA servers configured. Try using the local CA. cert, err = rootCA.ParseValidateAndSignCSR(rawCSR, cn, ou, org) } @@ -808,7 +809,8 @@ func (s *Server) signNodeCert(ctx context.Context, node *api.Node) error { return errors.New("failed to sign CSR") } - if _, ok := err.(recoverableErr); ok { + var r recoverableErr + if errors.As(err, &r) { // Return without changing the state of the certificate. We may // retry signing it in the future. return errors.New("failed to sign CSR") @@ -818,7 +820,7 @@ func (s *Server) signNodeCert(ctx context.Context, node *api.Node) error { err = s.store.Update(func(tx store.Tx) error { node := store.GetNode(tx, nodeID) if node == nil { - return errors.Errorf("node %s not found", nodeID) + return fmt.Errorf("node %s not found", nodeID) } node.Certificate.Status = api.IssuanceStatus{ @@ -851,7 +853,7 @@ func (s *Server) signNodeCert(ctx context.Context, node *api.Node) error { if err != nil { node = store.GetNode(tx, nodeID) if node == nil { - err = errors.Errorf("node %s does not exist", nodeID) + err = fmt.Errorf("node %s does not exist", nodeID) } } return err @@ -865,7 +867,7 @@ func (s *Server) signNodeCert(ctx context.Context, node *api.Node) error { delete(s.pending, node.ID) break } - if err == store.ErrSequenceConflict { + if errors.Is(err, store.ErrSequenceConflict) { continue } diff --git a/ca/server_test.go b/ca/server_test.go index c0cfb54804..f8de84735f 100644 --- a/ca/server_test.go +++ b/ca/server_test.go @@ -5,6 +5,7 @@ import ( "context" "crypto/tls" "crypto/x509" + "errors" "fmt" "path/filepath" "reflect" @@ -20,7 +21,6 @@ import ( "github.com/moby/swarmkit/v2/manager/state/store" "github.com/moby/swarmkit/v2/testutils" "github.com/opencontainers/go-digest" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -408,7 +408,7 @@ func TestGetUnlockKey(t *testing.T) { require.NoError(t, testutils.PollFuncWithTimeout(nil, func() error { resp, err = tc.CAClients[0].GetUnlockKey(tc.Context, &api.GetUnlockKeyRequest{}) if err != nil { - return fmt.Errorf("get unlock key: %v", err) + return fmt.Errorf("get unlock key: %w", err) } if !bytes.Equal(resp.UnlockKey, []byte("secret")) { return fmt.Errorf("secret hasn't rotated yet") @@ -480,7 +480,7 @@ func TestServerExternalCAGetsTLSKeypairUpdates(t *testing.T) { } return nil }, 2*time.Second)) - require.Contains(t, errors.Cause(err).Error(), "remote error: tls: expired certificate") + require.ErrorContains(t, err, "remote error: tls: expired certificate") } func TestCAServerUpdateRootCA(t *testing.T) { @@ -654,7 +654,7 @@ func (r *rootRotationTester) convergeRootCA(wantRootCA *api.RootCA, descr string require.NoError(r.t, r.tc.MemoryStore.Update(func(tx store.Tx) error { clusters, err := store.FindClusters(tx, store.All) if err != nil || len(clusters) != 1 { - return errors.Wrap(err, "unable to find cluster") + return fmt.Errorf("unable to find cluster: %w", err) } clusters[0].RootCA = *wantRootCA return store.UpdateCluster(tx, clusters[0]) @@ -1266,7 +1266,7 @@ func TestRootRotationReconciliationRace(t *testing.T) { return err } if !bytes.Equal(s.Key, rotationKey) { - return errors.Errorf("server %d's root CAs hasn't been updated yet", i) + return fmt.Errorf("server %d's root CAs hasn't been updated yet", i) } } return nil diff --git a/ca/testutils/externalutils.go b/ca/testutils/externalutils.go index 3d63f8dda7..e93355a18a 100644 --- a/ca/testutils/externalutils.go +++ b/ca/testutils/externalutils.go @@ -17,7 +17,6 @@ import ( cfsslerrors "github.com/cloudflare/cfssl/errors" "github.com/cloudflare/cfssl/signer" "github.com/moby/swarmkit/v2/ca" - "github.com/pkg/errors" ) var crossSignPolicy = config.SigningProfile{ @@ -56,7 +55,7 @@ func NewExternalSigningServer(rootCA ca.RootCA, basedir string) (*ExternalSignin } serverCert, _, err := rootCA.IssueAndSaveNewCertificates(ca.NewKeyReadWriter(serverPaths, nil, nil), serverCN, serverOU, "") if err != nil { - return nil, errors.Wrap(err, "unable to get TLS server certificate") + return nil, fmt.Errorf("unable to get TLS server certificate: %w", err) } serverTLSConfig := &tls.Config{ @@ -67,7 +66,7 @@ func NewExternalSigningServer(rootCA ca.RootCA, basedir string) (*ExternalSignin tlsListener, err := tls.Listen("tcp", "localhost:0", serverTLSConfig) if err != nil { - return nil, errors.Wrap(err, "unable to create TLS connection listener") + return nil, fmt.Errorf("unable to create TLS connection listener: %w", err) } assignedPort := tlsListener.Addr().(*net.TCPAddr).Port diff --git a/ca/transport.go b/ca/transport.go index 7f95ab986e..7e216233df 100644 --- a/ca/transport.go +++ b/ca/transport.go @@ -5,11 +5,11 @@ import ( "crypto/tls" "crypto/x509" "crypto/x509/pkix" + "errors" "net" "strings" "sync" - "github.com/pkg/errors" "google.golang.org/grpc/credentials" ) diff --git a/design/store.md b/design/store.md index 91fffd8e15..0d0334f2ff 100644 --- a/design/store.md +++ b/design/store.md @@ -105,10 +105,10 @@ Here is an example of a batch operation: node.Status.Message = `Node moved to "unknown" state due to leadership change in cluster` if err := d.nodes.AddUnknown(node, expireFunc); err != nil { - return errors.Wrap(err, `adding node in "unknown" state to node store failed`) + return fmt.Errorf(`adding node in "unknown" state to node store failed: %w`, err) } if err := store.UpdateNode(tx, node); err != nil { - return errors.Wrap(err, "update failed") + return fmt.Errorf("update failed: %w", err) } return nil }) diff --git a/go.mod b/go.mod index cc424438e0..e3ca41e955 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,6 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.27.6 github.com/opencontainers/go-digest v1.0.0 - github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a github.com/sirupsen/logrus v1.9.4 github.com/spf13/cobra v1.9.1 diff --git a/go.sum b/go.sum index 53b1245ffd..fee41ea242 100644 --- a/go.sum +++ b/go.sum @@ -160,8 +160,6 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= diff --git a/identity/randomid.go b/identity/randomid.go index 0eb13527aa..a26e7aab6d 100644 --- a/identity/randomid.go +++ b/identity/randomid.go @@ -45,7 +45,7 @@ func NewID() string { var p [randomIDEntropyBytes]byte if _, err := io.ReadFull(idReader, p[:]); err != nil { - panic(fmt.Errorf("failed to read random bytes: %v", err)) + panic(fmt.Errorf("failed to read random bytes: %w", err)) } p[0] |= 0x80 // set high bit to avoid the need for padding diff --git a/integration/cluster_test.go b/integration/cluster_test.go index 618a1d9cd3..278a504029 100644 --- a/integration/cluster_test.go +++ b/integration/cluster_test.go @@ -240,7 +240,7 @@ func (c *testCluster) RemoveNode(id string, graceful bool) error { // demote before removal if node.IsManager() { if err := c.SetNodeRole(id, api.NodeRoleWorker); err != nil { - return fmt.Errorf("demote manager: %v", err) + return fmt.Errorf("demote manager: %w", err) } } @@ -252,7 +252,7 @@ func (c *testCluster) RemoveNode(id string, graceful bool) error { if err := testutils.PollFuncWithTimeout(nil, func() error { resp, err := c.api.GetNode(context.Background(), &api.GetNodeRequest{NodeID: id}) if err != nil { - return fmt.Errorf("get node: %v", err) + return fmt.Errorf("get node: %w", err) } if resp.Node.Status.State != api.NodeStatus_DOWN { return fmt.Errorf("node %s is still not down", id) @@ -263,7 +263,7 @@ func (c *testCluster) RemoveNode(id string, graceful bool) error { } } if _, err := c.api.RemoveNode(context.Background(), &api.RemoveNodeRequest{NodeID: id, Force: !graceful}); err != nil { - return fmt.Errorf("remove node: %v", err) + return fmt.Errorf("remove node: %w", err) } return nil } diff --git a/integration/integration_test.go b/integration/integration_test.go index b1abe22dbd..45c85d4dde 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -3,6 +3,7 @@ package integration import ( "bytes" "context" + "errors" "flag" "fmt" "os" @@ -23,7 +24,6 @@ import ( "github.com/moby/swarmkit/v2/manager" "github.com/moby/swarmkit/v2/node" "github.com/moby/swarmkit/v2/testutils" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) @@ -538,7 +538,7 @@ func TestRestartLeader(t *testing.T) { } require.False(t, node.Status.State == api.NodeStatus_DOWN, "nodes shouldn't go to down") if node.Status.State != api.NodeStatus_READY { - return errors.Errorf("node %s is still not ready", node.ID) + return fmt.Errorf("node %s is still not ready", node.ID) } } return nil diff --git a/integration/node_test.go b/integration/node_test.go index 016a85f14d..67dcddd3bb 100644 --- a/integration/node_test.go +++ b/integration/node_test.go @@ -133,9 +133,9 @@ func (n *testNode) stop() error { os.Stderr.Write(buf) if isManager { - return fmt.Errorf("error stop manager %s: %v", n.node.NodeID(), err) + return fmt.Errorf("error stop manager %s: %w", n.node.NodeID(), err) } - return fmt.Errorf("error stop worker %s: %v", n.node.NodeID(), err) + return fmt.Errorf("error stop worker %s: %w", n.node.NodeID(), err) } return nil } diff --git a/manager/allocator/network.go b/manager/allocator/network.go index b79cb304ba..5b6c7865e9 100644 --- a/manager/allocator/network.go +++ b/manager/allocator/network.go @@ -2,6 +2,7 @@ package allocator import ( "context" + "errors" "fmt" "time" @@ -12,7 +13,6 @@ import ( "github.com/moby/swarmkit/v2/manager/state" "github.com/moby/swarmkit/v2/manager/state/store" "github.com/moby/swarmkit/v2/protobuf/ptypes" - "github.com/pkg/errors" ) const ( @@ -92,8 +92,8 @@ func (a *Allocator) doNetworkInit(ctx context.Context) (err error) { // allocated, before reading all network objects for allocation. // If not found, it means it was removed by user, nothing to do here. ingressNetwork, err := GetIngressNetwork(a.store) - switch err { - case nil: + switch { + case err == nil: // Try to complete ingress network allocation before anything else so // that the we can get the preferred subnet for ingress network. nc.ingressNetwork = ingressNetwork @@ -109,11 +109,11 @@ func (a *Allocator) doNetworkInit(ctx context.Context) (err error) { log.G(ctx).WithError(err).Error("failed committing allocation of ingress network during init") } } - case ErrNoIngress: + case errors.Is(err, ErrNoIngress): // Ingress network is not present in store, It means user removed it // and did not create a new one. default: - return errors.Wrap(err, "failure while looking for ingress network during init") + return fmt.Errorf("failure while looking for ingress network during init: %w", err) } // First, allocate (read it as restore) objects likes network,nodes,serives @@ -369,7 +369,7 @@ func (a *Allocator) getAllocatedNetworks() ([]*api.Network, error) { }) if err != nil { - return nil, errors.Wrap(err, "error listing all networks in store while trying to allocate during init") + return nil, fmt.Errorf("error listing all networks in store while trying to allocate during init: %w", err) } for _, n := range networks { @@ -457,13 +457,13 @@ func (a *Allocator) allocateNodes(ctx context.Context, existingAddressesOnly boo nodes, err = store.FindNodes(tx, store.All) }) if err != nil { - return errors.Wrap(err, "error listing all nodes in store while trying to allocate network resources") + return fmt.Errorf("error listing all nodes in store while trying to allocate network resources: %w", err) } for _, node := range nodes { networks, err := a.getNodeNetworks(node.ID) if err != nil { - return errors.Wrap(err, "error getting all networks needed by node") + return fmt.Errorf("error getting all networks needed by node: %w", err) } isAllocated := a.allocateNode(ctx, node, existingAddressesOnly, networks) if isAllocated { @@ -497,7 +497,7 @@ func (a *Allocator) deallocateNodes(ctx context.Context) error { nodes, err = store.FindNodes(tx, store.All) }) if err != nil { - return fmt.Errorf("error listing all nodes in store while trying to free network resources") + return errors.New("error listing all nodes in store while trying to free network resources") } for _, node := range nodes { @@ -527,7 +527,7 @@ func (a *Allocator) deallocateNodeAttachments(ctx context.Context, nid string) e nodes, err = store.FindNodes(tx, store.All) }) if err != nil { - return fmt.Errorf("error listing all nodes in store while trying to free network resources") + return errors.New("error listing all nodes in store while trying to free network resources") } for _, node := range nodes { @@ -601,7 +601,7 @@ func (a *Allocator) allocateNetworks(ctx context.Context, existingOnly bool) err networks, err = store.FindNetworks(tx, store.All) }) if err != nil { - return errors.Wrap(err, "error listing all networks in store while trying to allocate during init") + return fmt.Errorf("error listing all networks in store while trying to allocate during init: %w", err) } var allocatedNetworks []*api.Network @@ -654,7 +654,7 @@ func (a *Allocator) allocateServices(ctx context.Context, existingAddressesOnly services, err = store.FindServices(tx, store.All) }) if err != nil { - return errors.Wrap(err, "error listing all services in store while trying to allocate during init") + return fmt.Errorf("error listing all services in store while trying to allocate during init: %w", err) } var allocatedServices []*api.Service @@ -720,7 +720,7 @@ func (a *Allocator) allocateTasks(ctx context.Context, existingAddressesOnly boo tasks, err = store.FindTasks(tx, store.All) }) if err != nil { - return errors.Wrap(err, "error listing all tasks in store while trying to allocate during init") + return fmt.Errorf("error listing all tasks in store while trying to allocate during init: %w", err) } logger := log.G(ctx).WithField("method", "(*Allocator).allocateTasks") @@ -777,7 +777,7 @@ func (a *Allocator) allocateTasks(ctx context.Context, existingAddressesOnly boo err := a.allocateTask(ctx, t) if err == nil { allocatedTasks = append(allocatedTasks, t) - } else if err != errNoChanges { + } else if !errors.Is(err, errNoChanges) { logger.WithError(err).Errorf("failed allocating task %s during init", t.ID) nc.unallocatedTasks[t.ID] = t } @@ -1084,19 +1084,19 @@ func (a *Allocator) reallocateNode(ctx context.Context, nodeID string) error { node = store.GetNode(tx, nodeID) }) if node == nil { - return errors.Errorf("node %v cannot be found", nodeID) + return fmt.Errorf("node %v cannot be found", nodeID) } networks, err := a.getNodeNetworks(node.ID) if err != nil { - return errors.Wrapf(err, "error getting networks for node %v", nodeID) + return fmt.Errorf("error getting networks for node %v: %w", nodeID, err) } if a.allocateNode(ctx, node, false, networks) { // if something was allocated, commit the node if err := a.store.Batch(func(batch *store.Batch) error { return a.commitAllocatedNode(ctx, batch, node) }); err != nil { - return errors.Wrapf(err, "error committing allocation for node %v", nodeID) + return fmt.Errorf("error committing allocation for node %v: %w", nodeID, err) } } return nil @@ -1106,13 +1106,16 @@ func (a *Allocator) commitAllocatedNode(ctx context.Context, batch *store.Batch, if err := batch.Update(func(tx store.Tx) error { err := store.UpdateNode(tx, node) - if err == store.ErrSequenceConflict { + if errors.Is(err, store.ErrSequenceConflict) { storeNode := store.GetNode(tx, node.ID) storeNode.Attachments = node.Attachments err = store.UpdateNode(tx, storeNode) } - return errors.Wrapf(err, "failed updating state in store transaction for node %s", node.ID) + if err != nil { + return fmt.Errorf("failed updating state in store transaction for node %s: %w", node.ID, err) + } + return nil }); err != nil { if err := a.deallocateNode(node); err != nil { log.G(ctx).WithError(err).Errorf("failed rolling back allocation of node %s", node.ID) @@ -1175,7 +1178,7 @@ func (a *Allocator) allocateService(_ context.Context, s *api.Service, existingA // network only if it is not already done. if IsIngressNetworkNeeded(s) { if nc.ingressNetwork == nil { - return fmt.Errorf("ingress network is missing") + return errors.New("ingress network is missing") } var found bool for _, vip := range s.Endpoint.VirtualIPs { @@ -1248,13 +1251,16 @@ func (a *Allocator) commitAllocatedService(ctx context.Context, batch *store.Bat if err := batch.Update(func(tx store.Tx) error { err := store.UpdateService(tx, s) - if err == store.ErrSequenceConflict { + if errors.Is(err, store.ErrSequenceConflict) { storeService := store.GetService(tx, s.ID) storeService.Endpoint = s.Endpoint err = store.UpdateService(tx, storeService) } - return errors.Wrapf(err, "failed updating state in store transaction for service %s", s.ID) + if err != nil { + return fmt.Errorf("failed updating state in store transaction for service %s: %w", s.ID, err) + } + return nil }); err != nil { if err := a.netCtx.deallocateService(s); err != nil { log.G(ctx).WithError(err).Errorf("failed rolling back allocation of service %s", s.ID) @@ -1280,7 +1286,7 @@ func (a *Allocator) allocateNetwork(_ context.Context, n *api.Network) error { func (a *Allocator) commitAllocatedNetwork(ctx context.Context, batch *store.Batch, n *api.Network) error { if err := batch.Update(func(tx store.Tx) error { if err := store.UpdateNetwork(tx, n); err != nil { - return errors.Wrapf(err, "failed updating state in store transaction for network %s", n.ID) + return fmt.Errorf("failed updating state in store transaction for network %s: %w", n.ID, err) } return nil }); err != nil { @@ -1375,7 +1381,7 @@ func (a *Allocator) commitAllocatedTask(ctx context.Context, batch *store.Batch, retError := batch.Update(func(tx store.Tx) error { err := store.UpdateTask(tx, t) - if err == store.ErrSequenceConflict { + if errors.Is(err, store.ErrSequenceConflict) { storeTask := store.GetTask(tx, t.ID) taskUpdateNetworks(storeTask, t.Networks) taskUpdateEndpoint(storeTask, t.Endpoint) @@ -1385,7 +1391,10 @@ func (a *Allocator) commitAllocatedTask(ctx context.Context, batch *store.Batch, err = store.UpdateTask(tx, storeTask) } - return errors.Wrapf(err, "failed updating state in store transaction for task %s", t.ID) + if err != nil { + return fmt.Errorf("failed updating state in store transaction for task %s: %w", t.ID, err) + } + return nil }) if retError == nil { @@ -1487,7 +1496,7 @@ func (a *Allocator) procTasksNetwork(ctx context.Context, onRetry bool) { if err := a.allocateTask(ctx, t); err == nil { allocatedTasks = append(allocatedTasks, t) - } else if err != errNoChanges { + } else if !errors.Is(err, errNoChanges) { if quiet { log.G(ctx).WithError(err).Debug("task allocation failure") } else { diff --git a/manager/controlapi/config.go b/manager/controlapi/config.go index 6bb2f80ff6..4d067d1d72 100644 --- a/manager/controlapi/config.go +++ b/manager/controlapi/config.go @@ -3,6 +3,7 @@ package controlapi import ( "bytes" "context" + "errors" "strings" "github.com/moby/swarmkit/v2/api" @@ -161,10 +162,10 @@ func (s *Server) CreateConfig(ctx context.Context, request *api.CreateConfigRequ return store.CreateConfig(tx, config) }) - switch err { - case store.ErrNameConflict: + switch { + case errors.Is(err, store.ErrNameConflict): return nil, status.Errorf(codes.AlreadyExists, "config %s already exists", request.Spec.Annotations.Name) - case nil: + case err == nil: log.G(ctx).WithFields(log.Fields{ "config.Name": request.Spec.Annotations.Name, "method": "CreateConfig", @@ -217,10 +218,10 @@ func (s *Server) RemoveConfig(ctx context.Context, request *api.RemoveConfigRequ return store.DeleteConfig(tx, request.ConfigID) }) - switch err { - case store.ErrNotExist: + switch { + case errors.Is(err, store.ErrNotExist): return nil, status.Errorf(codes.NotFound, "config %s not found", request.ConfigID) - case nil: + case err == nil: log.G(ctx).WithFields(log.Fields{ "config.ID": request.ConfigID, "method": "RemoveConfig", diff --git a/manager/controlapi/extension.go b/manager/controlapi/extension.go index 32e3d4ac57..51ee0c4e9d 100644 --- a/manager/controlapi/extension.go +++ b/manager/controlapi/extension.go @@ -2,6 +2,7 @@ package controlapi import ( "context" + "errors" "strings" "github.com/moby/swarmkit/v2/api" @@ -32,10 +33,10 @@ func (s *Server) CreateExtension(ctx context.Context, request *api.CreateExtensi return store.CreateExtension(tx, extension) }) - switch err { - case store.ErrNameConflict: + switch { + case errors.Is(err, store.ErrNameConflict): return nil, status.Errorf(codes.AlreadyExists, "extension %s already exists", request.Annotations.Name) - case nil: + case err == nil: log.G(ctx).WithFields(log.Fields{ "extension.Name": request.Annotations.Name, "method": "CreateExtension", @@ -116,10 +117,10 @@ func (s *Server) RemoveExtension(ctx context.Context, request *api.RemoveExtensi return store.DeleteExtension(tx, request.ExtensionID) }) - switch err { - case store.ErrNotExist: + switch { + case errors.Is(err, store.ErrNotExist): return nil, status.Errorf(codes.NotFound, "extension %s not found", request.ExtensionID) - case nil: + case err == nil: log.G(ctx).WithFields(log.Fields{ "extension.ID": request.ExtensionID, "method": "RemoveExtension", diff --git a/manager/controlapi/network.go b/manager/controlapi/network.go index ce485aea2a..c2468ebb1e 100644 --- a/manager/controlapi/network.go +++ b/manager/controlapi/network.go @@ -2,6 +2,7 @@ package controlapi import ( "context" + "errors" "net" "github.com/moby/swarmkit/v2/api" @@ -118,7 +119,7 @@ func (s *Server) CreateNetwork(_ context.Context, request *api.CreateNetworkRequ if request.Spec.Ingress { if n, err := allocator.GetIngressNetwork(s.store); err == nil { return status.Errorf(codes.AlreadyExists, "ingress network (%s) is already present", n.ID) - } else if err != allocator.ErrNoIngress { + } else if !errors.Is(err, allocator.ErrNoIngress) { return status.Errorf(codes.Internal, "failed ingress network presence check: %v", err) } } @@ -187,7 +188,7 @@ func (s *Server) RemoveNetwork(_ context.Context, request *api.RemoveNetworkRequ } if err := rm(n.ID); err != nil { - if err == store.ErrNotExist { + if errors.Is(err, store.ErrNotExist) { return nil, status.Errorf(codes.NotFound, "network %s not found", request.NetworkID) } return nil, err diff --git a/manager/controlapi/resource.go b/manager/controlapi/resource.go index 37e930ac94..8116cbd9f7 100644 --- a/manager/controlapi/resource.go +++ b/manager/controlapi/resource.go @@ -2,6 +2,7 @@ package controlapi import ( "context" + "errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -39,16 +40,16 @@ func (s *Server) CreateResource(ctx context.Context, request *api.CreateResource return store.CreateResource(tx, r) }) - switch err { - case store.ErrNoKind: + switch { + case errors.Is(err, store.ErrNoKind): return nil, status.Errorf(codes.InvalidArgument, "Kind %v is not registered", r.Kind) - case store.ErrNameConflict: + case errors.Is(err, store.ErrNameConflict): return nil, status.Errorf( codes.AlreadyExists, "A resource with name %v already exists", r.Annotations.Name, ) - case nil: + case err == nil: log.G(ctx).WithFields(log.Fields{ "resource.Name": r.Annotations.Name, "method": "CreateResource", @@ -91,10 +92,10 @@ func (s *Server) RemoveResource(_ context.Context, request *api.RemoveResourceRe err := s.store.Update(func(tx store.Tx) error { return store.DeleteResource(tx, request.ResourceID) }) - switch err { - case store.ErrNotExist: + switch { + case errors.Is(err, store.ErrNotExist): return nil, status.Errorf(codes.NotFound, "resource %s not found", request.ResourceID) - case nil: + case err == nil: return &api.RemoveResourceResponse{}, nil default: return nil, err @@ -212,10 +213,10 @@ func (s *Server) UpdateResource(_ context.Context, request *api.UpdateResourceRe return store.UpdateResource(tx, r) }) - switch err { - case store.ErrSequenceConflict: + switch { + case errors.Is(err, store.ErrSequenceConflict): return nil, status.Errorf(codes.InvalidArgument, "update out of sequence") - case nil: + case err == nil: return &api.UpdateResourceResponse{ Resource: r, }, nil diff --git a/manager/controlapi/secret.go b/manager/controlapi/secret.go index 9a1bb0e5f2..6160a2b0c3 100644 --- a/manager/controlapi/secret.go +++ b/manager/controlapi/secret.go @@ -3,6 +3,7 @@ package controlapi import ( "context" "crypto/subtle" + "errors" "strings" "github.com/moby/swarmkit/v2/api" @@ -168,10 +169,10 @@ func (s *Server) CreateSecret(ctx context.Context, request *api.CreateSecretRequ return store.CreateSecret(tx, secret) }) - switch err { - case store.ErrNameConflict: + switch { + case errors.Is(err, store.ErrNameConflict): return nil, status.Errorf(codes.AlreadyExists, "secret %s already exists", request.Spec.Annotations.Name) - case nil: + case err == nil: secret.Spec.Data = nil // clean the actual secret data so it's never returned log.G(ctx).WithFields(log.Fields{ "secret.Name": request.Spec.Annotations.Name, @@ -225,10 +226,10 @@ func (s *Server) RemoveSecret(ctx context.Context, request *api.RemoveSecretRequ return store.DeleteSecret(tx, request.SecretID) }) - switch err { - case store.ErrNotExist: + switch { + case errors.Is(err, store.ErrNotExist): return nil, status.Errorf(codes.NotFound, "secret %s not found", request.SecretID) - case nil: + case err == nil: log.G(ctx).WithFields(log.Fields{ "secret.ID": request.SecretID, "method": "RemoveSecret", diff --git a/manager/controlapi/service.go b/manager/controlapi/service.go index ef79d776cf..2c7d60a8bd 100644 --- a/manager/controlapi/service.go +++ b/manager/controlapi/service.go @@ -751,7 +751,7 @@ func (s *Server) CreateService(_ context.Context, request *api.CreateServiceRequ } if allocator.IsIngressNetworkNeeded(service) { - if _, err := allocator.GetIngressNetwork(s.store); err == allocator.ErrNoIngress { + if _, err := allocator.GetIngressNetwork(s.store); errors.Is(err, allocator.ErrNoIngress) { return nil, status.Errorf(codes.FailedPrecondition, "service needs ingress network, but no ingress network is present") } } @@ -770,13 +770,13 @@ func (s *Server) CreateService(_ context.Context, request *api.CreateServiceRequ return store.CreateService(tx, service) }) - switch err { - case store.ErrNameConflict: + switch { + case errors.Is(err, store.ErrNameConflict): // Enhance the name-confict error to include the service name. The original // `ErrNameConflict` error-message is included for backward-compatibility // with older consumers of the API performing string-matching. return nil, status.Errorf(codes.AlreadyExists, "%s: service %s already exists", err.Error(), request.Spec.Annotations.Name) - case nil: + case err == nil: return &api.CreateServiceResponse{Service: service}, nil default: return nil, err @@ -919,7 +919,7 @@ func (s *Server) UpdateService(_ context.Context, request *api.UpdateServiceRequ } if allocator.IsIngressNetworkNeeded(service) { - if _, err := allocator.GetIngressNetwork(s.store); err == allocator.ErrNoIngress { + if _, err := allocator.GetIngressNetwork(s.store); errors.Is(err, allocator.ErrNoIngress) { return status.Errorf(codes.FailedPrecondition, "service needs ingress network, but no ingress network is present") } } @@ -948,7 +948,7 @@ func (s *Server) RemoveService(_ context.Context, request *api.RemoveServiceRequ return store.DeleteService(tx, request.ServiceID) }) if err != nil { - if err == store.ErrNotExist { + if errors.Is(err, store.ErrNotExist) { return nil, status.Errorf(codes.NotFound, "service %s not found", request.ServiceID) } return nil, err @@ -997,8 +997,8 @@ func (s *Server) ListServices(_ context.Context, request *api.ListServicesReques } }) if err != nil { - switch err { - case store.ErrInvalidFindBy: + switch { + case errors.Is(err, store.ErrInvalidFindBy): return nil, status.Error(codes.InvalidArgument, err.Error()) default: return nil, err diff --git a/manager/controlapi/task.go b/manager/controlapi/task.go index 346365af06..2efd45fcf2 100644 --- a/manager/controlapi/task.go +++ b/manager/controlapi/task.go @@ -2,6 +2,7 @@ package controlapi import ( "context" + "errors" "slices" "github.com/moby/swarmkit/v2/api" @@ -45,7 +46,7 @@ func (s *Server) RemoveTask(_ context.Context, request *api.RemoveTaskRequest) ( return store.DeleteTask(tx, request.TaskID) }) if err != nil { - if err == store.ErrNotExist { + if errors.Is(err, store.ErrNotExist) { return nil, status.Errorf(codes.NotFound, "task %s not found", request.TaskID) } return nil, err diff --git a/manager/controlapi/volume_test.go b/manager/controlapi/volume_test.go index 8c6a237a35..f3f65579b2 100644 --- a/manager/controlapi/volume_test.go +++ b/manager/controlapi/volume_test.go @@ -368,7 +368,7 @@ func TestUpdateVolumeInvalidFields(t *testing.T) { name: "Secrets", apply: func(spec *api.VolumeSpec) { spec.Secrets = []*api.VolumeSecret{ - &api.VolumeSecret{Key: "mykey", Secret: "mysecret"}, + {Key: "mykey", Secret: "mysecret"}, } }, }, { diff --git a/manager/deks.go b/manager/deks.go index e31bc42606..325d297e7a 100644 --- a/manager/deks.go +++ b/manager/deks.go @@ -3,7 +3,7 @@ package manager import ( "crypto/subtle" "encoding/base64" - "fmt" + "errors" "github.com/moby/swarmkit/v2/ca" "github.com/moby/swarmkit/v2/manager/encryption" @@ -62,7 +62,7 @@ func (r RaftDEKData) UnmarshalHeaders(headers map[string]string, kekData ca.KEKD } if pendingDEK != nil && currentDEK == nil { - return nil, fmt.Errorf("there is a pending DEK, but no current DEK") + return nil, errors.New("there is a pending DEK, but no current DEK") } _, ok := headers[pemHeaderRaftDEKNeedsRotation] @@ -120,7 +120,7 @@ func compareKEKs(oldKEK, candidateKEK ca.KEKData) (bool, bool, error) { keksEqual := subtle.ConstantTimeCompare(oldKEK.KEK, candidateKEK.KEK) == 1 switch { case oldKEK.Version == candidateKEK.Version && !keksEqual: - return false, false, fmt.Errorf("candidate KEK has the same version as the current KEK, but a different KEK value") + return false, false, errors.New("candidate KEK has the same version as the current KEK, but a different KEK value") case oldKEK.Version >= candidateKEK.Version || keksEqual: return false, false, nil default: @@ -136,11 +136,11 @@ type RaftDEKManager struct { FIPS bool } -var errNoUpdateNeeded = fmt.Errorf("don't need to rotate or update") +var errNoUpdateNeeded = errors.New("don't need to rotate or update") // this error is returned if the KeyReadWriter's PEMKeyHeaders object is no longer a RaftDEKData object - // this can happen if the node is no longer a manager, for example -var errNotUsingRaftDEKData = fmt.Errorf("RaftDEKManager can no longer store and manage TLS key headers") +var errNotUsingRaftDEKData = errors.New("RaftDEKManager can no longer store and manage TLS key headers") // NewRaftDEKManager returns a RaftDEKManager that uses the current key writer // and header manager @@ -159,7 +159,7 @@ func NewRaftDEKManager(kw ca.KeyWriter, fips bool) (*RaftDEKManager, error) { } return nil, errNoUpdateNeeded }) - if err != nil && err != errNoUpdateNeeded { + if err != nil && !errors.Is(err, errNoUpdateNeeded) { return nil, err } return &RaftDEKManager{ @@ -259,7 +259,7 @@ func (r *RaftDEKManager) MaybeUpdateKEK(candidateKEK ca.KEKData) (bool, bool, er } return candidateKEK, data, nil }) - if err == errNoUpdateNeeded { + if errors.Is(err, errNoUpdateNeeded) { err = nil } diff --git a/manager/deks_test.go b/manager/deks_test.go index 7f25010bfa..276bacc70c 100644 --- a/manager/deks_test.go +++ b/manager/deks_test.go @@ -10,7 +10,6 @@ import ( "github.com/moby/swarmkit/v2/ca" cautils "github.com/moby/swarmkit/v2/ca/testutils" "github.com/moby/swarmkit/v2/manager/state/raft" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) @@ -512,12 +511,13 @@ O0T3aXuZGYNyh//KqAoA3erCmh6HauMz84Y= krw := ca.NewKeyReadWriter(path.Node, wrongKEK, RaftDEKData{}) _, _, err = krw.Read() - require.IsType(t, ca.ErrInvalidKEK{}, errors.Cause(err)) + var eiK ca.ErrInvalidKEK + require.ErrorAs(t, err, &eiK) krw = ca.NewKeyReadWriter(path.Node, falsePositiveKEK, RaftDEKData{}) _, _, err = krw.Read() require.Error(t, err) - require.IsType(t, ca.ErrInvalidKEK{}, errors.Cause(err)) + require.ErrorAs(t, err, &eiK) krw = ca.NewKeyReadWriter(path.Node, realKEK, RaftDEKData{}) _, _, err = krw.Read() diff --git a/manager/dispatcher/assignments.go b/manager/dispatcher/assignments.go index a7e3da0927..407ec8e0d6 100644 --- a/manager/dispatcher/assignments.go +++ b/manager/dispatcher/assignments.go @@ -1,7 +1,7 @@ package dispatcher import ( - "fmt" + "errors" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/api/equality" @@ -446,7 +446,7 @@ func (a *assignmentSet) message() api.AssignmentsMessage { func (a *assignmentSet) secret(readTx store.ReadTx, task *api.Task, secretID string) (*api.Secret, bool, error) { secret := store.GetSecret(readTx, secretID) if secret == nil { - return nil, false, fmt.Errorf("secret not found") + return nil, false, errors.New("secret not found") } if secret.Spec.Driver == nil { return secret, false, nil diff --git a/manager/dispatcher/dispatcher.go b/manager/dispatcher/dispatcher.go index 5bc230fec3..9755b18a30 100644 --- a/manager/dispatcher/dispatcher.go +++ b/manager/dispatcher/dispatcher.go @@ -2,6 +2,7 @@ package dispatcher import ( "context" + "errors" "fmt" "net" "strconv" @@ -20,7 +21,6 @@ import ( "github.com/moby/swarmkit/v2/protobuf/ptypes" "github.com/moby/swarmkit/v2/remotes" "github.com/moby/swarmkit/v2/watch" - "github.com/pkg/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -426,7 +426,7 @@ func (d *Dispatcher) markNodesUnknown(ctx context.Context) error { nodes, err = store.FindNodes(tx, store.All) }) if err != nil { - return errors.Wrap(err, "failed to get list of nodes") + return fmt.Errorf("failed to get list of nodes: %w", err) } err = d.store.Batch(func(batch *store.Batch) error { for _, n := range nodes { @@ -466,10 +466,10 @@ func (d *Dispatcher) markNodesUnknown(ctx context.Context) error { } } if err := d.nodes.AddUnknown(node, expireFunc); err != nil { - return errors.Wrapf(err, `adding node %s in "unknown" state to node store failed`, nodeID) + return fmt.Errorf(`adding node %s in "unknown" state to node store failed: %w`, nodeID, err) } if err := store.UpdateNode(tx, node); err != nil { - return errors.Wrapf(err, "update for node %s failed", nodeID) + return fmt.Errorf("update for node %s failed: %w", nodeID, err) } return nil }) @@ -544,7 +544,7 @@ func nodeIPFromContext(ctx context.Context) (string, error) { } addr, _, err := net.SplitHostPort(nodeInfo.RemoteAddr) if err != nil { - return "", errors.Wrap(err, "unable to get ip from addr:port") + return "", fmt.Errorf("unable to get ip from addr:port: %w", err) } return addr, nil } @@ -1307,7 +1307,7 @@ func (d *Dispatcher) markNodeNotReady(id string, state api.NodeStatus_State, mes } if rn := d.nodes.Delete(id); rn == nil { - return errors.Errorf("node %s is not found in local storage", id) + return fmt.Errorf("node %s is not found in local storage", id) } logLocal.Debugf("deleted node %s from node store", node.ID) diff --git a/manager/dispatcher/dispatcher_test.go b/manager/dispatcher/dispatcher_test.go index 6f593ed792..8527b48b87 100644 --- a/manager/dispatcher/dispatcher_test.go +++ b/manager/dispatcher/dispatcher_test.go @@ -2398,7 +2398,7 @@ func (mc *MockPluginClient) Call(method string, args, ret any) error { } jsonRes, err := json.Marshal(res) if err != nil { - return fmt.Errorf("error marshalling response: %v", err) + return fmt.Errorf("error marshalling response: %w", err) } return json.Unmarshal(jsonRes, ret) } diff --git a/manager/drivers/provider.go b/manager/drivers/provider.go index 1dd3fa620b..ea80a7075f 100644 --- a/manager/drivers/provider.go +++ b/manager/drivers/provider.go @@ -1,7 +1,7 @@ package drivers import ( - "fmt" + "errors" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/node/plugin" @@ -20,10 +20,10 @@ func New(pluginGetter plugin.Getter) *DriverProvider { // NewSecretDriver creates a new driver for fetching secrets func (m *DriverProvider) NewSecretDriver(driver *api.Driver) (*SecretDriver, error) { if m.pluginGetter == nil { - return nil, fmt.Errorf("plugin getter is nil") + return nil, errors.New("plugin getter is nil") } if driver == nil || driver.Name == "" { - return nil, fmt.Errorf("driver specification is nil") + return nil, errors.New("driver specification is nil") } // Search for the specified plugin plugin, err := m.pluginGetter.Get(driver.Name, SecretsProviderCapability) diff --git a/manager/drivers/secrets.go b/manager/drivers/secrets.go index 8faf88679b..84057bf9e6 100644 --- a/manager/drivers/secrets.go +++ b/manager/drivers/secrets.go @@ -2,7 +2,6 @@ package drivers import ( "errors" - "fmt" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/api/naming" @@ -33,10 +32,10 @@ func NewSecretDriver(plugin plugin.Plugin) *SecretDriver { // the driver returns an error in the payload. func (d *SecretDriver) Get(spec *api.SecretSpec, task *api.Task) ([]byte, bool, error) { if spec == nil { - return nil, false, fmt.Errorf("secret spec is nil") + return nil, false, errors.New("secret spec is nil") } if task == nil { - return nil, false, fmt.Errorf("task is nil") + return nil, false, errors.New("task is nil") } var secretResp SecretsProviderResponse diff --git a/manager/encryption/encryption.go b/manager/encryption/encryption.go index 45d98cf6ef..186a423029 100644 --- a/manager/encryption/encryption.go +++ b/manager/encryption/encryption.go @@ -3,13 +3,13 @@ package encryption import ( cryptorand "crypto/rand" "encoding/base64" + "errors" "fmt" "io" "strings" "github.com/gogo/protobuf/proto" "github.com/moby/swarmkit/v2/api" - "github.com/pkg/errors" ) // This package defines the interfaces and encryption package @@ -39,7 +39,7 @@ type noopCrypter struct{} func (n noopCrypter) Decrypt(e api.MaybeEncryptedRecord) ([]byte, error) { if e.Algorithm != n.Algorithm() { - return nil, fmt.Errorf("record is encrypted") + return nil, errors.New("record is encrypted") } return e.Data, nil } @@ -135,17 +135,17 @@ func Decrypt(encryptd []byte, decrypter Decrypter) ([]byte, error) { // Encrypt turns a slice of bytes into a serialized MaybeEncryptedRecord slice of bytes func Encrypt(plaintext []byte, encrypter Encrypter) ([]byte, error) { if encrypter == nil { - return nil, fmt.Errorf("no encrypter specified") + return nil, errors.New("no encrypter specified") } encryptedRecord, err := encrypter.Encrypt(plaintext) if err != nil { - return nil, errors.Wrap(err, "unable to encrypt data") + return nil, fmt.Errorf("unable to encrypt data: %w", err) } data, err := proto.Marshal(encryptedRecord) if err != nil { - return nil, errors.Wrap(err, "unable to marshal as MaybeEncryptedRecord") + return nil, fmt.Errorf("unable to marshal as MaybeEncryptedRecord: %w", err) } return data, nil @@ -168,7 +168,7 @@ func GenerateSecretKey() []byte { secretData := make([]byte, naclSecretboxKeySize) if _, err := io.ReadFull(cryptorand.Reader, secretData); err != nil { // panic if we can't read random data - panic(errors.Wrap(err, "failed to read random bytes")) + panic(fmt.Errorf("failed to read random bytes: %w", err)) } return secretData } @@ -183,11 +183,11 @@ func HumanReadableKey(key []byte) string { // said keys func ParseHumanReadableKey(key string) ([]byte, error) { if !strings.HasPrefix(key, humanReadablePrefix) { - return nil, fmt.Errorf("invalid key string") + return nil, errors.New("invalid key string") } keyBytes, err := base64.RawStdEncoding.DecodeString(strings.TrimPrefix(key, humanReadablePrefix)) if err != nil { - return nil, fmt.Errorf("invalid key string") + return nil, errors.New("invalid key string") } return keyBytes, nil } diff --git a/manager/encryption/fernet.go b/manager/encryption/fernet.go index fea08d2939..2c69e42cb4 100644 --- a/manager/encryption/fernet.go +++ b/manager/encryption/fernet.go @@ -1,6 +1,7 @@ package encryption import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -41,7 +42,7 @@ func (f Fernet) Encrypt(data []byte) (*api.MaybeEncryptedRecord, error) { // Decrypt decrypts a MaybeEncryptedRecord and returns some bytes func (f Fernet) Decrypt(record api.MaybeEncryptedRecord) ([]byte, error) { if record.Algorithm != f.Algorithm() { - return nil, fmt.Errorf("record is not a Fernet message") + return nil, errors.New("record is not a Fernet message") } // -1 skips the TTL check, since we don't care about message expiry diff --git a/manager/encryption/nacl.go b/manager/encryption/nacl.go index 2928d1294a..fe65d5b82a 100644 --- a/manager/encryption/nacl.go +++ b/manager/encryption/nacl.go @@ -2,6 +2,7 @@ package encryption import ( cryptorand "crypto/rand" + "errors" "fmt" "io" @@ -54,7 +55,7 @@ func (n NACLSecretbox) Encrypt(data []byte) (*api.MaybeEncryptedRecord, error) { // Decrypt decrypts a MaybeEncryptedRecord and returns some bytes func (n NACLSecretbox) Decrypt(record api.MaybeEncryptedRecord) ([]byte, error) { if record.Algorithm != n.Algorithm() { - return nil, fmt.Errorf("not a NACL secretbox record") + return nil, errors.New("not a NACL secretbox record") } if len(record.Nonce) != naclSecretboxNonceSize { return nil, fmt.Errorf("invalid nonce size for NACL secretbox: require 24, got %d", len(record.Nonce)) diff --git a/manager/keymanager/keymanager.go b/manager/keymanager/keymanager.go index df59d27922..73faf852d1 100644 --- a/manager/keymanager/keymanager.go +++ b/manager/keymanager/keymanager.go @@ -9,13 +9,14 @@ import ( "context" cryptorand "crypto/rand" "encoding/binary" + "errors" + "fmt" "sync" "time" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/state/store" - "github.com/pkg/errors" ) const ( @@ -97,7 +98,7 @@ func (k *KeyManager) allocateKey(_ context.Context, subsys string) *api.Encrypti _, err := cryptorand.Read(key) if err != nil { - panic(errors.Wrap(err, "key generated failed")) + panic(fmt.Errorf("key generated failed: %w", err)) } k.keyRing.lClock++ diff --git a/manager/logbroker/broker.go b/manager/logbroker/broker.go index 9546e02720..5f5b1022bc 100644 --- a/manager/logbroker/broker.go +++ b/manager/logbroker/broker.go @@ -389,7 +389,7 @@ func (lb *LogBroker) PublishLogs(stream api.LogBroker_PublishLogsServer) (err er for { logMsg, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { return stream.SendAndClose(&api.PublishLogsResponse{}) } if err != nil { diff --git a/manager/manager.go b/manager/manager.go index 8b14005641..bd4491cbbd 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -3,6 +3,7 @@ package manager import ( "context" "crypto/tls" + "errors" "fmt" "math" "net" @@ -47,7 +48,6 @@ import ( "github.com/moby/swarmkit/v2/node/plugin" "github.com/moby/swarmkit/v2/remotes" "github.com/moby/swarmkit/v2/xnet" - "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) @@ -213,13 +213,13 @@ func (l *closeOnceListener) Close() error { func New(config *Config) (*Manager, error) { err := os.MkdirAll(config.StateDir, 0o700) if err != nil { - return nil, errors.Wrap(err, "failed to create state directory") + return nil, fmt.Errorf("failed to create state directory: %w", err) } raftStateDir := filepath.Join(config.StateDir, "raft") err = os.MkdirAll(raftStateDir, 0o700) if err != nil { - return nil, errors.Wrap(err, "failed to create raft state directory") + return nil, fmt.Errorf("failed to create raft state directory: %w", err) } raftCfg := raft.DefaultNodeConfig() @@ -341,7 +341,7 @@ func (m *Manager) BindControl(addr string) error { if runtime.GOOS != "windows" { err := os.MkdirAll(filepath.Dir(addr), 0o700) if err != nil { - return errors.Wrap(err, "failed to create socket directory") + return fmt.Errorf("failed to create socket directory: %w", err) } } @@ -351,19 +351,21 @@ func (m *Manager) BindControl(addr string) error { // exists. Try replacing the file. if runtime.GOOS != "windows" { unwrappedErr := err - if op, ok := unwrappedErr.(*net.OpError); ok { + var op *net.OpError + if errors.As(err, &op) { unwrappedErr = op.Err } - if sys, ok := unwrappedErr.(*os.SyscallError); ok { + var sys *os.SyscallError + if errors.As(err, &sys) { unwrappedErr = sys.Err } - if unwrappedErr == syscall.EADDRINUSE { + if errors.Is(unwrappedErr, syscall.EADDRINUSE) { os.Remove(addr) l, err = xnet.ListenLocal(addr) } } if err != nil { - return errors.Wrap(err, "failed to listen on control API address") + return fmt.Errorf("failed to listen on control API address: %w", err) } m.config.ControlAPI = addr @@ -403,7 +405,7 @@ func (m *Manager) BindRemote(ctx context.Context, addrs RemoteAddrs) error { l, err := net.Listen("tcp", addrs.ListenAddr) if err != nil { - return errors.Wrap(err, "failed to listen on remote API address") + return fmt.Errorf("failed to listen on remote API address: %w", err) } if advertiseAddrPort == "0" { advertiseAddr = l.Addr().String() @@ -583,7 +585,7 @@ func (m *Manager) Run(parent context.Context) error { if err := m.raftNode.JoinAndStart(ctx); err != nil { // Don't block future calls to Stop. close(m.started) - return errors.Wrap(err, "can't initialize raft node") + return fmt.Errorf("can't initialize raft node: %w", err) } localHealthServer.SetServingStatus("ControlAPI", api.HealthCheckResponse_SERVING) @@ -805,7 +807,7 @@ func (m *Manager) watchForClusterChanges(ctx context.Context) error { func(tx store.ReadTx) error { cluster = store.GetCluster(tx, clusterID) if cluster == nil { - return fmt.Errorf("unable to get current cluster") + return errors.New("unable to get current cluster") } return nil }, @@ -845,14 +847,14 @@ func (m *Manager) getLeaderNodeID() string { // the purposes of logging leadership changes, and should not be relied on // for other purposes leader, leaderErr := m.raftNode.Leader() - switch leaderErr { - case raft.ErrNoRaftMember: + switch { + case errors.Is(leaderErr, raft.ErrNoRaftMember): // this is an unlikely case, but we have to handle it. this means this // node is not a member of the raft quorum. this won't look very pretty // in logs ("leadership changed from aslkdjfa to ErrNoRaftMember") but // it also won't be very common return "not yet part of a raft cluster" - case raft.ErrNoClusterLeader: + case errors.Is(leaderErr, raft.ErrNoClusterLeader): return "no cluster leader" default: id, err := m.raftNode.GetNodeIDByRaftID(leader) @@ -980,7 +982,7 @@ func (m *Manager) becomeLeader(ctx context.Context) { } err := store.CreateCluster(tx, clusterObj) - if err != nil && (err != store.ErrExist || err != store.ErrNameConflict) { + if err != nil && (!errors.Is(err, store.ErrExist) || !errors.Is(err, store.ErrNameConflict)) { log.G(ctx).WithError(err).Errorf("error creating cluster object") } @@ -1003,7 +1005,7 @@ func (m *Manager) becomeLeader(ctx context.Context) { // in order to allow running services on the predefined docker // networks like `bridge` and `host`. for _, p := range m.config.networkProvider().PredefinedNetworks() { - if err := store.CreateNetwork(tx, newPredefinedNetwork(p.Name, p.Driver)); err != nil && err != store.ErrNameConflict { + if err := store.CreateNetwork(tx, newPredefinedNetwork(p.Name, p.Driver)); err != nil && !errors.Is(err, store.ErrNameConflict) { log.G(ctx).WithError(err).Error("failed to create predefined network " + p.Name) } } diff --git a/manager/state/raft/raft.go b/manager/state/raft/raft.go index c41223f172..d5b2dcba98 100644 --- a/manager/state/raft/raft.go +++ b/manager/state/raft/raft.go @@ -2,6 +2,7 @@ package raft import ( "context" + "errors" "fmt" "io" "math" @@ -27,7 +28,6 @@ import ( "github.com/moby/swarmkit/v2/manager/state/raft/transport" "github.com/moby/swarmkit/v2/manager/state/store" "github.com/moby/swarmkit/v2/watch" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "go.etcd.io/etcd/pkg/v3/idutil" "go.etcd.io/raft/v3" @@ -388,7 +388,7 @@ func (n *Node) JoinAndStart(ctx context.Context) (err error) { }() loadAndStartErr := n.loadAndStart(ctx, n.opts.ForceNewCluster) - if loadAndStartErr != nil && loadAndStartErr != storage.ErrNoWAL { + if loadAndStartErr != nil && !errors.Is(loadAndStartErr, storage.ErrNoWAL) { return loadAndStartErr } @@ -413,7 +413,7 @@ func (n *Node) JoinAndStart(ctx context.Context) (err error) { if loadAndStartErr == nil { if n.opts.JoinAddr != "" && n.opts.ForceJoin { if err := n.joinCluster(ctx); err != nil { - return errors.Wrap(err, "failed to rejoin cluster") + return fmt.Errorf("failed to rejoin cluster: %w", err) } } n.campaignWhenAble = true @@ -583,7 +583,7 @@ func (n *Node) Run(ctx context.Context) error { // Save entries to storage if err := n.saveToStorage(ctx, &raftConfig, rd.HardState, rd.Entries, rd.Snapshot); err != nil { - return errors.Wrap(err, "failed to save entries to storage") + return fmt.Errorf("failed to save entries to storage: %w", err) } // If the memory store lock has been held for too long, @@ -1060,7 +1060,7 @@ func (n *Node) checkHealth(ctx context.Context, addr string, timeout time.Durati healthClient := api.NewHealthClient(conn) resp, err := healthClient.Check(ctx, &api.HealthCheckRequest{Service: "Raft"}) if err != nil { - return errors.Wrap(err, "could not connect to prospective new cluster member using its advertised address") + return fmt.Errorf("could not connect to prospective new cluster member using its advertised address: %w", err) } if resp.Status != api.HealthCheckResponse_SERVING { return fmt.Errorf("health check returned status %s", resp.Status.String()) @@ -1096,7 +1096,7 @@ func (n *Node) addMember(ctx context.Context, addr string, raftID uint64, nodeID func (n *Node) updateNodeBlocking(ctx context.Context, id uint64, addr string) error { m := n.cluster.GetMember(id) if m == nil { - return errors.Errorf("member %x is not found for update", id) + return fmt.Errorf("member %x is not found for update", id) } node := api.RaftMember{ RaftID: m.RaftID, @@ -1239,7 +1239,7 @@ func (n *Node) TransferLeadership(ctx context.Context) error { transferee, err := n.transport.LongestActive() if err != nil { - return errors.Wrap(err, "failed to get longest-active member") + return fmt.Errorf("failed to get longest-active member: %w", err) } start := time.Now() n.raftNode.TransferLeadership(ctx, n.Config.ID, transferee) @@ -1342,7 +1342,7 @@ func (n *Node) StreamRaftMessage(stream api.Raft_StreamRaftMessageServer) error for { recvdMsg, err = stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } else if err != nil { log.G(stream.Context()).WithError(err).Error("error while reading from stream") @@ -1383,7 +1383,7 @@ func (n *Node) StreamRaftMessage(stream api.Raft_StreamRaftMessageServer) error } // We should have the complete snapshot. Verify and process. - if err == io.EOF { + if errors.Is(err, io.EOF) { _, err = n.ProcessRaftMessage(stream.Context(), &api.ProcessRaftMessageRequest{Message: assembledMessage.Message}) if err == nil { // Translate the response of ProcessRaftMessage() from @@ -1502,7 +1502,7 @@ func (n *Node) getLeaderConn() (*grpc.ClientConn, error) { } conn, err := n.transport.PeerConn(leader) if err != nil { - return nil, errors.Wrap(err, "failed to get connection to leader") + return nil, fmt.Errorf("failed to get connection to leader: %w", err) } return conn, nil } @@ -1514,7 +1514,7 @@ func (n *Node) LeaderConn(ctx context.Context) (*grpc.ClientConn, error) { if err == nil { return cc, nil } - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return nil, err } if n.ticksWithNoLeader.Load() > lostQuorumTimeout { @@ -1530,7 +1530,7 @@ func (n *Node) LeaderConn(ctx context.Context) (*grpc.ClientConn, error) { if err == nil { return cc, nil } - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return nil, err } case <-ctx.Done(): @@ -1579,7 +1579,7 @@ func (n *Node) registerNode(node *api.RaftMember) error { err := n.cluster.AddMember(member) if err != nil { if rerr := n.transport.RemovePeer(node.RaftID); rerr != nil { - return errors.Wrapf(rerr, "failed to remove peer after error %v", err) + return fmt.Errorf("failed to remove peer after error %w: %w", err, rerr) } return err } @@ -1646,7 +1646,7 @@ func (n *Node) ChangesBetween(from, to api.Version) ([]state.Change, error) { r := &api.InternalRaftRequest{} err := proto.Unmarshal(pb.Data, r) if err != nil { - return nil, errors.Wrap(err, "error umarshalling internal raft request") + return nil, fmt.Errorf("error umarshalling internal raft request: %w", err) } if r.Action != nil { @@ -1746,18 +1746,18 @@ func (n *Node) saveToStorage( if !raft.IsEmptySnap(snapshot) { if err := n.raftLogger.SaveSnapshot(snapshot); err != nil { - return errors.Wrap(err, "failed to save snapshot") + return fmt.Errorf("failed to save snapshot: %w", err) } if err := n.raftLogger.GC(snapshot.Metadata.Index, snapshot.Metadata.Term, raftConfig.KeepOldSnapshots); err != nil { log.G(ctx).WithError(err).Error("unable to clean old snapshots and WALs") } if err = n.raftStore.ApplySnapshot(snapshot); err != nil { - return errors.Wrap(err, "failed to apply snapshot on raft node") + return fmt.Errorf("failed to apply snapshot on raft node: %w", err) } } if err := n.raftLogger.SaveEntries(hardState, entries); err != nil { - return errors.Wrap(err, "failed to save raft log entries") + return fmt.Errorf("failed to save raft log entries: %w", err) } if len(entries) > 0 { @@ -1768,7 +1768,7 @@ func (n *Node) saveToStorage( } if err = n.raftStore.Append(entries); err != nil { - return errors.Wrap(err, "failed to append raft log entries") + return fmt.Errorf("failed to append raft log entries: %w", err) } return nil diff --git a/manager/state/raft/storage.go b/manager/state/raft/storage.go index a89e481ab5..95da4916ac 100644 --- a/manager/state/raft/storage.go +++ b/manager/state/raft/storage.go @@ -2,6 +2,7 @@ package raft import ( "context" + "errors" "fmt" "github.com/docker/go-metrics" @@ -11,7 +12,6 @@ import ( "github.com/moby/swarmkit/v2/manager/state/raft/membership" "github.com/moby/swarmkit/v2/manager/state/raft/storage" "github.com/moby/swarmkit/v2/manager/state/store" - "github.com/pkg/errors" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" ) @@ -43,12 +43,13 @@ func (n *Node) readFromDisk(ctx context.Context) (*raftpb.Snapshot, storage.WALD snap, walData, err := n.raftLogger.BootstrapFromDisk(ctx) if keys.PendingDEK != nil { - switch errors.Cause(err).(type) { - case nil: + var ecd encryption.ErrCannotDecrypt + switch { + case err == nil: if err = n.keyRotator.UpdateKeys(EncryptionKeys{CurrentDEK: keys.PendingDEK}); err != nil { - err = errors.Wrap(err, "previous key rotation was successful, but unable mark rotation as complete") + err = fmt.Errorf("previous key rotation was successful, but unable mark rotation as complete: %w", err) } - case encryption.ErrCannotDecrypt: + case errors.As(err, &ecd): snap, walData, err = n.raftLogger.BootstrapFromDisk(ctx, keys.CurrentDEK) } } @@ -69,7 +70,7 @@ func (n *Node) loadAndStart(ctx context.Context, forceNewCluster bool) error { // Read logs to fully catch up store var raftNode api.RaftMember if err := raftNode.Unmarshal(waldata.Metadata); err != nil { - return errors.Wrap(err, "failed to unmarshal WAL metadata") + return fmt.Errorf("failed to unmarshal WAL metadata: %w", err) } n.Config.ID = raftNode.RaftID @@ -106,7 +107,7 @@ func (n *Node) loadAndStart(ctx context.Context, forceNewCluster bool) error { if ent.Index <= st.Commit && ent.Type == raftpb.EntryConfChange { var cc raftpb.ConfChange if err := cc.Unmarshal(ent.Data); err != nil { - return errors.Wrap(err, "failed to unmarshal config change") + return fmt.Errorf("failed to unmarshal config change: %w", err) } if cc.Type == raftpb.ConfChangeRemoveNode { n.cluster.RemoveMember(cc.NodeID) @@ -136,7 +137,7 @@ func (n *Node) loadAndStart(ctx context.Context, forceNewCluster bool) error { if ccEnt.Type == raftpb.EntryConfChange { var cc raftpb.ConfChange if err := cc.Unmarshal(ccEnt.Data); err != nil { - return errors.Wrap(err, "error unmarshalling force-new-cluster config change") + return fmt.Errorf("error unmarshalling force-new-cluster config change: %w", err) } if cc.Type == raftpb.ConfChangeRemoveNode { n.cluster.RemoveMember(cc.NodeID) @@ -174,7 +175,7 @@ func (n *Node) newRaftLogs(nodeID string) (raft.Peer, error) { } metadata, err := raftNode.Marshal() if err != nil { - return raft.Peer{}, errors.Wrap(err, "error marshalling raft node") + return raft.Peer{}, fmt.Errorf("error marshalling raft node: %w", err) } if err := n.raftLogger.BootstrapNew(metadata); err != nil { return raft.Peer{}, err @@ -234,11 +235,11 @@ func (n *Node) triggerSnapshot(ctx context.Context, raftConfig api.RaftConfig) { if appliedIndex > raftConfig.LogEntriesForSlowFollowers { err := n.raftStore.Compact(appliedIndex - raftConfig.LogEntriesForSlowFollowers) - if err != nil && err != raft.ErrCompacted { + if err != nil && !errors.Is(err, raft.ErrCompacted) { log.G(ctx).WithError(err).Error("failed to compact snapshot") } } - } else if err != raft.ErrSnapOutOfDate { + } else if !errors.Is(err, raft.ErrSnapOutOfDate) { log.G(ctx).WithError(err).Error("failed to create snapshot") } }(n.appliedIndex, n.snapshotMeta) diff --git a/manager/state/raft/storage/snapwrap.go b/manager/state/raft/storage/snapwrap.go index b97e9eb51f..13d2a5e186 100644 --- a/manager/state/raft/storage/snapwrap.go +++ b/manager/state/raft/storage/snapwrap.go @@ -1,13 +1,14 @@ package storage import ( + "errors" + "fmt" "os" "path/filepath" "sort" "strings" "github.com/moby/swarmkit/v2/manager/encryption" - "github.com/pkg/errors" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/raft/v3/raftpb" ) @@ -107,10 +108,10 @@ func MigrateSnapshot(oldDir, newDir string, oldFactory, newFactory SnapFactory) // use temporary snapshot directory so initialization appears atomic oldSnapshotter := oldFactory.New(oldDir) snapshot, err := oldSnapshotter.Load() - switch err { - case snap.ErrNoSnapshot: // if there's no snapshot, the migration succeeded + switch { + case errors.Is(err, snap.ErrNoSnapshot): // if there's no snapshot, the migration succeeded return nil - case nil: + case err == nil: break default: return err @@ -118,10 +119,10 @@ func MigrateSnapshot(oldDir, newDir string, oldFactory, newFactory SnapFactory) tmpdirpath := filepath.Clean(newDir) + ".tmp" if err := os.RemoveAll(tmpdirpath); err != nil { - return errors.Wrap(err, "could not remove temporary snapshot directory") + return fmt.Errorf("could not remove temporary snapshot directory: %w", err) } if err := os.MkdirAll(tmpdirpath, 0o700); err != nil { - return errors.Wrap(err, "could not create temporary snapshot directory") + return fmt.Errorf("could not create temporary snapshot directory: %w", err) } tmpSnapshotter := newFactory.New(tmpdirpath) diff --git a/manager/state/raft/storage/storage.go b/manager/state/raft/storage/storage.go index 9f1f245cd3..1f03a2c2af 100644 --- a/manager/state/raft/storage/storage.go +++ b/manager/state/raft/storage/storage.go @@ -2,6 +2,7 @@ package storage import ( "context" + "errors" "fmt" "os" "path/filepath" @@ -9,7 +10,6 @@ import ( "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/encryption" - "github.com/pkg/errors" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/storage/wal" @@ -84,7 +84,7 @@ func (e *EncryptedRaftLogger) BootstrapFromDisk(ctx context.Context, oldEncrypti } // ensure the new directory exists if err := os.MkdirAll(snapDir, 0o700); err != nil { - return nil, WALData{}, errors.Wrap(err, "failed to create snapshot directory") + return nil, WALData{}, fmt.Errorf("failed to create snapshot directory: %w", err) } var ( @@ -96,7 +96,7 @@ func (e *EncryptedRaftLogger) BootstrapFromDisk(ctx context.Context, oldEncrypti // Create a snapshotter and load snapshot data snapshotter = snapFactory.New(snapDir) snapshot, err := snapshotter.Load() - if err != nil && err != snap.ErrNoSnapshot { + if err != nil && !errors.Is(err, snap.ErrNoSnapshot) { return nil, WALData{}, err } @@ -149,14 +149,14 @@ func (e *EncryptedRaftLogger) BootstrapNew(metadata []byte) error { for _, dirpath := range []string{filepath.Dir(e.walDir()), e.snapDir()} { if err := os.MkdirAll(dirpath, 0o700); err != nil { - return errors.Wrapf(err, "failed to create %s", dirpath) + return fmt.Errorf("failed to create %s: %w", dirpath, err) } } var err error // the wal directory must not already exist upon creation e.wal, err = walFactory.Create(e.walDir(), metadata) if err != nil { - return errors.Wrap(err, "failed to create WAL") + return fmt.Errorf("failed to create WAL: %w", err) } e.snapshotter = NewSnapFactory(encrypter, decrypter).New(e.snapDir()) @@ -184,7 +184,7 @@ func (e *EncryptedRaftLogger) RotateEncryptionKey(newKey []byte) { // have a lock on writing to snapshots and WALs. wrapped, ok := e.wal.(*wrappedWAL) if !ok { - panic(fmt.Errorf("EncryptedRaftLogger's WAL is not a wrappedWAL")) + panic(errors.New("EncryptedRaftLogger's WAL is not a wrappedWAL")) } wrapped.encrypter, wrapped.decrypter = encryption.Defaults(newKey, e.FIPS) @@ -270,7 +270,7 @@ func (e *EncryptedRaftLogger) GC(index uint64, term uint64, keepOldSnapshots uin var snapTerm, snapIndex uint64 _, err = fmt.Sscanf(oldestSnapshot, "%016x-%016x.snap", &snapTerm, &snapIndex) if err != nil { - return errors.Wrapf(err, "malformed snapshot filename %s", oldestSnapshot) + return fmt.Errorf("malformed snapshot filename %s: %w", oldestSnapshot, err) } wals, err := ListWALs(e.walDir()) @@ -285,7 +285,7 @@ func (e *EncryptedRaftLogger) GC(index uint64, term uint64, keepOldSnapshots uin var walSeq, walIndex uint64 _, err = fmt.Sscanf(walName, "%016x-%016x.wal", &walSeq, &walIndex) if err != nil { - return errors.Wrapf(err, "could not parse WAL name %s", walName) + return fmt.Errorf("could not parse WAL name %s: %w", walName, err) } if walIndex >= snapIndex { @@ -305,12 +305,12 @@ func (e *EncryptedRaftLogger) GC(index uint64, term uint64, keepOldSnapshots uin walPath := filepath.Join(e.walDir(), wals[i]) l, err := fileutil.TryLockFile(walPath, os.O_WRONLY, fileutil.PrivateFileMode) if err != nil { - return errors.Wrapf(err, "could not lock old WAL file %s for removal", wals[i]) + return fmt.Errorf("could not lock old WAL file %s for removal: %w", wals[i], err) } err = os.Remove(walPath) l.Close() if err != nil { - return errors.Wrapf(err, "error removing old WAL file %s", wals[i]) + return fmt.Errorf("error removing old WAL file %s: %w", wals[i], err) } } @@ -323,7 +323,7 @@ func (e *EncryptedRaftLogger) SaveEntries(st raftpb.HardState, entries []raftpb. defer e.encoderMu.RUnlock() if e.wal == nil { - return fmt.Errorf("raft WAL has either been closed or has never been created") + return errors.New("raft WAL has either been closed or has never been created") } return e.wal.Save(st, entries) } diff --git a/manager/state/raft/storage/storage_test.go b/manager/state/raft/storage/storage_test.go index 4c54a72b37..487e0ad48c 100644 --- a/manager/state/raft/storage/storage_test.go +++ b/manager/state/raft/storage/storage_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/moby/swarmkit/v2/manager/encryption" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/raft/v3/raftpb" @@ -74,7 +73,8 @@ func TestBootstrapFromDisk(t *testing.T) { EncryptionKey: []byte(key), } _, _, err := logger.BootstrapFromDisk(context.Background()) - require.IsType(t, encryption.ErrCannotDecrypt{}, errors.Cause(err)) + var ecd encryption.ErrCannotDecrypt + require.ErrorAs(t, err, &ecd) } // but we can if we combine the two keys, we can bootstrap just fine diff --git a/manager/state/raft/storage/walwrap.go b/manager/state/raft/storage/walwrap.go index cffcd485d1..87314c86b8 100644 --- a/manager/state/raft/storage/walwrap.go +++ b/manager/state/raft/storage/walwrap.go @@ -2,6 +2,8 @@ package storage import ( "context" + "errors" + "fmt" "io" "os" "path/filepath" @@ -10,7 +12,6 @@ import ( "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/encryption" - "github.com/pkg/errors" "go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/raft/v3/raftpb" @@ -164,14 +165,15 @@ func ReadRepairWAL( repaired := false for { if reader, err = factory.Open(walDir, walsnap); err != nil { - return nil, WALData{}, errors.Wrap(err, "failed to open WAL") + return nil, WALData{}, fmt.Errorf("failed to open WAL: %w", err) } if metadata, st, ents, err = reader.ReadAll(); err != nil { if closeErr := reader.Close(); closeErr != nil { return nil, WALData{}, closeErr } - if _, ok := err.(encryption.ErrCannotDecrypt); ok { - return nil, WALData{}, errors.Wrap(err, "failed to decrypt WAL") + var ecd encryption.ErrCannotDecrypt + if errors.As(err, &ecd) { + return nil, WALData{}, fmt.Errorf("failed to decrypt WAL: %w", err) } // we can only repair ErrUnexpectedEOF and we never repair twice. if repaired || !errors.Is(err, io.ErrUnexpectedEOF) { @@ -179,10 +181,10 @@ func ReadRepairWAL( // some (last) of the files cannot be recovered? ("best effort" recovery?) // Or should an informative error be produced to help the user (which could // mean: remove the last file?). See TestReadRepairWAL for more details. - return nil, WALData{}, errors.Wrap(err, "irreparable WAL error") + return nil, WALData{}, fmt.Errorf("irreparable WAL error: %w", err) } if !wal.Repair(nil, walDir) { - return nil, WALData{}, errors.Wrap(err, "WAL error cannot be repaired") + return nil, WALData{}, fmt.Errorf("WAL error cannot be repaired: %w", err) } log.G(ctx).WithError(err).Info("repaired WAL error") repaired = true @@ -207,28 +209,28 @@ func MigrateWALs(ctx context.Context, oldDir, newDir string, oldFactory, newFact oldReader.Close() if err := os.MkdirAll(filepath.Dir(newDir), 0o700); err != nil { - return errors.Wrap(err, "could not create parent directory") + return fmt.Errorf("could not create parent directory: %w", err) } // keep temporary wal directory so WAL initialization appears atomic tmpdirpath := filepath.Clean(newDir) + ".tmp" if err := os.RemoveAll(tmpdirpath); err != nil { - return errors.Wrap(err, "could not remove temporary WAL directory") + return fmt.Errorf("could not remove temporary WAL directory: %w", err) } defer os.RemoveAll(tmpdirpath) tmpWAL, err := newFactory.Create(tmpdirpath, waldata.Metadata) if err != nil { - return errors.Wrap(err, "could not create new WAL in temporary WAL directory") + return fmt.Errorf("could not create new WAL in temporary WAL directory: %w", err) } defer tmpWAL.Close() if err := tmpWAL.SaveSnapshot(snapshot); err != nil { - return errors.Wrap(err, "could not write WAL snapshot in temporary directory") + return fmt.Errorf("could not write WAL snapshot in temporary directory: %w", err) } if err := tmpWAL.Save(waldata.HardState, waldata.Entries); err != nil { - return errors.Wrap(err, "could not migrate WALs to temporary directory") + return fmt.Errorf("could not migrate WALs to temporary directory: %w", err) } if err := tmpWAL.Close(); err != nil { return err diff --git a/manager/state/raft/testutils/testutils.go b/manager/state/raft/testutils/testutils.go index 8612af9c26..1a9db6c2bb 100644 --- a/manager/state/raft/testutils/testutils.go +++ b/manager/state/raft/testutils/testutils.go @@ -2,6 +2,8 @@ package testutils import ( "context" + "errors" + "fmt" "net" "os" "reflect" @@ -19,7 +21,6 @@ import ( "github.com/moby/swarmkit/v2/manager/state/raft" "github.com/moby/swarmkit/v2/manager/state/store" "github.com/moby/swarmkit/v2/testutils" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" etcdraft "go.etcd.io/raft/v3" @@ -584,7 +585,7 @@ func CheckValue(t *testing.T, clockSource *fakeclock.FakeClock, raftNode *TestNo return } if len(allNodes) != 1 { - err = errors.Errorf("expected 1 node, got %d nodes", len(allNodes)) + err = fmt.Errorf("expected 1 node, got %d nodes", len(allNodes)) return } if !reflect.DeepEqual(allNodes[0], createdNode) { @@ -607,7 +608,7 @@ func CheckNoValue(t *testing.T, clockSource *fakeclock.FakeClock, raftNode *Test return } if len(allNodes) != 0 { - err = errors.Errorf("expected no nodes, got %d", len(allNodes)) + err = fmt.Errorf("expected no nodes, got %d", len(allNodes)) } }) return err @@ -631,16 +632,16 @@ func CheckValuesOnNodes(t *testing.T, clockSource *fakeclock.FakeClock, checkNod for i, id := range ids { n := store.GetNode(tx, id) if n == nil { - err = errors.Errorf("node %s not found on %d (iteration %d)", id, checkNodeID, iteration) + err = fmt.Errorf("node %s not found on %d (iteration %d)", id, checkNodeID, iteration) return } if !reflect.DeepEqual(values[i], n) { - err = errors.Errorf("node %s did not match expected value on %d (iteration %d)", id, checkNodeID, iteration) + err = fmt.Errorf("node %s did not match expected value on %d (iteration %d)", id, checkNodeID, iteration) return } } if len(allNodes) != len(ids) { - err = errors.Errorf("expected %d nodes, got %d (iteration %d)", len(ids), len(allNodes), iteration) + err = fmt.Errorf("expected %d nodes, got %d (iteration %d)", len(ids), len(allNodes), iteration) return } }) diff --git a/manager/state/raft/transport/mock_raft_test.go b/manager/state/raft/transport/mock_raft_test.go index 52cac004d3..0674567de5 100644 --- a/manager/state/raft/transport/mock_raft_test.go +++ b/manager/state/raft/transport/mock_raft_test.go @@ -2,6 +2,7 @@ package transport import ( "context" + "errors" "io" "net" "slices" @@ -107,7 +108,7 @@ func (r *mockRaft) StreamRaftMessage(stream api.Raft_StreamRaftMessageServer) er var err error for { recvdMsg, err = stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } else if err != nil { log.G(context.Background()).WithError(err).Error("error while reading from stream") @@ -135,7 +136,7 @@ func (r *mockRaft) StreamRaftMessage(stream api.Raft_StreamRaftMessageServer) er } // We should have the complete snapshot. Verify and process. - if err == io.EOF { + if errors.Is(err, io.EOF) { if assembledMessage.Message.Type == raftpb.MsgSnap { if !verifySnapshot(assembledMessage.Message) { log.G(context.Background()).Error("snapshot data mismatch") diff --git a/manager/state/raft/transport/peer.go b/manager/state/raft/transport/peer.go index 16c8567e58..9db549d7ae 100644 --- a/manager/state/raft/transport/peer.go +++ b/manager/state/raft/transport/peer.go @@ -2,6 +2,7 @@ package transport import ( "context" + "errors" "fmt" "sync" "time" @@ -12,7 +13,6 @@ import ( "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/state/raft/membership" - "github.com/pkg/errors" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" "google.golang.org/grpc/status" @@ -46,7 +46,7 @@ type peer struct { func newPeer(id uint64, addr string, tr *Transport) (*peer, error) { cc, err := tr.dial(addr) if err != nil { - return nil, errors.Wrapf(err, "failed to create conn for %x with addr %s", id, addr) + return nil, fmt.Errorf("failed to create conn for %x with addr %s: %w", id, addr, err) } ctx, cancel := context.WithCancel(tr.ctx) ctx = log.WithField(ctx, "peer_id", fmt.Sprintf("%x", id)) @@ -84,7 +84,7 @@ func (p *peer) send(m raftpb.Message) (err error) { return p.ctx.Err() default: p.tr.config.ReportUnreachable(p.id) - return errors.Errorf("peer is unreachable") + return errors.New("peer is unreachable") } return nil } @@ -132,7 +132,7 @@ func (p *peer) address() string { func (p *peer) resolveAddr(ctx context.Context, id uint64) (string, error) { resp, err := api.NewRaftClient(p.conn()).ResolveAddress(ctx, &api.ResolveAddressRequest{RaftID: id}) if err != nil { - return "", errors.Wrap(err, "failed to resolve address") + return "", fmt.Errorf("failed to resolve address: %w", err) } return resp.Addr, nil } @@ -305,10 +305,10 @@ func (p *peer) sendProcessMessage(ctx context.Context, m raftpb.Message) error { func healthCheckConn(ctx context.Context, cc *grpc.ClientConn) error { resp, err := api.NewHealthClient(cc).Check(ctx, &api.HealthCheckRequest{Service: "Raft"}) if err != nil { - return errors.Wrap(err, "failed to check health") + return fmt.Errorf("failed to check health: %w", err) } if resp.Status != api.HealthCheckResponse_SERVING { - return errors.Errorf("health check returned status %s", resp.Status) + return fmt.Errorf("health check returned status %s", resp.Status) } return nil } @@ -352,7 +352,7 @@ func (p *peer) drain() error { return nil } if err := p.sendProcessMessage(ctx, m); err != nil { - return errors.Wrap(err, "send drain message") + return fmt.Errorf("send drain message: %w", err) } case <-ctx.Done(): return ctx.Err() diff --git a/manager/state/raft/transport/transport.go b/manager/state/raft/transport/transport.go index 549326bdab..c2b48b0f4d 100644 --- a/manager/state/raft/transport/transport.go +++ b/manager/state/raft/transport/transport.go @@ -4,6 +4,8 @@ package transport import ( "context" + "errors" + "fmt" "math" "net" "sync" @@ -14,7 +16,6 @@ import ( "google.golang.org/grpc/credentials" "github.com/moby/swarmkit/v2/log" - "github.com/pkg/errors" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" ) @@ -129,7 +130,7 @@ func (t *Transport) Send(m raftpb.Message) error { return errors.New("transport stopped") } if t.config.IsIDRemoved(m.To) { - return errors.Errorf("refusing to send message %s to removed member %x", m.Type, m.To) + return fmt.Errorf("refusing to send message %s to removed member %x", m.Type, m.To) } p, ok := t.peers[m.To] if !ok { @@ -146,7 +147,7 @@ func (t *Transport) Send(m raftpb.Message) error { return nil } if err := p.send(m); err != nil { - return errors.Wrapf(err, "failed to send message %x to %x", m.Type, m.To) + return fmt.Errorf("failed to send message %x to %x: %w", m.Type, m.To, err) } return nil } @@ -164,12 +165,12 @@ func (t *Transport) AddPeer(id uint64, addr string) error { if ep.address() == addr { return nil } - return errors.Errorf("peer %x already added with addr %s", id, ep.addr) + return fmt.Errorf("peer %x already added with addr %s", id, ep.addr) } log.G(t.ctx).Debugf("transport: add peer %x with address %s", id, addr) p, err := newPeer(id, addr, t) if err != nil { - return errors.Wrapf(err, "failed to create peer %x with addr %s", id, addr) + return fmt.Errorf("failed to create peer %x with addr %s: %w", id, addr, err) } t.peers[id] = p return nil @@ -402,11 +403,11 @@ func (t *Transport) resolvePeer(ctx context.Context, id uint64) (*peer, error) { func (t *Transport) sendUnknownMessage(ctx context.Context, m raftpb.Message) error { p, err := t.resolvePeer(ctx, m.To) if err != nil { - return errors.Wrapf(err, "failed to resolve peer") + return fmt.Errorf("failed to resolve peer: %w", err) } defer p.cancel() if err := p.sendProcessMessage(ctx, m); err != nil { - return errors.Wrapf(err, "failed to send message") + return fmt.Errorf("failed to send message: %w", err) } return nil } diff --git a/manager/state/store/memory.go b/manager/state/store/memory.go index 7f4f0b89db..8eb402adda 100644 --- a/manager/state/store/memory.go +++ b/manager/state/store/memory.go @@ -181,7 +181,7 @@ func (s *MemoryStore) Close() error { func fromArgs(args ...any) ([]byte, error) { if len(args) != 1 { - return nil, fmt.Errorf("must provide only a single argument") + return nil, errors.New("must provide only a single argument") } arg, ok := args[0].(string) if !ok { @@ -310,7 +310,7 @@ func (s *MemoryStore) ApplyStoreActions(actions []api.StoreAction) error { func applyStoreAction(tx Tx, sa api.StoreAction) error { for _, os := range objectStorers { err := os.ApplyStoreAction(tx, sa) - if err != errUnknownStoreAction { + if !errors.Is(err, errUnknownStoreAction) { return err } } diff --git a/manager/state/store/resources.go b/manager/state/store/resources.go index 6b782a33b2..544504d298 100644 --- a/manager/state/store/resources.go +++ b/manager/state/store/resources.go @@ -1,11 +1,12 @@ package store import ( + "errors" + "fmt" "strings" memdb "github.com/hashicorp/go-memdb" "github.com/moby/swarmkit/v2/api" - "github.com/pkg/errors" ) const tableResource = "resource" @@ -92,7 +93,7 @@ func confirmExtension(tx Tx, r *api.Resource) error { // There must be an extension corresponding to the Kind field. extensions, err := FindExtensions(tx, ByName(r.Kind)) if err != nil { - return errors.Wrap(err, "failed to query extensions") + return fmt.Errorf("failed to query extensions: %w", err) } if len(extensions) == 0 { return ErrNoKind diff --git a/node/node.go b/node/node.go index e82fc8d755..585d29b72b 100644 --- a/node/node.go +++ b/node/node.go @@ -5,6 +5,8 @@ import ( "context" "crypto/tls" "encoding/json" + "errors" + "fmt" "math" "net" "os" @@ -32,7 +34,6 @@ import ( "github.com/moby/swarmkit/v2/node/plugin" "github.com/moby/swarmkit/v2/remotes" "github.com/moby/swarmkit/v2/xnet" - "github.com/pkg/errors" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" "google.golang.org/grpc" @@ -515,10 +516,10 @@ func (n *Node) run(ctx context.Context) (err error) { // And, finally, we park and wait for the node to close up. If we get any // error other than context canceled, we return it. wg.Wait() - if managerErr != nil && errors.Cause(managerErr) != context.Canceled { + if managerErr != nil && !errors.Is(managerErr, context.Canceled) { return managerErr } - if agentErr != nil && errors.Cause(agentErr) != context.Canceled { + if agentErr != nil && !errors.Is(agentErr, context.Canceled) { return agentErr } // NOTE(dperny): we return err here, but the last time I can see err being @@ -809,18 +810,18 @@ func (n *Node) loadSecurityConfig(ctx context.Context, paths *ca.SecurityConfigP // Check if we already have a valid certificates on disk. rootCA, err := ca.GetLocalRootCA(paths.RootCA) - if err != nil && err != ca.ErrNoLocalRootCA { + if err != nil && !errors.Is(err, ca.ErrNoLocalRootCA) { return nil, nil, err } if err == nil { // if forcing a new cluster, we allow the certificates to be expired - a new set will be generated securityConfig, cancel, err = ca.LoadSecurityConfig(ctx, rootCA, krw, n.config.ForceNewCluster) if err != nil { - _, isInvalidKEK := errors.Cause(err).(ca.ErrInvalidKEK) - if isInvalidKEK { + var eiK ca.ErrInvalidKEK + if errors.As(err, &eiK) { return nil, nil, ErrInvalidUnlockKey } else if !os.IsNotExist(err) { - return nil, nil, errors.Wrapf(err, "error while loading TLS certificate in %s", paths.Node.Cert) + return nil, nil, fmt.Errorf("error while loading TLS certificate in %s: %w", paths.Node.Cert, err) } } } @@ -841,7 +842,7 @@ func (n *Node) loadSecurityConfig(ctx context.Context, paths *ca.SecurityConfigP return nil, nil, err } log.G(ctx).Debug("generated CA key and certificate") - } else if err == ca.ErrNoLocalRootCA { // from previous error loading the root CA from disk + } else if errors.Is(err, ca.ErrNoLocalRootCA) { // from previous error loading the root CA from disk // if we are attempting to join another cluster, which has a FIPS join token, and we are not FIPS, error if n.config.JoinAddr != "" && isMandatoryFIPSClusterJoinToken(n.config.JoinToken) && !n.config.FIPS { return nil, nil, ErrMandatoryFIPS @@ -865,7 +866,8 @@ func (n *Node) loadSecurityConfig(ctx context.Context, paths *ca.SecurityConfigP "node.id": securityConfig.ClientTLSCreds.NodeID(), }).Debugf("loaded TLS certificate") } else { - if _, ok := errors.Cause(err).(ca.ErrInvalidKEK); ok { + var eiK ca.ErrInvalidKEK + if errors.As(err, &eiK) { return nil, nil, ErrInvalidUnlockKey } log.G(ctx).WithError(err).Debugf("no node credentials found in: %s", krw.Target()) @@ -1120,7 +1122,7 @@ func (n *Node) superviseManager(ctx context.Context, securityConfig *ca.Security wasRemoved, err := n.runManager(ctx, securityConfig, rootPaths, ready, workerRole) if err != nil { waitRoleCancel() - return errors.Wrap(err, "manager stopped") + return fmt.Errorf("manager stopped: %w", err) } // If the manager stopped running and our role is still diff --git a/node/node_test.go b/node/node_test.go index b1625c1efd..2ff5751fe8 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -5,6 +5,7 @@ import ( "context" "crypto/x509" "encoding/pem" + "errors" "fmt" "os" "path/filepath" @@ -24,7 +25,6 @@ import ( "github.com/moby/swarmkit/v2/log" "github.com/moby/swarmkit/v2/manager/state/store" "github.com/moby/swarmkit/v2/testutils" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) @@ -153,7 +153,8 @@ func TestLoadSecurityConfigLoadFromDisk(t *testing.T) { }) require.NoError(t, err) _, _, err = node.loadSecurityConfig(context.Background(), paths) - require.IsType(t, x509.UnknownAuthorityError{}, errors.Cause(err)) + var uae x509.UnknownAuthorityError + require.ErrorAs(t, err, &uae) // Convert to PKCS1 and require FIPS require.NoError(t, krw.DowngradeKey()) @@ -168,7 +169,7 @@ func TestLoadSecurityConfigLoadFromDisk(t *testing.T) { }) require.NoError(t, err) _, _, err = node.loadSecurityConfig(context.Background(), paths) - require.Equal(t, keyutils.ErrFIPSUnsupportedKeyFormat, errors.Cause(err)) + require.ErrorIs(t, err, keyutils.ErrFIPSUnsupportedKeyFormat) } // If there is no CA, and a join addr is provided, one is downloaded from the diff --git a/protobuf/plugin/raftproxy/raftproxy.go b/protobuf/plugin/raftproxy/raftproxy.go index 82cd0e14d3..317d11f2dc 100644 --- a/protobuf/plugin/raftproxy/raftproxy.go +++ b/protobuf/plugin/raftproxy/raftproxy.go @@ -120,7 +120,7 @@ func (g *raftProxyGen) genClientStreamingMethod(s *descriptor.ServiceDescriptorP ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -145,7 +145,7 @@ func (g *raftProxyGen) genClientStreamingMethod(s *descriptor.ServiceDescriptorP g.gen.P(` for { msg, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -174,7 +174,7 @@ func (g *raftProxyGen) genServerStreamingMethod(s *descriptor.ServiceDescriptorP ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -199,7 +199,7 @@ func (g *raftProxyGen) genServerStreamingMethod(s *descriptor.ServiceDescriptorP g.gen.P(` for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -222,7 +222,7 @@ func (g *raftProxyGen) genClientServerStreamingMethod(s *descriptor.ServiceDescr ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -247,7 +247,7 @@ func (g *raftProxyGen) genClientServerStreamingMethod(s *descriptor.ServiceDescr g.gen.P(`errc := make(chan error, 1) go func() { msg, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { close(errc) return } @@ -263,7 +263,7 @@ func (g *raftProxyGen) genClientServerStreamingMethod(s *descriptor.ServiceDescr g.gen.P(` for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -283,7 +283,7 @@ func (g *raftProxyGen) genSimpleMethod(s *descriptor.ServiceDescriptorProto, m * g.gen.P(` conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -304,7 +304,7 @@ func (g *raftProxyGen) genSimpleMethod(s *descriptor.ServiceDescriptorProto, m * } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.` + m.GetName() + `(ctx, r) } return nil, err @@ -384,4 +384,5 @@ func (g *raftProxyGen) GenerateImports(file *generator.FileDescriptor) { g.gen.PrintImport("peer", "google.golang.org/grpc/peer") // don't conflict with import added by ptypes g.gen.PrintImport("rafttime", "time") + g.gen.PrintImport("errors", "errors") } diff --git a/protobuf/plugin/raftproxy/test/service.pb.go b/protobuf/plugin/raftproxy/test/service.pb.go index 4862cce719..911f8a452a 100644 --- a/protobuf/plugin/raftproxy/test/service.pb.go +++ b/protobuf/plugin/raftproxy/test/service.pb.go @@ -5,6 +5,7 @@ package test import ( context "context" + errors "errors" fmt "fmt" proto "github.com/gogo/protobuf/proto" github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" @@ -1321,7 +1322,7 @@ func (p *raftProxyRouteGuideServer) GetFeature(ctx context.Context, r *Point) (* conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -1342,7 +1343,7 @@ func (p *raftProxyRouteGuideServer) GetFeature(ctx context.Context, r *Point) (* } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.GetFeature(ctx, r) } return nil, err @@ -1365,7 +1366,7 @@ func (p *raftProxyRouteGuideServer) ListFeatures(r *Rectangle, stream RouteGuide ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -1390,7 +1391,7 @@ func (p *raftProxyRouteGuideServer) ListFeatures(r *Rectangle, stream RouteGuide for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -1416,7 +1417,7 @@ func (p *raftProxyRouteGuideServer) RecordRoute(stream RouteGuide_RecordRouteSer ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -1441,7 +1442,7 @@ func (p *raftProxyRouteGuideServer) RecordRoute(stream RouteGuide_RecordRouteSer for { msg, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -1473,7 +1474,7 @@ func (p *raftProxyRouteGuideServer) RouteChat(stream RouteGuide_RouteChatServer) ctx := stream.Context() conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return err @@ -1498,7 +1499,7 @@ func (p *raftProxyRouteGuideServer) RouteChat(stream RouteGuide_RouteChatServer) errc := make(chan error, 1) go func() { msg, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { close(errc) return } @@ -1514,7 +1515,7 @@ func (p *raftProxyRouteGuideServer) RouteChat(stream RouteGuide_RouteChatServer) for { msg, err := clientStream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { @@ -1604,7 +1605,7 @@ func (p *raftProxyHealthServer) Check(ctx context.Context, r *HealthCheckRequest conn, err := p.connSelector.LeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { ctx, err = p.runCtxMods(ctx, p.localCtxMods) if err != nil { return nil, err @@ -1625,7 +1626,7 @@ func (p *raftProxyHealthServer) Check(ctx context.Context, r *HealthCheckRequest } conn, err := p.pollNewLeaderConn(ctx) if err != nil { - if err == raftselector.ErrIsLeader { + if errors.Is(err, raftselector.ErrIsLeader) { return p.local.Check(ctx, r) } return nil, err diff --git a/remotes/remotes.go b/remotes/remotes.go index 613c5ce921..e4c07592c0 100644 --- a/remotes/remotes.go +++ b/remotes/remotes.go @@ -1,7 +1,7 @@ package remotes import ( - "fmt" + "errors" "maps" "math" "math/rand" @@ -11,7 +11,7 @@ import ( "github.com/moby/swarmkit/v2/api" ) -var errRemotesUnavailable = fmt.Errorf("no remote hosts provided") +var errRemotesUnavailable = errors.New("no remote hosts provided") // DefaultObservationWeight provides a weight to use for positive observations // that will balance well under repeated observations. diff --git a/remotes/remotes_test.go b/remotes/remotes_test.go index c907059db0..d30d01d4ba 100644 --- a/remotes/remotes_test.go +++ b/remotes/remotes_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/moby/swarmkit/v2/api" + "github.com/stretchr/testify/require" ) func TestRemotesSimple(t *testing.T) { @@ -59,9 +60,7 @@ func TestRemotesEmpty(t *testing.T) { remotes := NewRemotes() _, err := remotes.Select() - if err != errRemotesUnavailable { - t.Fatalf("unexpected return from Select: %v", err) - } + require.ErrorIs(t, err, errRemotesUnavailable, "unexpected return from Select") } @@ -72,9 +71,7 @@ func TestRemotesExclude(t *testing.T) { // exclude all _, err := remotes.Select(excludes...) - if err != errRemotesUnavailable { - t.Fatal("select an excluded peer") - } + require.ErrorIs(t, err, errRemotesUnavailable, "select an excluded peer") // exclude one peer for range len(peers) * 10 { diff --git a/swarmd/cmd/swarm-rafttool/dump.go b/swarmd/cmd/swarm-rafttool/dump.go index c556aedef0..65c4dc9c07 100644 --- a/swarmd/cmd/swarm-rafttool/dump.go +++ b/swarmd/cmd/swarm-rafttool/dump.go @@ -59,7 +59,7 @@ func loadData(swarmdir, unlockKey string) (*storage.WALData, *raftpb.Snapshot, e var walsnap walpb.Snapshot snapshot, err := snapFactory.New(snapDir).Load() - if err != nil && err != snap.ErrNoSnapshot { + if err != nil && !errors.Is(err, snap.ErrNoSnapshot) { return nil, nil, err } if snapshot != nil { @@ -449,7 +449,7 @@ func dumpObject(swarmdir, unlockKey, objType string, selector objSelector) error } if len(objects) == 0 { - return fmt.Errorf("no matching objects found") + return errors.New("no matching objects found") } for _, object := range objects { diff --git a/swarmd/cmd/swarm-rafttool/renewcert.go b/swarmd/cmd/swarm-rafttool/renewcert.go index 253adfe4f3..277399015b 100644 --- a/swarmd/cmd/swarm-rafttool/renewcert.go +++ b/swarmd/cmd/swarm-rafttool/renewcert.go @@ -1,12 +1,12 @@ package main import ( + "errors" "fmt" "github.com/cloudflare/cfssl/helpers" "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" - "github.com/pkg/errors" "go.etcd.io/raft/v3/raftpb" "github.com/moby/swarmkit/v2/api" @@ -18,15 +18,15 @@ func renewCerts(swarmdir, unlockKey string) error { // it's expired - this will just obtain a new cert anyway. krw, err := getKRW(swarmdir, unlockKey) if err != nil { - return errors.Wrap(err, "could not load swarm certificate") + return fmt.Errorf("could not load swarm certificate: %w", err) } cert, _, err := krw.Read() if err != nil { - return errors.Wrap(err, "could not read swarm certificate") + return fmt.Errorf("could not read swarm certificate: %w", err) } certificates, err := helpers.ParseCertificatesPEM(cert) if err != nil { - return errors.Wrap(err, "could not parse node certificate") + return fmt.Errorf("could not parse node certificate: %w", err) } // We need to make sure when renewing that we provide the same CN (node ID), // OU (role), and org (swarm cluster ID) when getting a new certificate @@ -39,7 +39,7 @@ func renewCerts(swarmdir, unlockKey string) error { // Load up the raft data on disk walData, snapshot, err := loadData(swarmdir, unlockKey) if err != nil { - return errors.Wrap(err, "could not load swarm data") + return fmt.Errorf("could not load swarm data: %w", err) } var cluster *api.Cluster @@ -65,7 +65,7 @@ func renewCerts(swarmdir, unlockKey string) error { r := &api.InternalRaftRequest{} err := proto.Unmarshal(ent.Data, r) if err != nil { - return errors.Wrap(err, "could not read WAL") + return fmt.Errorf("could not read WAL: %w", err) } for _, act := range r.Action { @@ -93,7 +93,7 @@ func renewCerts(swarmdir, unlockKey string) error { } rootCA, err := ca.RootCAFromAPI(&cluster.RootCA, expiry) if err != nil { - return errors.Wrap(err, "invalid CA info in raft logs; cannot renew certs") + return fmt.Errorf("invalid CA info in raft logs; cannot renew certs: %w", err) } _, _, err = rootCA.IssueAndSaveNewCertificates(krw, cn, ou, org) diff --git a/swarmd/cmd/swarmctl/cluster/unlockkey.go b/swarmd/cmd/swarmctl/cluster/unlockkey.go index 7110495a94..2db8ca1a10 100644 --- a/swarmd/cmd/swarmctl/cluster/unlockkey.go +++ b/swarmd/cmd/swarmctl/cluster/unlockkey.go @@ -25,7 +25,7 @@ func displayUnlockKey(cmd *cobra.Command) error { } if len(resp.UnlockKey) == 0 { - fmt.Printf("Managers not auto-locked") + fmt.Print("Managers not auto-locked") } fmt.Printf("Managers auto-locked. Unlock key: %s\n", encryption.HumanReadableKey(resp.UnlockKey)) return nil diff --git a/swarmd/cmd/swarmctl/node/activate.go b/swarmd/cmd/swarmctl/node/activate.go index d1efda53b3..46a1c228d2 100644 --- a/swarmd/cmd/swarmctl/node/activate.go +++ b/swarmd/cmd/swarmctl/node/activate.go @@ -1,6 +1,7 @@ package node import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -13,7 +14,7 @@ var ( Short: "Activate a node", RunE: func(cmd *cobra.Command, args []string) error { if err := changeNodeAvailability(cmd, args, api.NodeAvailabilityActive); err != nil { - if err == errNoChange { + if errors.Is(err, errNoChange) { return fmt.Errorf("Node %s is already active", args[0]) } return err diff --git a/swarmd/cmd/swarmctl/node/demote.go b/swarmd/cmd/swarmctl/node/demote.go index b0b32511d5..1184847950 100644 --- a/swarmd/cmd/swarmctl/node/demote.go +++ b/swarmd/cmd/swarmctl/node/demote.go @@ -1,6 +1,7 @@ package node import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -13,7 +14,7 @@ var ( Short: "Demote a node from a manager to a worker", RunE: func(cmd *cobra.Command, args []string) error { if err := changeNodeRole(cmd, args, api.NodeRoleWorker); err != nil { - if err == errNoChange { + if errors.Is(err, errNoChange) { return fmt.Errorf("Node %s is already a worker", args[0]) } return err diff --git a/swarmd/cmd/swarmctl/node/drain.go b/swarmd/cmd/swarmctl/node/drain.go index 1f6fb28a21..31cb98e34f 100644 --- a/swarmd/cmd/swarmctl/node/drain.go +++ b/swarmd/cmd/swarmctl/node/drain.go @@ -1,6 +1,7 @@ package node import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -13,7 +14,7 @@ var ( Short: "Drain a node", RunE: func(cmd *cobra.Command, args []string) error { if err := changeNodeAvailability(cmd, args, api.NodeAvailabilityDrain); err != nil { - if err == errNoChange { + if errors.Is(err, errNoChange) { return fmt.Errorf("Node %s was already drained", args[0]) } return err diff --git a/swarmd/cmd/swarmctl/node/pause.go b/swarmd/cmd/swarmctl/node/pause.go index 039521978c..ea4258562c 100644 --- a/swarmd/cmd/swarmctl/node/pause.go +++ b/swarmd/cmd/swarmctl/node/pause.go @@ -1,6 +1,7 @@ package node import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -13,7 +14,7 @@ var ( Short: "Pause a node", RunE: func(cmd *cobra.Command, args []string) error { if err := changeNodeAvailability(cmd, args, api.NodeAvailabilityPause); err != nil { - if err == errNoChange { + if errors.Is(err, errNoChange) { return fmt.Errorf("Node %s was already paused", args[0]) } return err diff --git a/swarmd/cmd/swarmctl/node/promote.go b/swarmd/cmd/swarmctl/node/promote.go index d3e892faa6..10895beba0 100644 --- a/swarmd/cmd/swarmctl/node/promote.go +++ b/swarmd/cmd/swarmctl/node/promote.go @@ -1,6 +1,7 @@ package node import ( + "errors" "fmt" "github.com/moby/swarmkit/v2/api" @@ -13,7 +14,7 @@ var ( Short: "Promote a node to a manager", RunE: func(cmd *cobra.Command, args []string) error { if err := changeNodeRole(cmd, args, api.NodeRoleManager); err != nil { - if err == errNoChange { + if errors.Is(err, errNoChange) { return fmt.Errorf("Node %s is already a manager", args[0]) } return err diff --git a/swarmd/cmd/swarmctl/node/update.go b/swarmd/cmd/swarmctl/node/update.go index 4e06f8d4e9..1739f89f91 100644 --- a/swarmd/cmd/swarmctl/node/update.go +++ b/swarmd/cmd/swarmctl/node/update.go @@ -1,6 +1,7 @@ package node import ( + "errors" "fmt" "github.com/spf13/cobra" @@ -12,7 +13,7 @@ var ( Short: "Update a node", RunE: func(cmd *cobra.Command, args []string) error { if err := updateNode(cmd, args); err != nil { - if err == errNoChange { + if errors.Is(err, errNoChange) { return fmt.Errorf("No change for node %s", args[0]) } return err diff --git a/swarmd/cmd/swarmctl/service/flagparser/config.go b/swarmd/cmd/swarmctl/service/flagparser/config.go index 6235c0c427..a76303d322 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/config.go +++ b/swarmd/cmd/swarmctl/service/flagparser/config.go @@ -1,6 +1,7 @@ package flagparser import ( + "errors" "fmt" "strings" @@ -16,14 +17,14 @@ func parseConfigString(configString string) (configName, presentName string, err configName = strings.TrimSpace(tokens[0]) if configName == "" { - err = fmt.Errorf("invalid config name provided") + err = errors.New("invalid config name provided") return } if len(tokens) > 1 { presentName = strings.TrimSpace(tokens[1]) if presentName == "" { - err = fmt.Errorf("invalid presentation name provided") + err = errors.New("invalid presentation name provided") return } } else { diff --git a/swarmd/cmd/swarmctl/service/flagparser/mode.go b/swarmd/cmd/swarmctl/service/flagparser/mode.go index 353c7a183a..b1ff9f2e0b 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/mode.go +++ b/swarmd/cmd/swarmctl/service/flagparser/mode.go @@ -1,7 +1,7 @@ package flagparser import ( - "fmt" + "errors" "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" @@ -32,7 +32,7 @@ func parseMode(flags *pflag.FlagSet, spec *api.ServiceSpec) error { if flags.Changed("replicas") { if spec.GetReplicated() == nil { - return fmt.Errorf("--replicas can only be specified in --mode replicated") + return errors.New("--replicas can only be specified in --mode replicated") } replicas, err := flags.GetUint64("replicas") if err != nil { diff --git a/swarmd/cmd/swarmctl/service/flagparser/placement.go b/swarmd/cmd/swarmctl/service/flagparser/placement.go index 279a509873..1b0406d08a 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/placement.go +++ b/swarmd/cmd/swarmctl/service/flagparser/placement.go @@ -1,7 +1,7 @@ package flagparser import ( - "fmt" + "errors" "github.com/moby/swarmkit/v2/api" "github.com/spf13/pflag" @@ -21,7 +21,7 @@ func parsePlacement(flags *pflag.FlagSet, spec *api.ServiceSpec) error { if flags.Changed("replicas-max-per-node") { if spec.GetReplicated() == nil { - return fmt.Errorf("--replicas-max-per-node can only be specified in --mode replicated") + return errors.New("--replicas-max-per-node can only be specified in --mode replicated") } maxReplicas, err := flags.GetUint64("replicas-max-per-node") if err != nil { diff --git a/swarmd/cmd/swarmctl/service/flagparser/port.go b/swarmd/cmd/swarmctl/service/flagparser/port.go index ac95892b31..de354992d5 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/port.go +++ b/swarmd/cmd/swarmctl/service/flagparser/port.go @@ -1,11 +1,12 @@ package flagparser import ( + "errors" + "fmt" "strconv" "strings" "github.com/moby/swarmkit/v2/api" - "github.com/pkg/errors" "github.com/spf13/pflag" ) @@ -55,7 +56,7 @@ func parsePortConfig(portConfig string) (string, api.PortConfig_Protocol, uint32 portSpec := parts[1] protocol, port, err := parsePortSpec(portSpec) if err != nil { - return "", protocol, 0, 0, errors.Wrap(err, "failed to parse port") + return "", protocol, 0, 0, fmt.Errorf("failed to parse port: %w", err) } if len(parts) > 2 { @@ -64,7 +65,7 @@ func parsePortConfig(portConfig string) (string, api.PortConfig_Protocol, uint32 portSpec := parts[2] nodeProtocol, swarmPort, err := parsePortSpec(portSpec) if err != nil { - return "", protocol, 0, 0, errors.Wrap(err, "failed to parse node port") + return "", protocol, 0, 0, fmt.Errorf("failed to parse node port: %w", err) } if nodeProtocol != protocol { @@ -89,7 +90,7 @@ func parsePortSpec(portSpec string) (api.PortConfig_Protocol, uint32, error) { proto := parts[1] protocol, ok := api.PortConfig_Protocol_value[strings.ToUpper(proto)] if !ok { - return 0, 0, errors.Errorf("invalid protocol string: %s", proto) + return 0, 0, fmt.Errorf("invalid protocol string: %s", proto) } return api.PortConfig_Protocol(protocol), uint32(port), nil diff --git a/swarmd/cmd/swarmctl/service/flagparser/secret.go b/swarmd/cmd/swarmctl/service/flagparser/secret.go index 4e38638e10..8d455c7174 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/secret.go +++ b/swarmd/cmd/swarmctl/service/flagparser/secret.go @@ -1,6 +1,7 @@ package flagparser import ( + "errors" "fmt" "strings" @@ -16,14 +17,14 @@ func parseSecretString(secretString string) (secretName, presentName string, err secretName = strings.TrimSpace(tokens[0]) if secretName == "" { - err = fmt.Errorf("invalid secret name provided") + err = errors.New("invalid secret name provided") return } if len(tokens) > 1 { presentName = strings.TrimSpace(tokens[1]) if presentName == "" { - err = fmt.Errorf("invalid presentation name provided") + err = errors.New("invalid presentation name provided") return } } else { diff --git a/swarmd/cmd/swarmctl/service/flagparser/tmpfs.go b/swarmd/cmd/swarmctl/service/flagparser/tmpfs.go index e0f90188e4..f5992ae28c 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/tmpfs.go +++ b/swarmd/cmd/swarmctl/service/flagparser/tmpfs.go @@ -1,13 +1,14 @@ package flagparser import ( + "errors" + "fmt" "os" "path" "strconv" "strings" "github.com/moby/swarmkit/v2/api" - "github.com/pkg/errors" "github.com/spf13/pflag" ) @@ -27,11 +28,11 @@ func parseTmpfs(flags *pflag.FlagSet, spec *api.ServiceSpec) error { parts := strings.SplitN(tmpfs, ":", 2) if len(parts) < 1 { - return errors.Errorf("invalid mount spec: %v", tmpfs) + return fmt.Errorf("invalid mount spec: %v", tmpfs) } if len(parts[0]) == 0 || !path.IsAbs(parts[0]) { - return errors.Errorf("invalid mount spec: %v", tmpfs) + return fmt.Errorf("invalid mount spec: %v", tmpfs) } m := api.Mount{ @@ -42,7 +43,7 @@ func parseTmpfs(flags *pflag.FlagSet, spec *api.ServiceSpec) error { if len(parts) == 2 { if strings.Contains(parts[1], ":") { // repeated colon is illegal - return errors.Errorf("invalid mount spec: %v", tmpfs) + return fmt.Errorf("invalid mount spec: %v", tmpfs) } // BUG(stevvooe): Cobra stringslice actually doesn't correctly @@ -73,7 +74,7 @@ func parseTmpfs(flags *pflag.FlagSet, spec *api.ServiceSpec) error { case 'k': multiplier = 1 << 10 default: - return errors.Errorf("invalid size format: %v", flag) + return fmt.Errorf("invalid size format: %v", flag) } // reparse the meat diff --git a/swarmd/cmd/swarmctl/service/logs.go b/swarmd/cmd/swarmctl/service/logs.go index 333119020f..3fc735c61b 100644 --- a/swarmd/cmd/swarmctl/service/logs.go +++ b/swarmd/cmd/swarmctl/service/logs.go @@ -2,13 +2,13 @@ package service import ( "context" + "errors" "fmt" "io" "os" "github.com/moby/swarmkit/swarmd/cmd/swarmctl/common" "github.com/moby/swarmkit/v2/api" - "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -55,16 +55,16 @@ var ( }, }) if err != nil { - return errors.Wrap(err, "failed to subscribe to logs") + return fmt.Errorf("failed to subscribe to logs: %w", err) } for { log, err := stream.Recv() - if err == io.EOF { + if errors.Is(err, io.EOF) { return nil } if err != nil { - return errors.Wrap(err, "failed receiving stream message") + return fmt.Errorf("failed receiving stream message: %w", err) } for _, msg := range log.Messages { diff --git a/swarmd/dockerexec/adapter.go b/swarmd/dockerexec/adapter.go index c641f3d06a..d6664797c7 100644 --- a/swarmd/dockerexec/adapter.go +++ b/swarmd/dockerexec/adapter.go @@ -3,6 +3,7 @@ package dockerexec import ( "context" "encoding/json" + "errors" "fmt" "io" "strings" @@ -16,7 +17,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" "golang.org/x/time/rate" ) @@ -72,7 +72,7 @@ func (c *containerAdapter) pullImage(ctx context.Context) error { lastStatus := "" for { if err := dec.Decode(&m); err != nil { - if err == io.EOF { + if errors.Is(err, io.EOF) { break } return err @@ -104,7 +104,7 @@ func (c *containerAdapter) pullImage(ctx context.Context) error { } // if the final stream object contained an error, return it if errMsg, ok := m["error"]; ok { - return errors.Errorf("%v", errMsg) + return fmt.Errorf("%v", errMsg) } return nil } @@ -286,7 +286,7 @@ func (c *containerAdapter) logs(ctx context.Context, options api.LogSubscription // See protobuf documentation for details of how this works. apiOptions.Tail = fmt.Sprint(-options.Tail - 1) } else if options.Tail > 0 { - return nil, fmt.Errorf("tail relative to start of logs not supported via docker API") + return nil, errors.New("tail relative to start of logs not supported via docker API") } if len(options.Streams) == 0 { diff --git a/swarmd/dockerexec/controller.go b/swarmd/dockerexec/controller.go index abc0508fa2..c5a452e1a0 100644 --- a/swarmd/dockerexec/controller.go +++ b/swarmd/dockerexec/controller.go @@ -5,6 +5,7 @@ import ( "bytes" "context" "encoding/binary" + "errors" "fmt" "io" "strconv" @@ -16,7 +17,6 @@ import ( engineapi "github.com/docker/docker/client" "github.com/docker/go-connections/nat" gogotypes "github.com/gogo/protobuf/types" - "github.com/pkg/errors" "golang.org/x/time/rate" "github.com/moby/swarmkit/v2/agent/exec" @@ -181,7 +181,7 @@ func (r *controller) Start(ctx context.Context) error { } if err := r.adapter.start(ctx); err != nil { - return errors.Wrap(err, "starting container failed") + return fmt.Errorf("starting container failed: %w", err) } // no health check @@ -219,7 +219,7 @@ func (r *controller) Start(ctx context.Context) error { case "die": // exit on terminal events ctnr, err := r.adapter.inspect(ctx) if err != nil { - return errors.Wrap(err, "die event received") + return fmt.Errorf("die event received: %w", err) } return makeExitError(ctnr) @@ -232,7 +232,7 @@ func (r *controller) Start(ctx context.Context) error { // in this case, we stop the container and report unhealthy status // TODO(runshenzhu): double check if it can cause a dead lock issue here if err := r.Shutdown(ctx); err != nil { - return errors.Wrap(err, "unhealthy container shutdown failed") + return fmt.Errorf("unhealthy container shutdown failed: %w", err) } return ErrContainerUnhealthy @@ -262,7 +262,7 @@ func (r *controller) Wait(ctx context.Context) error { // check the initial state and report that. ctnr, err := r.adapter.inspect(ctx) if err != nil { - return errors.Wrap(err, "inspecting container failed") + return fmt.Errorf("inspecting container failed: %w", err) } switch ctnr.State.Status { @@ -291,7 +291,7 @@ func (r *controller) Wait(ctx context.Context) error { case "die": // exit on terminal events ctnr, err := r.adapter.inspect(ctx) if err != nil { - return errors.Wrap(err, "die event received") + return fmt.Errorf("die event received: %w", err) } return makeExitError(ctnr) @@ -304,7 +304,7 @@ func (r *controller) Wait(ctx context.Context) error { // in this case, we stop the container and report unhealthy status // TODO(runshenzhu): double check if it can cause a dead lock issue here if err := r.Shutdown(ctx); err != nil { - return errors.Wrap(err, "unhealthy container shutdown failed") + return fmt.Errorf("unhealthy container shutdown failed: %w", err) } return ErrContainerUnhealthy } @@ -423,7 +423,7 @@ func (r *controller) waitReady(pctx context.Context) error { ctnr, err := r.adapter.inspect(ctx) if err != nil { if !isUnknownContainer(err) { - return errors.Wrap(err, "inspect container failed") + return fmt.Errorf("inspect container failed: %w", err) } } else { switch ctnr.State.Status { @@ -463,12 +463,12 @@ func (r *controller) Logs(ctx context.Context, publisher exec.LogPublisher, opti } if err := r.waitReady(ctx); err != nil { - return errors.Wrap(err, "container not ready for logs") + return fmt.Errorf("container not ready for logs: %w", err) } rc, err := r.adapter.logs(ctx, options) if err != nil { - return errors.Wrap(err, "failed getting container logs") + return fmt.Errorf("failed getting container logs: %w", err) } defer rc.Close() @@ -488,24 +488,24 @@ func (r *controller) Logs(ctx context.Context, publisher exec.LogPublisher, opti // so, message header is 8 bytes, treat as uint64, pull stream off MSB var header uint64 if err := binary.Read(brd, binary.BigEndian, &header); err != nil { - if err == io.EOF { + if errors.Is(err, io.EOF) { return nil } - return errors.Wrap(err, "failed reading log header") + return fmt.Errorf("failed reading log header: %w", err) } stream, size := (header>>(7<<3))&0xFF, header & ^(uint64(0xFF)<<(7<<3)) // limit here to decrease allocation back pressure. if err := limiter.WaitN(ctx, int(size)); err != nil { - return errors.Wrap(err, "failed rate limiter") + return fmt.Errorf("failed rate limiter: %w", err) } buf := make([]byte, size) _, err := io.ReadFull(brd, buf) if err != nil { - return errors.Wrap(err, "failed reading buffer") + return fmt.Errorf("failed reading buffer: %w", err) } // Timestamp is RFC3339Nano with 1 space after. Lop, parse, publish @@ -516,12 +516,12 @@ func (r *controller) Logs(ctx context.Context, publisher exec.LogPublisher, opti ts, err := time.Parse(time.RFC3339Nano, string(parts[0])) if err != nil { - return errors.Wrap(err, "failed to parse timestamp") + return fmt.Errorf("failed to parse timestamp: %w", err) } tsp, err := gogotypes.TimestampProto(ts) if err != nil { - return errors.Wrap(err, "failed to convert timestamp") + return fmt.Errorf("failed to convert timestamp: %w", err) } if err := publisher.Publish(ctx, api.LogMessage{ @@ -531,7 +531,7 @@ func (r *controller) Logs(ctx context.Context, publisher exec.LogPublisher, opti Data: parts[1], }); err != nil { - return errors.Wrap(err, "failed to publish log message") + return fmt.Errorf("failed to publish log message: %w", err) } } } diff --git a/swarmd/dockerexec/controller_integration_test.go b/swarmd/dockerexec/controller_integration_test.go index 68e92883a7..0dda213651 100644 --- a/swarmd/dockerexec/controller_integration_test.go +++ b/swarmd/dockerexec/controller_integration_test.go @@ -10,6 +10,7 @@ import ( "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/api/genericresource" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) var ( @@ -97,7 +98,5 @@ func TestControllerFlowIntegration(t *testing.T) { assert.NoError(t, ctlr.Close()) // NOTE(stevvooe): testify has no clue how to correctly do error equality. - if err := ctlr.Close(); err != exec.ErrControllerClosed { - t.Fatalf("expected controller to be closed: %v", err) - } + require.ErrorIs(t, ctlr.Close(), exec.ErrControllerClosed, "expected controller to be closed") } diff --git a/swarmd/dockerexec/controller_test.go b/swarmd/dockerexec/controller_test.go index 9a7ff1e32f..af299a1cf3 100644 --- a/swarmd/dockerexec/controller_test.go +++ b/swarmd/dockerexec/controller_test.go @@ -23,6 +23,7 @@ import ( "github.com/moby/swarmkit/v2/identity" "github.com/moby/swarmkit/v2/log" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) const tenSecond = 10 @@ -90,9 +91,7 @@ func TestControllerPrepareAlreadyPrepared(t *testing.T) { } // ensure idempotence - if err := ctlr.Prepare(ctx); err != exec.ErrTaskPrepared { - t.Fatalf("expected error %v, got %v", exec.ErrTaskPrepared, err) - } + require.ErrorIs(t, ctlr.Prepare(ctx), exec.ErrTaskPrepared) } func TestControllerStart(t *testing.T) { @@ -149,9 +148,7 @@ func TestControllerStartAlreadyStarted(t *testing.T) { } // ensure idempotence - if err := ctlr.Start(ctx); err != exec.ErrTaskStarted { - t.Fatalf("expected error %v, got %v", exec.ErrTaskPrepared, err) - } + require.ErrorIs(t, ctlr.Start(ctx), exec.ErrTaskStarted) } func TestControllerWait(t *testing.T) { diff --git a/template/context.go b/template/context.go index b1d995e994..31a0ccbe96 100644 --- a/template/context.go +++ b/template/context.go @@ -2,6 +2,7 @@ package template import ( "bytes" + "errors" "fmt" "strings" "text/template" @@ -11,7 +12,6 @@ import ( "github.com/moby/swarmkit/v2/agent/secrets" "github.com/moby/swarmkit/v2/api" "github.com/moby/swarmkit/v2/api/naming" - "github.com/pkg/errors" ) // Platform holds information about the underlying platform of the node @@ -132,7 +132,7 @@ func (ctx *PayloadContext) secretGetter(target string) (string, error) { } } - return "", errors.Errorf("secret target %s not found", target) + return "", fmt.Errorf("secret target %s not found", target) } func (ctx *PayloadContext) configGetter(target string) (string, error) { @@ -156,7 +156,7 @@ func (ctx *PayloadContext) configGetter(target string) (string, error) { } } - return "", errors.Errorf("config target %s not found", target) + return "", fmt.Errorf("config target %s not found", target) } func (ctx *PayloadContext) envGetter(variable string) (string, error) { diff --git a/template/context_test.go b/template/context_test.go index 2e81a4b9cc..64f4f732ae 100644 --- a/template/context_test.go +++ b/template/context_test.go @@ -6,6 +6,7 @@ import ( "github.com/moby/swarmkit/v2/api" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestTemplateContext(t *testing.T) { @@ -188,9 +189,7 @@ func TestTemplateContext(t *testing.T) { if testcase.Err == nil { t.Fatalf("unexpected error: %v", err) } else { - if err != testcase.Err { - t.Fatalf("unexpected error: %v != %v", err, testcase.Err) - } + require.ErrorIs(t, err, testcase.Err) } } diff --git a/template/expand.go b/template/expand.go index 13a7add036..b9a382e990 100644 --- a/template/expand.go +++ b/template/expand.go @@ -1,12 +1,12 @@ package template import ( + "errors" "fmt" "strings" "github.com/moby/swarmkit/v2/agent/exec" "github.com/moby/swarmkit/v2/api" - "github.com/pkg/errors" ) // ExpandContainerSpec expands templated fields in the runtime using the task @@ -18,7 +18,7 @@ import ( func ExpandContainerSpec(n *api.NodeDescription, t *api.Task) (*api.ContainerSpec, error) { container := t.Spec.GetContainer() if container == nil { - return nil, errors.Errorf("task missing ContainerSpec to expand") + return nil, errors.New("task missing ContainerSpec to expand") } container = container.Copy() @@ -27,17 +27,20 @@ func ExpandContainerSpec(n *api.NodeDescription, t *api.Task) (*api.ContainerSpe var err error container.Env, err = expandEnv(ctx, container.Env) if err != nil { - return container, errors.Wrap(err, "expanding env failed") + return container, fmt.Errorf("expanding env failed: %w", err) } // For now, we only allow templating of string-based mount fields container.Mounts, err = expandMounts(ctx, container.Mounts) if err != nil { - return container, errors.Wrap(err, "expanding mounts failed") + return container, fmt.Errorf("expanding mounts failed: %w", err) } container.Hostname, err = ctx.Expand(container.Hostname) - return container, errors.Wrap(err, "expanding hostname failed") + if err != nil { + return container, fmt.Errorf("expanding hostname failed: %w", err) + } + return container, nil } func expandMounts(ctx Context, mounts []api.Mount) ([]api.Mount, error) { @@ -50,24 +53,24 @@ func expandMounts(ctx Context, mounts []api.Mount) ([]api.Mount, error) { var err error mount.Source, err = ctx.Expand(mount.Source) if err != nil { - return mounts, errors.Wrapf(err, "expanding mount source %q", mount.Source) + return mounts, fmt.Errorf("expanding mount source %q: %w", mount.Source, err) } mount.Target, err = ctx.Expand(mount.Target) if err != nil { - return mounts, errors.Wrapf(err, "expanding mount target %q", mount.Target) + return mounts, fmt.Errorf("expanding mount target %q: %w", mount.Target, err) } if mount.VolumeOptions != nil { mount.VolumeOptions.Labels, err = expandMap(ctx, mount.VolumeOptions.Labels) if err != nil { - return mounts, errors.Wrap(err, "expanding volume labels") + return mounts, fmt.Errorf("expanding volume labels: %w", err) } if mount.VolumeOptions.DriverConfig != nil { mount.VolumeOptions.DriverConfig.Options, err = expandMap(ctx, mount.VolumeOptions.DriverConfig.Options) if err != nil { - return mounts, errors.Wrap(err, "expanding volume driver config") + return mounts, fmt.Errorf("expanding volume driver config: %w", err) } } } @@ -87,7 +90,7 @@ func expandMap(ctx Context, m map[string]string) (map[string]string, error) { for k, v := range m { v, err = ctx.Expand(v) if err != nil { - return m, errors.Wrapf(err, "expanding map entry %q=%q", k, v) + return m, fmt.Errorf("expanding map entry %q=%q: %w", k, v, err) } n[k] = v @@ -107,7 +110,7 @@ func expandEnv(ctx Context, values []string) ([]string, error) { if len(parts) > 1 { expanded, err := ctx.Expand(parts[1]) if err != nil { - return values, errors.Wrapf(err, "expanding env %q", value) + return values, fmt.Errorf("expanding env %q: %w", value, err) } entry = fmt.Sprintf("%s=%s", entry, expanded) diff --git a/template/getter.go b/template/getter.go index e8344735db..0211059177 100644 --- a/template/getter.go +++ b/template/getter.go @@ -1,9 +1,11 @@ package template import ( + "errors" + "fmt" + "github.com/moby/swarmkit/v2/agent/exec" "github.com/moby/swarmkit/v2/api" - "github.com/pkg/errors" ) type templatedSecretGetter struct { @@ -34,7 +36,7 @@ func (t templatedSecretGetter) Get(secretID string) (*api.Secret, error) { newSpec, err := ExpandSecretSpec(secret, t.node, t.t, t.dependencies) if err != nil { - return secret, errors.Wrapf(err, "failed to expand templated secret %s", secretID) + return secret, fmt.Errorf("failed to expand templated secret %s: %w", secretID, err) } secretCopy := *secret @@ -87,7 +89,7 @@ func (t templatedConfigGetter) GetAndFlagSecretData(configID string) (*api.Confi newSpec, sensitive, err := ExpandConfigSpec(config, t.node, t.t, t.dependencies) if err != nil { - return config, false, errors.Wrapf(err, "failed to expand templated config %s", configID) + return config, false, fmt.Errorf("failed to expand templated config %s: %w", configID, err) } configCopy := *config diff --git a/testutils/poll.go b/testutils/poll.go index 2811e0dca5..01c9e6116b 100644 --- a/testutils/poll.go +++ b/testutils/poll.go @@ -1,10 +1,10 @@ package testutils import ( + "fmt" "time" "code.cloudfoundry.org/clock/fakeclock" - "github.com/pkg/errors" ) // PollFuncWithTimeout is used to periodically execute a check function, it @@ -25,7 +25,7 @@ func PollFuncWithTimeout(clockSource *fakeclock.FakeClock, f func() error, timeo } select { case <-timer.C: - return errors.Wrap(err, "polling failed") + return fmt.Errorf("polling failed: %w", err) case <-time.After(50 * time.Millisecond): } } diff --git a/vendor/github.com/pkg/errors/.gitignore b/vendor/github.com/pkg/errors/.gitignore deleted file mode 100644 index daf913b1b3..0000000000 --- a/vendor/github.com/pkg/errors/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.test -*.prof diff --git a/vendor/github.com/pkg/errors/.travis.yml b/vendor/github.com/pkg/errors/.travis.yml deleted file mode 100644 index 9159de03e0..0000000000 --- a/vendor/github.com/pkg/errors/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: go -go_import_path: github.com/pkg/errors -go: - - 1.11.x - - 1.12.x - - 1.13.x - - tip - -script: - - make check diff --git a/vendor/github.com/pkg/errors/LICENSE b/vendor/github.com/pkg/errors/LICENSE deleted file mode 100644 index 835ba3e755..0000000000 --- a/vendor/github.com/pkg/errors/LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) 2015, Dave Cheney -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/pkg/errors/Makefile b/vendor/github.com/pkg/errors/Makefile deleted file mode 100644 index ce9d7cded6..0000000000 --- a/vendor/github.com/pkg/errors/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -PKGS := github.com/pkg/errors -SRCDIRS := $(shell go list -f '{{.Dir}}' $(PKGS)) -GO := go - -check: test vet gofmt misspell unconvert staticcheck ineffassign unparam - -test: - $(GO) test $(PKGS) - -vet: | test - $(GO) vet $(PKGS) - -staticcheck: - $(GO) get honnef.co/go/tools/cmd/staticcheck - staticcheck -checks all $(PKGS) - -misspell: - $(GO) get github.com/client9/misspell/cmd/misspell - misspell \ - -locale GB \ - -error \ - *.md *.go - -unconvert: - $(GO) get github.com/mdempsky/unconvert - unconvert -v $(PKGS) - -ineffassign: - $(GO) get github.com/gordonklaus/ineffassign - find $(SRCDIRS) -name '*.go' | xargs ineffassign - -pedantic: check errcheck - -unparam: - $(GO) get mvdan.cc/unparam - unparam ./... - -errcheck: - $(GO) get github.com/kisielk/errcheck - errcheck $(PKGS) - -gofmt: - @echo Checking code is gofmted - @test -z "$(shell gofmt -s -l -d -e $(SRCDIRS) | tee /dev/stderr)" diff --git a/vendor/github.com/pkg/errors/README.md b/vendor/github.com/pkg/errors/README.md deleted file mode 100644 index 54dfdcb12e..0000000000 --- a/vendor/github.com/pkg/errors/README.md +++ /dev/null @@ -1,59 +0,0 @@ -# errors [![Travis-CI](https://travis-ci.org/pkg/errors.svg)](https://travis-ci.org/pkg/errors) [![AppVeyor](https://ci.appveyor.com/api/projects/status/b98mptawhudj53ep/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/errors/branch/master) [![GoDoc](https://godoc.org/github.com/pkg/errors?status.svg)](http://godoc.org/github.com/pkg/errors) [![Report card](https://goreportcard.com/badge/github.com/pkg/errors)](https://goreportcard.com/report/github.com/pkg/errors) [![Sourcegraph](https://sourcegraph.com/github.com/pkg/errors/-/badge.svg)](https://sourcegraph.com/github.com/pkg/errors?badge) - -Package errors provides simple error handling primitives. - -`go get github.com/pkg/errors` - -The traditional error handling idiom in Go is roughly akin to -```go -if err != nil { - return err -} -``` -which applied recursively up the call stack results in error reports without context or debugging information. The errors package allows programmers to add context to the failure path in their code in a way that does not destroy the original value of the error. - -## Adding context to an error - -The errors.Wrap function returns a new error that adds context to the original error. For example -```go -_, err := ioutil.ReadAll(r) -if err != nil { - return errors.Wrap(err, "read failed") -} -``` -## Retrieving the cause of an error - -Using `errors.Wrap` constructs a stack of errors, adding context to the preceding error. Depending on the nature of the error it may be necessary to reverse the operation of errors.Wrap to retrieve the original error for inspection. Any error value which implements this interface can be inspected by `errors.Cause`. -```go -type causer interface { - Cause() error -} -``` -`errors.Cause` will recursively retrieve the topmost error which does not implement `causer`, which is assumed to be the original cause. For example: -```go -switch err := errors.Cause(err).(type) { -case *MyError: - // handle specifically -default: - // unknown error -} -``` - -[Read the package documentation for more information](https://godoc.org/github.com/pkg/errors). - -## Roadmap - -With the upcoming [Go2 error proposals](https://go.googlesource.com/proposal/+/master/design/go2draft.md) this package is moving into maintenance mode. The roadmap for a 1.0 release is as follows: - -- 0.9. Remove pre Go 1.9 and Go 1.10 support, address outstanding pull requests (if possible) -- 1.0. Final release. - -## Contributing - -Because of the Go2 errors changes, this package is not accepting proposals for new functionality. With that said, we welcome pull requests, bug fixes and issue reports. - -Before sending a PR, please discuss your change by raising an issue. - -## License - -BSD-2-Clause diff --git a/vendor/github.com/pkg/errors/appveyor.yml b/vendor/github.com/pkg/errors/appveyor.yml deleted file mode 100644 index a932eade02..0000000000 --- a/vendor/github.com/pkg/errors/appveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: build-{build}.{branch} - -clone_folder: C:\gopath\src\github.com\pkg\errors -shallow_clone: true # for startup speed - -environment: - GOPATH: C:\gopath - -platform: - - x64 - -# http://www.appveyor.com/docs/installed-software -install: - # some helpful output for debugging builds - - go version - - go env - # pre-installed MinGW at C:\MinGW is 32bit only - # but MSYS2 at C:\msys64 has mingw64 - - set PATH=C:\msys64\mingw64\bin;%PATH% - - gcc --version - - g++ --version - -build_script: - - go install -v ./... - -test_script: - - set PATH=C:\gopath\bin;%PATH% - - go test -v ./... - -#artifacts: -# - path: '%GOPATH%\bin\*.exe' -deploy: off diff --git a/vendor/github.com/pkg/errors/errors.go b/vendor/github.com/pkg/errors/errors.go deleted file mode 100644 index 161aea2582..0000000000 --- a/vendor/github.com/pkg/errors/errors.go +++ /dev/null @@ -1,288 +0,0 @@ -// Package errors provides simple error handling primitives. -// -// The traditional error handling idiom in Go is roughly akin to -// -// if err != nil { -// return err -// } -// -// which when applied recursively up the call stack results in error reports -// without context or debugging information. The errors package allows -// programmers to add context to the failure path in their code in a way -// that does not destroy the original value of the error. -// -// Adding context to an error -// -// The errors.Wrap function returns a new error that adds context to the -// original error by recording a stack trace at the point Wrap is called, -// together with the supplied message. For example -// -// _, err := ioutil.ReadAll(r) -// if err != nil { -// return errors.Wrap(err, "read failed") -// } -// -// If additional control is required, the errors.WithStack and -// errors.WithMessage functions destructure errors.Wrap into its component -// operations: annotating an error with a stack trace and with a message, -// respectively. -// -// Retrieving the cause of an error -// -// Using errors.Wrap constructs a stack of errors, adding context to the -// preceding error. Depending on the nature of the error it may be necessary -// to reverse the operation of errors.Wrap to retrieve the original error -// for inspection. Any error value which implements this interface -// -// type causer interface { -// Cause() error -// } -// -// can be inspected by errors.Cause. errors.Cause will recursively retrieve -// the topmost error that does not implement causer, which is assumed to be -// the original cause. For example: -// -// switch err := errors.Cause(err).(type) { -// case *MyError: -// // handle specifically -// default: -// // unknown error -// } -// -// Although the causer interface is not exported by this package, it is -// considered a part of its stable public interface. -// -// Formatted printing of errors -// -// All error values returned from this package implement fmt.Formatter and can -// be formatted by the fmt package. The following verbs are supported: -// -// %s print the error. If the error has a Cause it will be -// printed recursively. -// %v see %s -// %+v extended format. Each Frame of the error's StackTrace will -// be printed in detail. -// -// Retrieving the stack trace of an error or wrapper -// -// New, Errorf, Wrap, and Wrapf record a stack trace at the point they are -// invoked. This information can be retrieved with the following interface: -// -// type stackTracer interface { -// StackTrace() errors.StackTrace -// } -// -// The returned errors.StackTrace type is defined as -// -// type StackTrace []Frame -// -// The Frame type represents a call site in the stack trace. Frame supports -// the fmt.Formatter interface that can be used for printing information about -// the stack trace of this error. For example: -// -// if err, ok := err.(stackTracer); ok { -// for _, f := range err.StackTrace() { -// fmt.Printf("%+s:%d\n", f, f) -// } -// } -// -// Although the stackTracer interface is not exported by this package, it is -// considered a part of its stable public interface. -// -// See the documentation for Frame.Format for more details. -package errors - -import ( - "fmt" - "io" -) - -// New returns an error with the supplied message. -// New also records the stack trace at the point it was called. -func New(message string) error { - return &fundamental{ - msg: message, - stack: callers(), - } -} - -// Errorf formats according to a format specifier and returns the string -// as a value that satisfies error. -// Errorf also records the stack trace at the point it was called. -func Errorf(format string, args ...interface{}) error { - return &fundamental{ - msg: fmt.Sprintf(format, args...), - stack: callers(), - } -} - -// fundamental is an error that has a message and a stack, but no caller. -type fundamental struct { - msg string - *stack -} - -func (f *fundamental) Error() string { return f.msg } - -func (f *fundamental) Format(s fmt.State, verb rune) { - switch verb { - case 'v': - if s.Flag('+') { - io.WriteString(s, f.msg) - f.stack.Format(s, verb) - return - } - fallthrough - case 's': - io.WriteString(s, f.msg) - case 'q': - fmt.Fprintf(s, "%q", f.msg) - } -} - -// WithStack annotates err with a stack trace at the point WithStack was called. -// If err is nil, WithStack returns nil. -func WithStack(err error) error { - if err == nil { - return nil - } - return &withStack{ - err, - callers(), - } -} - -type withStack struct { - error - *stack -} - -func (w *withStack) Cause() error { return w.error } - -// Unwrap provides compatibility for Go 1.13 error chains. -func (w *withStack) Unwrap() error { return w.error } - -func (w *withStack) Format(s fmt.State, verb rune) { - switch verb { - case 'v': - if s.Flag('+') { - fmt.Fprintf(s, "%+v", w.Cause()) - w.stack.Format(s, verb) - return - } - fallthrough - case 's': - io.WriteString(s, w.Error()) - case 'q': - fmt.Fprintf(s, "%q", w.Error()) - } -} - -// Wrap returns an error annotating err with a stack trace -// at the point Wrap is called, and the supplied message. -// If err is nil, Wrap returns nil. -func Wrap(err error, message string) error { - if err == nil { - return nil - } - err = &withMessage{ - cause: err, - msg: message, - } - return &withStack{ - err, - callers(), - } -} - -// Wrapf returns an error annotating err with a stack trace -// at the point Wrapf is called, and the format specifier. -// If err is nil, Wrapf returns nil. -func Wrapf(err error, format string, args ...interface{}) error { - if err == nil { - return nil - } - err = &withMessage{ - cause: err, - msg: fmt.Sprintf(format, args...), - } - return &withStack{ - err, - callers(), - } -} - -// WithMessage annotates err with a new message. -// If err is nil, WithMessage returns nil. -func WithMessage(err error, message string) error { - if err == nil { - return nil - } - return &withMessage{ - cause: err, - msg: message, - } -} - -// WithMessagef annotates err with the format specifier. -// If err is nil, WithMessagef returns nil. -func WithMessagef(err error, format string, args ...interface{}) error { - if err == nil { - return nil - } - return &withMessage{ - cause: err, - msg: fmt.Sprintf(format, args...), - } -} - -type withMessage struct { - cause error - msg string -} - -func (w *withMessage) Error() string { return w.msg + ": " + w.cause.Error() } -func (w *withMessage) Cause() error { return w.cause } - -// Unwrap provides compatibility for Go 1.13 error chains. -func (w *withMessage) Unwrap() error { return w.cause } - -func (w *withMessage) Format(s fmt.State, verb rune) { - switch verb { - case 'v': - if s.Flag('+') { - fmt.Fprintf(s, "%+v\n", w.Cause()) - io.WriteString(s, w.msg) - return - } - fallthrough - case 's', 'q': - io.WriteString(s, w.Error()) - } -} - -// Cause returns the underlying cause of the error, if possible. -// An error value has a cause if it implements the following -// interface: -// -// type causer interface { -// Cause() error -// } -// -// If the error does not implement Cause, the original error will -// be returned. If the error is nil, nil will be returned without further -// investigation. -func Cause(err error) error { - type causer interface { - Cause() error - } - - for err != nil { - cause, ok := err.(causer) - if !ok { - break - } - err = cause.Cause() - } - return err -} diff --git a/vendor/github.com/pkg/errors/go113.go b/vendor/github.com/pkg/errors/go113.go deleted file mode 100644 index be0d10d0c7..0000000000 --- a/vendor/github.com/pkg/errors/go113.go +++ /dev/null @@ -1,38 +0,0 @@ -// +build go1.13 - -package errors - -import ( - stderrors "errors" -) - -// Is reports whether any error in err's chain matches target. -// -// The chain consists of err itself followed by the sequence of errors obtained by -// repeatedly calling Unwrap. -// -// An error is considered to match a target if it is equal to that target or if -// it implements a method Is(error) bool such that Is(target) returns true. -func Is(err, target error) bool { return stderrors.Is(err, target) } - -// As finds the first error in err's chain that matches target, and if so, sets -// target to that error value and returns true. -// -// The chain consists of err itself followed by the sequence of errors obtained by -// repeatedly calling Unwrap. -// -// An error matches target if the error's concrete value is assignable to the value -// pointed to by target, or if the error has a method As(interface{}) bool such that -// As(target) returns true. In the latter case, the As method is responsible for -// setting target. -// -// As will panic if target is not a non-nil pointer to either a type that implements -// error, or to any interface type. As returns false if err is nil. -func As(err error, target interface{}) bool { return stderrors.As(err, target) } - -// Unwrap returns the result of calling the Unwrap method on err, if err's -// type contains an Unwrap method returning error. -// Otherwise, Unwrap returns nil. -func Unwrap(err error) error { - return stderrors.Unwrap(err) -} diff --git a/vendor/github.com/pkg/errors/stack.go b/vendor/github.com/pkg/errors/stack.go deleted file mode 100644 index 779a8348fb..0000000000 --- a/vendor/github.com/pkg/errors/stack.go +++ /dev/null @@ -1,177 +0,0 @@ -package errors - -import ( - "fmt" - "io" - "path" - "runtime" - "strconv" - "strings" -) - -// Frame represents a program counter inside a stack frame. -// For historical reasons if Frame is interpreted as a uintptr -// its value represents the program counter + 1. -type Frame uintptr - -// pc returns the program counter for this frame; -// multiple frames may have the same PC value. -func (f Frame) pc() uintptr { return uintptr(f) - 1 } - -// file returns the full path to the file that contains the -// function for this Frame's pc. -func (f Frame) file() string { - fn := runtime.FuncForPC(f.pc()) - if fn == nil { - return "unknown" - } - file, _ := fn.FileLine(f.pc()) - return file -} - -// line returns the line number of source code of the -// function for this Frame's pc. -func (f Frame) line() int { - fn := runtime.FuncForPC(f.pc()) - if fn == nil { - return 0 - } - _, line := fn.FileLine(f.pc()) - return line -} - -// name returns the name of this function, if known. -func (f Frame) name() string { - fn := runtime.FuncForPC(f.pc()) - if fn == nil { - return "unknown" - } - return fn.Name() -} - -// Format formats the frame according to the fmt.Formatter interface. -// -// %s source file -// %d source line -// %n function name -// %v equivalent to %s:%d -// -// Format accepts flags that alter the printing of some verbs, as follows: -// -// %+s function name and path of source file relative to the compile time -// GOPATH separated by \n\t (\n\t) -// %+v equivalent to %+s:%d -func (f Frame) Format(s fmt.State, verb rune) { - switch verb { - case 's': - switch { - case s.Flag('+'): - io.WriteString(s, f.name()) - io.WriteString(s, "\n\t") - io.WriteString(s, f.file()) - default: - io.WriteString(s, path.Base(f.file())) - } - case 'd': - io.WriteString(s, strconv.Itoa(f.line())) - case 'n': - io.WriteString(s, funcname(f.name())) - case 'v': - f.Format(s, 's') - io.WriteString(s, ":") - f.Format(s, 'd') - } -} - -// MarshalText formats a stacktrace Frame as a text string. The output is the -// same as that of fmt.Sprintf("%+v", f), but without newlines or tabs. -func (f Frame) MarshalText() ([]byte, error) { - name := f.name() - if name == "unknown" { - return []byte(name), nil - } - return []byte(fmt.Sprintf("%s %s:%d", name, f.file(), f.line())), nil -} - -// StackTrace is stack of Frames from innermost (newest) to outermost (oldest). -type StackTrace []Frame - -// Format formats the stack of Frames according to the fmt.Formatter interface. -// -// %s lists source files for each Frame in the stack -// %v lists the source file and line number for each Frame in the stack -// -// Format accepts flags that alter the printing of some verbs, as follows: -// -// %+v Prints filename, function, and line number for each Frame in the stack. -func (st StackTrace) Format(s fmt.State, verb rune) { - switch verb { - case 'v': - switch { - case s.Flag('+'): - for _, f := range st { - io.WriteString(s, "\n") - f.Format(s, verb) - } - case s.Flag('#'): - fmt.Fprintf(s, "%#v", []Frame(st)) - default: - st.formatSlice(s, verb) - } - case 's': - st.formatSlice(s, verb) - } -} - -// formatSlice will format this StackTrace into the given buffer as a slice of -// Frame, only valid when called with '%s' or '%v'. -func (st StackTrace) formatSlice(s fmt.State, verb rune) { - io.WriteString(s, "[") - for i, f := range st { - if i > 0 { - io.WriteString(s, " ") - } - f.Format(s, verb) - } - io.WriteString(s, "]") -} - -// stack represents a stack of program counters. -type stack []uintptr - -func (s *stack) Format(st fmt.State, verb rune) { - switch verb { - case 'v': - switch { - case st.Flag('+'): - for _, pc := range *s { - f := Frame(pc) - fmt.Fprintf(st, "\n%+v", f) - } - } - } -} - -func (s *stack) StackTrace() StackTrace { - f := make([]Frame, len(*s)) - for i := 0; i < len(f); i++ { - f[i] = Frame((*s)[i]) - } - return f -} - -func callers() *stack { - const depth = 32 - var pcs [depth]uintptr - n := runtime.Callers(3, pcs[:]) - var st stack = pcs[0:n] - return &st -} - -// funcname removes the path prefix component of a function's name reported by func.Name(). -func funcname(name string) string { - i := strings.LastIndex(name, "/") - name = name[i+1:] - i = strings.Index(name, ".") - return name[i+1:] -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 1a9f28e7fa..75f2e76b48 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -202,9 +202,6 @@ github.com/opencontainers/go-digest # github.com/pelletier/go-toml v1.8.1 ## explicit; go 1.12 github.com/pelletier/go-toml -# github.com/pkg/errors v0.9.1 -## explicit -github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 ## explicit github.com/pmezard/go-difflib/difflib diff --git a/watch/queue/queue.go b/watch/queue/queue.go index 3fefe24a73..9d65ff7878 100644 --- a/watch/queue/queue.go +++ b/watch/queue/queue.go @@ -2,6 +2,7 @@ package queue import ( "container/list" + "errors" "fmt" "sync" @@ -11,7 +12,7 @@ import ( // ErrQueueFull is returned by a Write operation when that Write causes the // queue to reach its size limit. -var ErrQueueFull = fmt.Errorf("queue closed due to size limit") +var ErrQueueFull = errors.New("queue closed due to size limit") // LimitQueue accepts all messages into a queue for asynchronous consumption by // a sink until an upper limit of messages is reached. When that limit is diff --git a/watch/sinks.go b/watch/sinks.go index b22b4842c3..8030d998c8 100644 --- a/watch/sinks.go +++ b/watch/sinks.go @@ -1,14 +1,14 @@ package watch import ( - "fmt" + "errors" "time" events "github.com/docker/go-events" ) // ErrSinkTimeout is returned from the Write method when a sink times out. -var ErrSinkTimeout = fmt.Errorf("timeout exceeded, tearing down sink") +var ErrSinkTimeout = errors.New("timeout exceeded, tearing down sink") // timeoutSink is a sink that wraps another sink with a timeout. If the // embedded sink fails to complete a Write operation within the specified @@ -52,7 +52,7 @@ type dropErrClosed struct { func (s dropErrClosed) Write(event events.Event) error { err := s.sink.Write(event) - if err == events.ErrSinkClosed { + if errors.Is(err, events.ErrSinkClosed) { return nil } return err