mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-17 06:00:15 +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:
@@ -3,7 +3,6 @@ package version
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
@@ -25,8 +24,6 @@ type githubCommit struct {
|
||||
} `json:"commit"`
|
||||
}
|
||||
|
||||
var errHTTPStatusCode = errors.New("bad response HTTP status code")
|
||||
|
||||
func getGithubReleases(ctx context.Context, client *http.Client) (releases []githubRelease, err error) {
|
||||
// Define a timeout since the default client has a large timeout and we don't
|
||||
// want to wait too long.
|
||||
@@ -47,7 +44,7 @@ func getGithubReleases(ctx context.Context, client *http.Client) (releases []git
|
||||
defer response.Body.Close()
|
||||
|
||||
if response.StatusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("%w: %d %s", errHTTPStatusCode,
|
||||
return nil, fmt.Errorf("bad response HTTP status code: %d %s",
|
||||
response.StatusCode, response.Status)
|
||||
}
|
||||
|
||||
|
||||
@@ -44,8 +44,6 @@ func GetMessage(ctx context.Context, buildInfo models.BuildInformation,
|
||||
nil
|
||||
}
|
||||
|
||||
var errReleaseNotFound = errors.New("release not found")
|
||||
|
||||
func getLatestRelease(ctx context.Context, client *http.Client) (tagName, name string, time time.Time, err error) {
|
||||
releases, err := getGithubReleases(ctx, client)
|
||||
if err != nil {
|
||||
@@ -61,11 +59,9 @@ func getLatestRelease(ctx context.Context, client *http.Client) (tagName, name s
|
||||
}
|
||||
return release.TagName, release.Name, release.PublishedAt, nil
|
||||
}
|
||||
return "", "", time, fmt.Errorf("%w", errReleaseNotFound)
|
||||
return "", "", time, errors.New("release not found")
|
||||
}
|
||||
|
||||
var errCommitNotFound = errors.New("commit not found")
|
||||
|
||||
func getCommitsSince(ctx context.Context, client *http.Client, commitShort string) (n int, err error) {
|
||||
commits, err := getGithubCommits(ctx, client)
|
||||
if err != nil {
|
||||
@@ -77,5 +73,5 @@ func getCommitsSince(ctx context.Context, client *http.Client, commitShort strin
|
||||
}
|
||||
n++
|
||||
}
|
||||
return 0, fmt.Errorf("%w: %s", errCommitNotFound, commitShort)
|
||||
return 0, fmt.Errorf("commit not found: %s", commitShort)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user