Skip to content

Commit 0945ae9

Browse files
authored
chore: update dependencies and replace github.com/pkg/errors (#145)
- Update dependencies - Replace `github.com/pkg/errors` dependency with native error wrapping. The package `github.com/pkg/errors` is now in maintenance mode due to the existence of golang native error wrapping. - convert `errors.Wrapf(err, "… %s: %s", foo, bar)` to `fmt.Errorf("… %s: %s: %w", foo, bar err)` and check that `err != nil` before
1 parent 6870a88 commit 0945ae9

File tree

4 files changed

+44
-15
lines changed

4 files changed

+44
-15
lines changed

commands/connect.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ import (
66
"path"
77
"time"
88

9-
"github.com/pkg/errors"
10-
cli "github.com/urfave/cli"
11-
129
"github.com/ipfs/iptb/testbed"
10+
cli "github.com/urfave/cli"
1311
)
1412

1513
var ConnectCmd = cli.Command{
@@ -130,11 +128,14 @@ func connectNodes(tb testbed.BasicTestbed, from, to []int, timeout time.Duration
130128
defer cancel()
131129

132130
err = nodes[f].Connect(ctx, nodes[t])
131+
if err != nil {
132+
err = fmt.Errorf("node[%d] => node[%d]: %w", f, t, err)
133+
}
133134

134135
results = append(results, Result{
135136
Node: f,
136137
Output: nil,
137-
Error: errors.Wrapf(err, "node[%d] => node[%d]", f, t),
138+
Error: err,
138139
})
139140
}
140141
}

commands/utils.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"sync"
1010

1111
testbedi "github.com/ipfs/iptb/testbed/interfaces"
12-
"github.com/pkg/errors"
1312
cli "github.com/urfave/cli"
1413
)
1514

@@ -184,14 +183,17 @@ func mapWithOutput(list []int, nodes []testbedi.Core, fn outputFunc) ([]Result,
184183
go func(i, n int, node testbedi.Core) {
185184
defer wg.Done()
186185
out, err := fn(node)
186+
if err != nil {
187+
err = fmt.Errorf("node[%d]: %w", n, err)
188+
}
187189

188190
lk.Lock()
189191
defer lk.Unlock()
190192

191193
results[i] = Result{
192194
Node: n,
193195
Output: out,
194-
Error: errors.Wrapf(err, "node[%d]", n),
196+
Error: err,
195197
}
196198
}(i, n, nodes[n])
197199
}

go.mod

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
module github.com/ipfs/iptb
22

33
require (
4-
github.com/mattn/go-shellwords v1.0.5
5-
github.com/pkg/errors v0.8.1
6-
github.com/urfave/cli v1.20.0
4+
github.com/mattn/go-shellwords v1.0.12
5+
github.com/urfave/cli v1.22.16
6+
)
7+
8+
require (
9+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
10+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
711
)
812

913
go 1.22

go.sum

+28-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
1-
github.com/mattn/go-shellwords v1.0.5 h1:JhhFTIOslh5ZsPrpa3Wdg8bF0WI3b44EMblmU9wIsXc=
2-
github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
3-
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
4-
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
5-
github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
6-
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
1+
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
2+
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
3+
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
4+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7+
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
8+
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
9+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11+
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
12+
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
13+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
14+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
15+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
16+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
17+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
18+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
19+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
20+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
21+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
22+
github.com/urfave/cli v1.22.16 h1:MH0k6uJxdwdeWQTwhSO42Pwr4YLrNLwBtg1MRgTqPdQ=
23+
github.com/urfave/cli v1.22.16/go.mod h1:EeJR6BKodywf4zciqrdw6hpCPk68JO9z5LazXZMn5Po=
24+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
25+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
26+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
27+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
28+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)