chore(all): review error wrappings

- remove repetitive `cannot` and `failed` prefixes
- rename `unmarshaling` to `decoding`
This commit is contained in:
Quentin McGaw
2023-04-01 16:53:04 +00:00
parent 63a696d7e7
commit 4ba159e483
76 changed files with 178 additions and 178 deletions

View File

@@ -72,7 +72,7 @@ func fetchAPI(ctx context.Context, client *http.Client) (
decoder := json.NewDecoder(response.Body)
if err := decoder.Decode(&servers); err != nil {
return nil, fmt.Errorf("failed unmarshaling response body: %w", err)
return nil, fmt.Errorf("decoding response body: %w", err)
}
if err := response.Body.Close(); err != nil {

View File

@@ -115,7 +115,7 @@ func Test_fetchAPI(t *testing.T) {
},
"nil body": {
responseStatus: http.StatusOK,
err: errors.New("failed unmarshaling response body: EOF"),
err: errors.New("decoding response body: EOF"),
},
"no server": {
responseStatus: http.StatusOK,

View File

@@ -15,7 +15,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
err = addServersFromAPI(ctx, u.client, hts)
if err != nil {
return nil, fmt.Errorf("cannot fetch server information from API: %w", err)
return nil, fmt.Errorf("fetching server information from API: %w", err)
}
warnings, err := addOpenVPNServersFromZip(ctx, u.unzipper, hts)
@@ -23,7 +23,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
u.warner.Warn(warning)
}
if err != nil {
return nil, fmt.Errorf("cannot get OpenVPN ZIP file: %w", err)
return nil, fmt.Errorf("getting OpenVPN ZIP file: %w", err)
}
getRemainingServers(hts)