mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-10 04:30:20 +02:00
chore: do not use sentinel errors when unneeded
- 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:
@@ -1,19 +1,12 @@
|
||||
package routing
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/netip"
|
||||
|
||||
"github.com/qdm12/gluetun/internal/netlink"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrLinkLocalNotFound = errors.New("local link not found")
|
||||
ErrSubnetDefaultNotFound = errors.New("default subnet not found")
|
||||
ErrSubnetLocalNotFound = errors.New("local subnet not found")
|
||||
)
|
||||
|
||||
type LocalNetwork struct {
|
||||
IPNet netip.Prefix
|
||||
InterfaceName string
|
||||
@@ -38,7 +31,7 @@ func (r *Routing) LocalNetworks() (localNetworks []LocalNetwork, err error) {
|
||||
}
|
||||
|
||||
if len(localLinks) == 0 {
|
||||
return localNetworks, fmt.Errorf("%w: in %d links", ErrLinkLocalNotFound, len(links))
|
||||
return localNetworks, fmt.Errorf("local link not found: in %d links", len(links))
|
||||
}
|
||||
|
||||
routes, err := r.netLinker.RouteList(netlink.FamilyAll)
|
||||
@@ -82,7 +75,7 @@ func (r *Routing) LocalNetworks() (localNetworks []LocalNetwork, err error) {
|
||||
}
|
||||
|
||||
if len(localNetworks) == 0 {
|
||||
return localNetworks, fmt.Errorf("%w: in %d routes", ErrSubnetLocalNotFound, len(routes))
|
||||
return localNetworks, fmt.Errorf("local subnet not found: in %d routes", len(routes))
|
||||
}
|
||||
|
||||
return localNetworks, nil
|
||||
|
||||
Reference in New Issue
Block a user