Skip to content

Commit 99a2cd2

Browse files
mmorel-35mmorel-35
committed
use fmt.Errorf instead of errors.Wrapf
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent 85cc531 commit 99a2cd2

10 files changed

Lines changed: 38 additions & 37 deletions

File tree

‎ca/certificates.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -534,30 +534,30 @@ func ValidateCertChain(rootPool *x509.CertPool, certs []byte, allowExpired bool)
534534
// Manual expiry validation because we want more information on which certificate in the chain is expired, and
535535
// because this is an easier way to allow expired certs.
536536
if now.Before(cert.NotBefore) {
537-
return nil, nil, errors.Wrapf(
537+
return nil, nil, fmt.Errorf(
538+
"certificate (%d - %s) not valid before %s, and it is currently %s: %w",
539+
i+1, cert.Subject.CommonName, cert.NotBefore.UTC().Format(time.RFC1123), now.Format(time.RFC1123),
538540
x509.CertificateInvalidError{
539541
Cert: cert,
540542
Reason: x509.Expired,
541-
},
542-
"certificate (%d - %s) not valid before %s, and it is currently %s",
543-
i+1, cert.Subject.CommonName, cert.NotBefore.UTC().Format(time.RFC1123), now.Format(time.RFC1123))
543+
})
544544
}
545545
if !allowExpired && now.After(cert.NotAfter) {
546-
return nil, nil, errors.Wrapf(
546+
return nil, nil, fmt.Errorf(
547+
"certificate (%d - %s) not valid after %s, and it is currently %s: %w",
548+
i+1, cert.Subject.CommonName, cert.NotAfter.UTC().Format(time.RFC1123), now.Format(time.RFC1123),
547549
x509.CertificateInvalidError{
548550
Cert: cert,
549551
Reason: x509.Expired,
550-
},
551-
"certificate (%d - %s) not valid after %s, and it is currently %s",
552-
i+1, cert.Subject.CommonName, cert.NotAfter.UTC().Format(time.RFC1123), now.Format(time.RFC1123))
552+
})
553553
}
554554

