Skip to content

Commit 4779ec1

Browse files
committed
fix: drop GetBody change, keep only sanitizeURL fix
1 parent f66bd9e commit 4779ec1

2 files changed

Lines changed: 7 additions & 46 deletions

File tree

github/github.go

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -559,32 +559,23 @@ func (c *Client) NewRequest(method, urlStr string, body any, opts ...RequestOpti
559559
return nil, err
560560
}
561561

562-
var rawBody []byte
562+
var buf io.ReadWriter
563563
if body != nil {
564-
var buf bytes.Buffer
565-
enc := json.NewEncoder(&buf)
564+
buf = &bytes.Buffer{}
565+
enc := json.NewEncoder(buf)
566566
enc.SetEscapeHTML(false)
567-
if err := enc.Encode(body); err != nil {
567+
err := enc.Encode(body)
568+
if err != nil {
568569
return nil, err
569570
}
570-
rawBody = buf.Bytes()
571571
}
572572

573-
var bodyReader io.Reader
574-
if rawBody != nil {
575-
bodyReader = bytes.NewReader(rawBody)
576-
}
577-
req, err := http.NewRequest(method, u.String(), bodyReader)
573+
req, err := http.NewRequest(method, u.String(), buf)
578574
if err != nil {
579575
return nil, err
580576
}
581-
if rawBody != nil {
582-
req.GetBody = func() (io.ReadCloser, error) {
583-
return io.NopCloser(bytes.NewReader(rawBody)), nil
584-
}
585-
}
586577

587-
if rawBody != nil {
578+
if body != nil {
588579
req.Header.Set("Content-Type", "application/json")
589580
}
590581
req.Header.Set("Accept", mediaTypeV3)

github/github_test.go

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -749,36 +749,6 @@ func TestNewRequest_emptyBody(t *testing.T) {
749749
}
750750
}
751751

752-
func TestNewRequest_getBody(t *testing.T) {
753-
t.Parallel()
754-
c := NewClient(nil)
755-
756-
req, err := c.NewRequest("POST", ".", &User{Login: Ptr("l")})
757-
if err != nil {
758-
t.Fatalf("NewRequest returned unexpected error: %v", err)
759-
}
760-
if req.GetBody == nil {
761-
t.Fatal("NewRequest with body did not set GetBody")
762-
}
763-
original, _ := io.ReadAll(req.Body)
764-
rc, err := req.GetBody()
765-
if err != nil {
766-
t.Fatalf("GetBody returned unexpected error: %v", err)
767-
}
768-
replay, _ := io.ReadAll(rc)
769-
if string(original) != string(replay) {
770-
t.Errorf("GetBody returned %q, want %q", replay, original)
771-
}
772-
773-
req, err = c.NewRequest("GET", ".", nil)
774-
if err != nil {
775-
t.Fatalf("NewRequest returned unexpected error: %v", err)
776-
}
777-
if req.GetBody != nil {
778-
t.Fatal("NewRequest without body set GetBody unexpectedly")
779-
}
780-
}
781-
782752
func TestNewRequest_errorForNoTrailingSlash(t *testing.T) {
783753
t.Parallel()
784754
tests := []struct {

0 commit comments

Comments
 (0)