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:
Quentin McGaw
2026-05-02 00:50:16 +00:00
parent 9b6f048fe8
commit 4a78989d9d
172 changed files with 666 additions and 1433 deletions
@@ -1,7 +1,6 @@
package updater
import (
"errors"
"fmt"
"regexp"
"strings"
@@ -9,12 +8,6 @@ import (
var trailingNumber = regexp.MustCompile(` [0-9]+$`)
var (
errBadPrefix = errors.New("bad prefix in file name")
errBadSuffix = errors.New("bad suffix in file name")
errNotEnoughParts = errors.New("not enough parts in file name")
)
func parseFilename(fileName string) (
countryCode, city string, err error,
) {
@@ -22,7 +15,7 @@ func parseFilename(fileName string) (
const prefix = "PrivateVPN-"
if !strings.HasPrefix(fileName, prefix) {
return "", "", fmt.Errorf("%w: %s", errBadPrefix, fileName)
return "", "", fmt.Errorf("bad prefix in file name %s", fileName)
}
s := strings.TrimPrefix(fileName, prefix)
@@ -34,7 +27,7 @@ func parseFilename(fileName string) (
case strings.HasSuffix(fileName, udpSuffix):
s = strings.TrimSuffix(s, udpSuffix)
default:
return "", "", fmt.Errorf("%w: %s", errBadSuffix, fileName)
return "", "", fmt.Errorf("bad suffix in file name %s", fileName)
}
s = trailingNumber.ReplaceAllString(s, "")
@@ -42,7 +35,7 @@ func parseFilename(fileName string) (
parts := strings.Split(s, "-")
const minParts = 2
if len(parts) < minParts {
return "", "", fmt.Errorf("%w: %s", errNotEnoughParts, fileName)
return "", "", fmt.Errorf("not enough parts in file name %s", fileName)
}
countryCode, city = parts[0], parts[1]