Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/labs/github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ func getPagedBytes(ctx context.Context, method, url string, body io.Reader) (*pa
if err != nil {
return nil, err
}
defer res.Body.Close()
if res.StatusCode == http.StatusNotFound {
return nil, ErrNotFound
}
if res.StatusCode >= 400 {
return nil, fmt.Errorf("github request failed: %s", res.Status)
}
nextLink := parseNextLink(res.Header.Get("link"))
defer res.Body.Close()
bodyBytes, err := io.ReadAll(res.Body)
if err != nil {
return nil, err
Expand Down
54 changes: 54 additions & 0 deletions cmd/labs/github/github_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,65 @@
package github

import (
"fmt"
"io"
"net/http"
"strings"
"testing"

"github.com/stretchr/testify/assert"
)

type closeRecordingBody struct {
io.Reader
closed *bool
}

func (b *closeRecordingBody) Close() error {
*b.closed = true
return nil
}

type stubTransport struct {
status int
closed bool
}

func (s *stubTransport) RoundTrip(req *http.Request) (*http.Response, error) {
return &http.Response{
StatusCode: s.status,
Status: fmt.Sprintf("%d %s", s.status, http.StatusText(s.status)),
Header: http.Header{},
Body: &closeRecordingBody{Reader: strings.NewReader("{}"), closed: &s.closed},
Request: req,
}, nil
}

func TestGetPagedBytesClosesBodyOnHTTPError(t *testing.T) {
tests := []struct {
name string
status int
}{
{"not found", http.StatusNotFound},
{"server error", http.StatusInternalServerError},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// getPagedBytes hardcodes http.DefaultClient, so swapping its
// transport is the only seam to observe body closure.
stub := &stubTransport{status: tt.status}
prev := http.DefaultClient.Transport
http.DefaultClient.Transport = stub
t.Cleanup(func() { http.DefaultClient.Transport = prev })

_, err := getPagedBytes(t.Context(), "GET", "https://api.github.test/x", nil)
assert.Error(t, err)
assert.True(t, stub.closed)
})
}
}

func TestParseNextLink(t *testing.T) {
tests := []struct {
name string
Expand Down
Loading