Skip to content

refactor: use local body variables in response handling #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spiegel-im-spiegel merged 1 commit into from
May 9, 2026
Merged

refactor: use local body variables in response handling #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (c *client) GetWithContext(ctx context.Context, u *url.URL, opts ...Request
req, err := request(ctx, http.MethodGet, u, nil, opts...)
if err != nil {
if errors.Is(err, ErrInvalidURL) {
return nil, errs.Wrap(ErrInvalidURL, errs.WithCause(err), errs.WithContext("url", urlText(u)))
return nil, errs.Wrap(err, errs.WithContext("url", urlText(u)))
}
return nil, errs.Wrap(ErrInvalidRequest, errs.WithCause(err), errs.WithContext("url", urlText(u)))
}
Expand All @@ -72,7 +72,7 @@ func (c *client) PostWithContext(ctx context.Context, u *url.URL, payload io.Rea
req, err := request(ctx, http.MethodPost, u, payload, opts...)
if err != nil {
if errors.Is(err, ErrInvalidURL) {
return nil, errs.Wrap(ErrInvalidURL, errs.WithCause(err), errs.WithContext("url", urlText(u)))
return nil, errs.Wrap(err, errs.WithContext("url", urlText(u)))
}
return nil, errs.Wrap(ErrInvalidRequest, errs.WithCause(err), errs.WithContext("url", urlText(u)))
}
Expand Down
14 changes: 8 additions & 6 deletions response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,16 @@ func (resp *response) Close() (err error) {
if resp == nil || resp.Response == nil {
return nil
}
body := resp.Body()
defer func() {
if resp == nil {
if body == nil {
return
}
if cerr := resp.Body().Close(); cerr != nil {
if cerr := body.Close(); cerr != nil && !errs.Is(cerr, os.ErrClosed) {
err = errs.Join(cerr, err)
}
}()
_, err = io.Copy(io.Discard, resp.Body())
_, err = io.Copy(io.Discard, body) // drain body to reuse connection
err = errs.Wrap(err)
return
}
Expand All @@ -60,15 +61,16 @@ func (resp *response) DumpBodyAndClose() (b []byte, err error) {
err = errs.Wrap(ErrNullPointer)
return
}
body := resp.Body()
defer func() {
if resp == nil {
if body == nil {
return
}
if cerr := resp.Body().Close(); cerr != nil && !errs.Is(cerr, os.ErrClosed) {
if cerr := body.Close(); cerr != nil && !errs.Is(cerr, os.ErrClosed) {
err = errs.Join(cerr, err)
}
}()
b, err = io.ReadAll(resp.Body())
b, err = io.ReadAll(body)
err = errs.Wrap(err)
return
}
Expand Down
Loading