vanja/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2026-06-16 16:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: do not use sentinel errors when unneeded

Browse Source 
- main reason being it's a burden to always define sentinel errors at global scope, wrap them with `%w` instead of using a string directly
- only use sentinel errors when it has to be checked using `errors.Is`
- replace all usage of these sentinel errors in `fmt.Errorf` with direct strings that were in the sentinel error
- exclude the sentinel error definition requirement from .golangci.yml
- update unit tests to use ContainersError instead of ErrorIs so it stays as a "not a change detector test" without requiring a sentinel error
This commit is contained in:
Quentin McGaw
2026-05-02 00:50:16 +00:00
parent 9b6f048fe8
commit 4a78989d9d
172 changed files with 666 additions and 1433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/netlink/ipv6_test.go
+2 -4
View File
@@ -41,8 +41,6 @@ func findAvailableTCPPort(t *testing.T) (port uint16) {
func Test_dialAddrThroughFirewall(t *testing.T) {
t.Parallel()
errTest := errors.New("test error")
const ipv6InternetWorks = false
testCases := map[string]struct {
@@ -102,7 +100,7 @@ func Test_dialAddrThroughFirewall(t *testing.T) {
},
},
"firewall_add_error": {
firewallAddErr: errTest,
firewallAddErr: errors.New("test error"),
errMessageRegex: func() string {
return "accepting output traffic: test error"
},
@@ -122,7 +120,7 @@ func Test_dialAddrThroughFirewall(t *testing.T) {
addrPort := netip.MustParseAddrPort(listener.Addr().String())
return netip.AddrPortFrom(loopback, addrPort.Port())
},
firewallRemoveErr: errTest,
firewallRemoveErr: errors.New("test error"),
errMessageRegex: func() string {
return "removing output traffic rule: test error"
},
internal/netlink/link.go
+3 -6
View File
@@ -1,7 +1,6 @@
package netlink
import (
"errors"
"fmt"
"github.com/jsimonetti/rtnetlink"
@@ -47,8 +46,6 @@ func (n *NetLink) LinkList() (links []Link, err error) {
return links, nil
}
var ErrLinkNotFound = errors.New("link not found")
func (n *NetLink) LinkByName(name string) (link Link, err error) {
links, err := n.LinkList()
if err != nil {
@@ -61,7 +58,7 @@ func (n *NetLink) LinkByName(name string) (link Link, err error) {
}
}
return Link{}, fmt.Errorf("%w: for name %s", ErrLinkNotFound, name)
return Link{}, fmt.Errorf("link not found: for name %s", name)
}
func (n *NetLink) LinkByIndex(index uint32) (link Link, err error) {
@@ -76,7 +73,7 @@ func (n *NetLink) LinkByIndex(index uint32) (link Link, err error) {
}
}
return Link{}, fmt.Errorf("%w: for index %d", ErrLinkNotFound, index)
return Link{}, fmt.Errorf("link not found: for index %d", index)
}
func (n *NetLink) LinkAdd(link Link) (linkIndex uint32, err error) {
@@ -114,7 +111,7 @@ func (n *NetLink) LinkAdd(link Link) (linkIndex uint32, err error) {
}
}
return 0, fmt.Errorf("%w: matching name %s", ErrLinkNotFound, link.Name)
return 0, fmt.Errorf("link not found: matching name %s", link.Name)
}
func (n *NetLink) LinkDel(linkIndex uint32) (err error) {