mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-09 20:29:23 +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:
@@ -11,17 +11,12 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrGatewayIPUnspecified = errors.New("gateway IP is unspecified")
|
||||
ErrConnectionTimeout = errors.New("connection timeout")
|
||||
)
|
||||
|
||||
func (c *Client) rpc(ctx context.Context, gateway netip.Addr,
|
||||
request []byte, responseSize uint) (
|
||||
response []byte, err error,
|
||||
) {
|
||||
if gateway.IsUnspecified() || !gateway.IsValid() {
|
||||
return nil, fmt.Errorf("%w", ErrGatewayIPUnspecified)
|
||||
return nil, errors.New("gateway IP is unspecified")
|
||||
}
|
||||
|
||||
err = checkRequest(request)
|
||||
@@ -114,8 +109,7 @@ func (c *Client) rpc(ctx context.Context, gateway netip.Addr,
|
||||
}
|
||||
|
||||
if retryCount == c.maxRetries {
|
||||
return nil, fmt.Errorf("%w: failed attempts: %s",
|
||||
ErrConnectionTimeout, dedupFailedAttempts(failedAttempts))
|
||||
return nil, fmt.Errorf("connection timeout: failed attempts: %s", dedupFailedAttempts(failedAttempts))
|
||||
}
|
||||
|
||||
// Opcodes between 0 and 127 are client requests. Opcodes from 128 to
|
||||
|
||||
Reference in New Issue
Block a user