vanja/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2026-05-09 20:29:23 +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/provider/vpnsecure/updater/website.go
+1 -3
View File
@@ -33,8 +33,6 @@ func fetchServers(ctx context.Context, client *http.Client,
return servers, nil
}
var ErrHTMLServersDivNotFound = errors.New("HTML servers container div not found")
const divString = "div"
func parseHTML(rootNode *html.Node) (servers []models.Server,
@@ -43,7 +41,7 @@ func parseHTML(rootNode *html.Node) (servers []models.Server,
// Find div container for all servers, searching with BFS.
serversDiv := findServersDiv(rootNode)
if serversDiv == nil {
return nil, nil, htmlutils.WrapError(ErrHTMLServersDivNotFound, rootNode)
return nil, nil, htmlutils.WrapError(errors.New("HTML servers container div not found"), rootNode)
}
for countryNode := serversDiv.FirstChild; countryNode != nil; countryNode = countryNode.NextSibling {
internal/provider/vpnsecure/updater/website_test.go
+6 -8
View File
@@ -31,12 +31,10 @@ func Test_fetchServers(t *testing.T) {
responseStatus int
responseBody io.ReadCloser
servers []models.Server
errWrapped error
errMessage string
}{
"context canceled": {
ctx: canceledCtx,
errWrapped: context.Canceled,
errMessage: `fetching HTML code: Get "https://www.vpnsecure.me/vpn-locations/": context canceled`,
},
"success": {
@@ -105,9 +103,10 @@ func Test_fetchServers(t *testing.T) {
servers, err := fetchServers(testCase.ctx, client, warner)
assert.ErrorIs(t, err, testCase.errWrapped)
if testCase.errWrapped != nil {
if testCase.errMessage != "" {
assert.EqualError(t, err, testCase.errMessage)
} else {
assert.NoError(t, err)
}
assert.Equal(t, testCase.servers, servers)
})
@@ -121,12 +120,10 @@ func Test_parseHTML(t *testing.T) {
rootNode *html.Node
servers []models.Server
warnings []string
errWrapped error
errMessage string
}{
"empty html": {
rootNode: parseTestHTML(t, ""),
errWrapped: ErrHTMLServersDivNotFound,
errMessage: `HTML servers container div not found: in HTML code: <html><head></head><body></body></html>`,
},
"test data": {
@@ -223,9 +220,10 @@ func Test_parseHTML(t *testing.T) {
assert.Equal(t, testCase.servers, servers)
assert.Equal(t, testCase.warnings, warnings)
assert.ErrorIs(t, err, testCase.errWrapped)
if testCase.errWrapped != nil {
if testCase.errMessage != "" {
assert.EqualError(t, err, testCase.errMessage)
} else {
assert.NoError(t, err)
}
})
}