kayos/ifupdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slimfast: get rid of multierror dep

Browse Source
This commit is contained in:
kayos@tcp.direct 2023-12-01 23:24:28 -08:00
parent f35d330884
commit 8e80c205c6
Signed by: kayos
GPG Key ID: 4B841471B4BEE979
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
go.mod
View File

@ -5,7 +5,4 @@ go 1.21.4
require ( require (
git.tcp.direct/kayos/common v0.9.6 git.tcp.direct/kayos/common v0.9.6
github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew v1.1.1
github.com/hashicorp/go-multierror v1.1.1
) )
require github.com/hashicorp/errwrap v1.0.0 // indirect

4
go.sum
View File

@ -2,7 +2,3 @@ git.tcp.direct/kayos/common v0.9.6 h1:EITtktxZF/zkzqAhZZxvm6cZpFYoZ0P/gLB9RPatKU
git.tcp.direct/kayos/common v0.9.6/go.mod h1:8y9b+PN1+ZVaQ/VugD9dkKe+uqhE8jH7a64RyF7h2rM= git.tcp.direct/kayos/common v0.9.6/go.mod h1:8y9b+PN1+ZVaQ/VugD9dkKe+uqhE8jH7a64RyF7h2rM=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=

17
ifaces.go
View File

@ -2,9 +2,9 @@ package iface
import ( import (
"bufio" "bufio"
"fmt"
"strings" "strings"
"sync"
"github.com/hashicorp/go-multierror"
"git.tcp.direct/kayos/common/pool" "git.tcp.direct/kayos/common/pool"
) )
@ -92,11 +92,16 @@ func (p *MultiParser) Parse() error {
if len(buf.Bytes()) > 0 { if len(buf.Bytes()) > 0 {
flush("unknown") flush("unknown")
} }
me := &multierror.Error{} var multiErr error
for _, err := range p.Errs { for _, err := range p.Errs {
if err != nil { switch {
me = multierror.Append(me, err) case err == nil:
continue
case multiErr == nil:
multiErr = err
default:
multiErr = fmt.Errorf("%w, %w", multiErr, err)
} }
} }
return me.ErrorOrNil() return p.Interfaces, multiErr
} }