555555
if i > 0 {
556556
// check that the previous cert was signed by this cert
557557
prevCert := parsedCerts[i-1]
558558
if err := prevCert.CheckSignatureFrom(cert); err != nil {
559-
return nil, nil, errors.Wrapf(err, "certificates do not form a chain: (%d - %s) is not signed by (%d - %s)",
560-
i, prevCert.Subject.CommonName, i+1, cert.Subject.CommonName)
559+
return nil, nil, fmt.Errorf("certificates do not form a chain: (%d - %s) is not signed by (%d - %s): %w",
560+
i, prevCert.Subject.CommonName, i+1, cert.Subject.CommonName, err)
561561
}
562562

563563
if intermediatePool == nil {

‎manager/allocator/network.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,14 +1089,14 @@ func (a *Allocator) reallocateNode(ctx context.Context, nodeID string) error {
10891089

10901090
networks, err := a.getNodeNetworks(node.ID)
10911091
if err != nil {
1092-
return errors.Wrapf(err, "error getting networks for node %v", nodeID)
1092+
return fmt.Errorf("error getting networks for node %v: %w", nodeID, err)
10931093
}
10941094
if a.allocateNode(ctx, node, false, networks) {
10951095
// if something was allocated, commit the node
10961096
if err := a.store.Batch(func(batch *store.Batch) error {
10971097
return a.commitAllocatedNode(ctx, batch, node)
10981098
}); err != nil {
1099-
return errors.Wrapf(err, "error committing allocation for node %v", nodeID)
1099+
return fmt.Errorf("error committing allocation for node %v: %w", nodeID, err)
11001100
}
11011101
}
11021102
return nil
@@ -1112,7 +1112,7 @@ func (a *Allocator) commitAllocatedNode(ctx context.Context, batch *store.Batch,
11121112
err = store.UpdateNode(tx, storeNode)
11131113
}
11141114

1115-
return errors.Wrapf(err, "failed updating state in store transaction for node %s", node.ID)
1115+
return fmt.Errorf("failed updating state in store transaction for node %s: %w", node.ID, err)
11161116
}); err != nil {
11171117
if err := a.deallocateNode(node); err != nil {
11181118
log.G(ctx).WithError(err).Errorf("failed rolling back allocation of node %s", node.ID)
@@ -1254,7 +1254,7 @@ func (a *Allocator) commitAllocatedService(ctx context.Context, batch *store.Bat
12541254
err = store.UpdateService(tx, storeService)
12551255
}
12561256

1257-
return errors.Wrapf(err, "failed updating state in store transaction for service %s", s.ID)
1257+
return fmt.Errorf("failed updating state in store transaction for service %s: %w", s.ID, err)
12581258
}); err != nil {
12591259
if err := a.netCtx.deallocateService(s); err != nil {
12601260
log.G(ctx).WithError(err).Errorf("failed rolling back allocation of service %s", s.ID)
@@ -1280,7 +1280,7 @@ func (a *Allocator) allocateNetwork(ctx context.Context, n *api.Network) error {
12801280
func (a *Allocator) commitAllocatedNetwork(ctx context.Context, batch *store.Batch, n *api.Network) error {
12811281
if err := batch.Update(func(tx store.Tx) error {
12821282
if err := store.UpdateNetwork(tx, n); err != nil {
1283-
return errors.Wrapf(err, "failed updating state in store transaction for network %s", n.ID)
1283+
return fmt.Errorf("failed updating state in store transaction for network %s: %w", n.ID, err)
12841284
}
12851285
return nil
12861286
}); err != nil {
@@ -1385,7 +1385,7 @@ func (a *Allocator) commitAllocatedTask(ctx context.Context, batch *store.Batch,
13851385
err = store.UpdateTask(tx, storeTask)
13861386
}
13871387

1388-
return errors.Wrapf(err, "failed updating state in store transaction for task %s", t.ID)
1388+
return fmt.Errorf("failed updating state in store transaction for task %s: %w", t.ID, err)
13891389
})
13901390

13911391
if retError == nil {

‎manager/dispatcher/dispatcher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,10 @@ func (d *Dispatcher) markNodesUnknown(ctx context.Context) error {
466466
}
467467
}
468468
if err := d.nodes.AddUnknown(node, expireFunc); err != nil {
469-
return errors.Wrapf(err, `adding node %s in "unknown" state to node store failed`, nodeID)
469+
return fmt.Errorf(`adding node %s in "unknown" state to node store failed: %w`, nodeID, err)
470470
}
471471
if err := store.UpdateNode(tx, node); err != nil {
472-
return errors.Wrapf(err, "update for node %s failed", nodeID)
472+
return fmt.Errorf("update for node %s failed: %w", nodeID, err)
473473
}
474474
return nil
475475
})

‎manager/state/raft/raft.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ func (n *Node) registerNode(node *api.RaftMember) error {
15791579
err := n.cluster.AddMember(member)
15801580
if err != nil {
15811581
if rerr := n.transport.RemovePeer(node.RaftID); rerr != nil {
1582-
return errors.Wrapf(rerr, "failed to remove peer after error %v", err)
1582+
return fmt.Errorf("failed to remove peer after error %v: %w", err, rerr)
15831583
}
15841584
return err
15851585
}

‎manager/state/raft/storage/storage.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func (e *EncryptedRaftLogger) BootstrapNew(metadata []byte) error {
149149

150150
for _, dirpath := range []string{filepath.Dir(e.walDir()), e.snapDir()} {
151151
if err := os.MkdirAll(dirpath, 0o700); err != nil {
152-
return errors.Wrapf(err, "failed to create %s", dirpath)
152+
return fmt.Errorf("failed to create %s: %w", dirpath, err)
153153
}
154154
}
155155
var err error
@@ -270,7 +270,7 @@ func (e *EncryptedRaftLogger) GC(index uint64, term uint64, keepOldSnapshots uin
270270
var snapTerm, snapIndex uint64
271271
_, err = fmt.Sscanf(oldestSnapshot, "%016x-%016x.snap", &snapTerm, &snapIndex)
272272
if err != nil {
273-
return errors.Wrapf(err, "malformed snapshot filename %s", oldestSnapshot)
273+
return fmt.Errorf("malformed snapshot filename %s: %w", oldestSnapshot, err)
274274
}
275275

276276
wals, err := ListWALs(e.walDir())
@@ -285,7 +285,7 @@ func (e *EncryptedRaftLogger) GC(index uint64, term uint64, keepOldSnapshots uin
285285
var walSeq, walIndex uint64
286286
_, err = fmt.Sscanf(walName, "%016x-%016x.wal", &walSeq, &walIndex)
287287
if err != nil {
288-
return errors.Wrapf(err, "could not parse WAL name %s", walName)
288+
return fmt.Errorf("could not parse WAL name %s: %w", walName, err)
289289
}
290290

291291
if walIndex >= snapIndex {
@@ -305,12 +305,12 @@ func (e *EncryptedRaftLogger) GC(index uint64, term uint64, keepOldSnapshots uin
305305
walPath := filepath.Join(e.walDir(), wals[i])
306306
l, err := fileutil.TryLockFile(walPath, os.O_WRONLY, fileutil.PrivateFileMode)
307307
if err != nil {
308-
return errors.Wrapf(err, "could not lock old WAL file %s for removal", wals[i])
308+
return fmt.Errorf("could not lock old WAL file %s for removal: %w", wals[i], err)
309309
}
310310
err = os.Remove(walPath)
311311
l.Close()
312312
if err != nil {
313-
return errors.Wrapf(err, "error removing old WAL file %s", wals[i])
313+
return fmt.Errorf("error removing old WAL file %s: %w", wals[i], err)
314314
}
315315
}
316316

‎manager/state/raft/transport/peer.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/moby/swarmkit/v2/api"
1313
"github.com/moby/swarmkit/v2/log"
1414
"github.com/moby/swarmkit/v2/manager/state/raft/membership"
15-
"github.com/pkg/errors"
1615
"go.etcd.io/etcd/raft/v3"
1716
"go.etcd.io/etcd/raft/v3/raftpb"
1817
"google.golang.org/grpc/status"
@@ -46,7 +45,7 @@ type peer struct {
4645
func newPeer(id uint64, addr string, tr *Transport) (*peer, error) {
4746
cc, err := tr.dial(addr)
4847
if err != nil {
49-
return nil, errors.Wrapf(err, "failed to create conn for %x with addr %s", id, addr)
48+
return nil, fmt.Errorf("failed to create conn for %x with addr %s: %w", id, addr, err)
5049
}
5150
ctx, cancel := context.WithCancel(tr.ctx)
5251
ctx = log.WithField(ctx, "peer_id", fmt.Sprintf("%x", id))

‎manager/state/raft/transport/transport.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func (t *Transport) Send(m raftpb.Message) error {
147147
return nil
148148
}
149149
if err := p.send(m); err != nil {
150-
return errors.Wrapf(err, "failed to send message %x to %x", m.Type, m.To)
150+
return fmt.Errorf("failed to send message %x to %x: %w", m.Type, m.To, err)
151151
}
152152
return nil
153153
}
@@ -170,7 +170,7 @@ func (t *Transport) AddPeer(id uint64, addr string) error {
170170
log.G(t.ctx).Debugf("transport: add peer %x with address %s", id, addr)
171171
p, err := newPeer(id, addr, t)
172172
if err != nil {
173-
return errors.Wrapf(err, "failed to create peer %x with addr %s", id, addr)
173+
return fmt.Errorf("failed to create peer %x with addr %s: %w", id, addr, err)
174174
}
175175
t.peers[id] = p
176176
return nil
@@ -403,11 +403,11 @@ func (t *Transport) resolvePeer(ctx context.Context, id uint64) (*peer, error) {
403403
func (t *Transport) sendUnknownMessage(ctx context.Context, m raftpb.Message) error {
404404
p, err := t.resolvePeer(ctx, m.To)
405405
if err != nil {
406-
return errors.Wrapf(err, "failed to resolve peer")
406+
return fmt.Errorf("failed to resolve peer: %w", err)
407407
}
408408
defer p.cancel()
409409
if err := p.sendProcessMessage(ctx, m); err != nil {
410-
return errors.Wrapf(err, "failed to send message")
410+
return fmt.Errorf("failed to send message: %w", err)
411411
}
412412
return nil
413413
}

‎node/node.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ func (n *Node) loadSecurityConfig(ctx context.Context, paths *ca.SecurityConfigP
825825
if isInvalidKEK {
826826
return nil, nil, ErrInvalidUnlockKey
827827
} else if !os.IsNotExist(err) {
828-
return nil, nil, errors.Wrapf(err, "error while loading TLS certificate in %s", paths.Node.Cert)
828+
return nil, nil, fmt.Errorf("error while loading TLS certificate in %s: %w", paths.Node.Cert, err)
829829
}
830830
}
831831
}

‎template/expand.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ func expandMounts(ctx Context, mounts []api.Mount) ([]api.Mount, error) {
5050
var err error
5151
mount.Source, err = ctx.Expand(mount.Source)
5252
if err != nil {
53-
return mounts, errors.Wrapf(err, "expanding mount source %q", mount.Source)
53+
return mounts, fmt.Errorf("expanding mount source %q: %w", mount.Source, err)
5454
}
5555

5656
mount.Target, err = ctx.Expand(mount.Target)
5757
if err != nil {
58-
return mounts, errors.Wrapf(err, "expanding mount target %q", mount.Target)
58+
return mounts, fmt.Errorf("expanding mount target %q: %w", mount.Target, err)
5959
}
6060

6161
if mount.VolumeOptions != nil {
@@ -87,7 +87,7 @@ func expandMap(ctx Context, m map[string]string) (map[string]string, error) {
8787
for k, v := range m {
8888
v, err = ctx.Expand(v)
8989
if err != nil {
90-
return m, errors.Wrapf(err, "expanding map entry %q=%q", k, v)
90+
return m, fmt.Errorf("expanding map entry %q=%q: %w", k, v, err)
9191
}
9292

9393
n[k] = v
@@ -107,7 +107,7 @@ func expandEnv(ctx Context, values []string) ([]string, error) {
107107
if len(parts) > 1 {
108108
expanded, err := ctx.Expand(parts[1])
109109
if err != nil {
110-
return values, errors.Wrapf(err, "expanding env %q", value)
110+
return values, fmt.Errorf("expanding env %q: %w", value, err)
111111
}
112112

113113
entry = fmt.Sprintf("%s=%s", entry, expanded)

‎template/getter.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package template
22

33
import (
4+
"fmt"
5+
46
"github.com/moby/swarmkit/v2/agent/exec"
57
"github.com/moby/swarmkit/v2/api"
68
"github.com/pkg/errors"
@@ -34,7 +36,7 @@ func (t templatedSecretGetter) Get(secretID string) (*api.Secret, error) {
3436

3537
newSpec, err := ExpandSecretSpec(secret, t.node, t.t, t.dependencies)
3638
if err != nil {
37-
return secret, errors.Wrapf(err, "failed to expand templated secret %s", secretID)
39+
return secret, fmt.Errorf("failed to expand templated secret %s: %w", secretID, err)
3840
}
3941

4042
secretCopy := *secret
@@ -87,7 +89,7 @@ func (t templatedConfigGetter) GetAndFlagSecretData(configID string) (*api.Confi
8789

8890
newSpec, sensitive, err := ExpandConfigSpec(config, t.node, t.t, t.dependencies)
8991
if err != nil {
90-
return config, false, errors.Wrapf(err, "failed to expand templated config %s", configID)
92+
return config, false, fmt.Errorf("failed to expand templated config %s: %w", configID, err)
9193
}
9294

9395
configCopy := *config

0 commit comments

Comments
 (0)