Skip to content

Commit 363fd14

Browse files
authored
Merge pull request #32 from libdns/errors
Use errors package from stdlib
2 parents 48f2a50 + d841e19 commit 363fd14

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

client.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package he
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"io"
78
"math"
@@ -15,7 +16,6 @@ import (
1516
"time"
1617

1718
"github.com/libdns/libdns"
18-
"github.com/pkg/errors"
1919
"golang.org/x/time/rate"
2020
)
2121

@@ -66,14 +66,14 @@ func (p *Provider) getDomain(ctx context.Context, zone string) ([]libdns.Record,
6666
var dnsErr *net.DNSError
6767
// Ignore missing dns record
6868
if !(errors.As(err, &dnsErr) && dnsErr.IsNotFound) {
69-
return libRecords, errors.Wrapf(err, "error looking up host")
69+
return libRecords, fmt.Errorf("error looking up host: %w", err)
7070
}
7171
}
7272

7373
for _, ip := range ips {
7474
parsed, err := netip.ParseAddr(ip)
7575
if err != nil {
76-
return libRecords, errors.Wrapf(err, "error parsing ip")
76+
return libRecords, fmt.Errorf("error parsing ip: %w", err)
7777
}
7878

7979
libRecords = append(libRecords, libdns.Address{
@@ -87,7 +87,7 @@ func (p *Provider) getDomain(ctx context.Context, zone string) ([]libdns.Record,
8787
var dnsErr *net.DNSError
8888
// Ignore missing dns record
8989
if !(errors.As(err, &dnsErr) && dnsErr.IsNotFound) {
90-
return libRecords, errors.Wrapf(err, "error looking up txt")
90+
return libRecords, fmt.Errorf("error looking up txt: %w", err)
9191
}
9292
}
9393
for _, t := range txt {
@@ -124,7 +124,7 @@ func (p *Provider) setRecord(
124124
if !clear {
125125
parsedRR, err := rr.Parse()
126126
if err != nil {
127-
return errors.Wrapf(err, "error parsing record")
127+
return fmt.Errorf("error parsing record: %w", err)
128128
}
129129

130130
switch rr := parsedRR.(type) {
@@ -197,7 +197,7 @@ func (p *Provider) doRequest(ctx context.Context, domain string, params map[stri
197197
// Create the request
198198
req, err := http.NewRequestWithContext(ctx, http.MethodPost, u.String(), reqBody)
199199
if err != nil {
200-
return errors.Wrapf(err, "error creating http request")
200+
return fmt.Errorf("error creating http request: %w", err)
201201
}
202202

203203
// Add HTTP headers
@@ -212,19 +212,19 @@ func (p *Provider) doRequest(ctx context.Context, domain string, params map[stri
212212
// Wait for tokens from rate limiter
213213
err = p.rateLimiter.Wait(ctx)
214214
if err != nil {
215-
return errors.Wrapf(err, "error waiting for rate limiter")
215+
return fmt.Errorf("error waiting for rate limiter: %w", err)
216216
}
217217

218218
// Make HTTP request to HE API update endpoint
219219
resp, err := http.DefaultClient.Do(req)
220220
if err != nil {
221-
return errors.Wrapf(err, "error making http request")
221+
return fmt.Errorf("error making http request: %w", err)
222222
}
223223
defer resp.Body.Close()
224224

225225
bodyBytes, err := io.ReadAll(resp.Body)
226226
if err != nil {
227-
return errors.Wrapf(err, "error reading body from http response")
227+
return fmt.Errorf("error reading body from http response: %w", err)
228228
}
229229

230230
respBody := string(bodyBytes)
@@ -233,8 +233,8 @@ func (p *Provider) doRequest(ctx context.Context, domain string, params map[stri
233233
delete(query, "password")
234234
}
235235

236-
return errors.Wrapf(err,
237-
"HE api request failed, query=%s, response=%s", query, respBody,
236+
return fmt.Errorf(
237+
"HE api request failed, query=%s, response=%s: %w", query, respBody, err,
238238
)
239239
}
240240

0 commit comments

Comments
 (0)