Skip to content

EOF error on delete #559

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

Open
breardon2011 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

EOF error on delete #559

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
37 changes: 21 additions & 16 deletions cmd/oc/internal/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,23 @@ func (c *Client) do(req *http.Request) (*http.Response, error) {
return resp, nil
}

// decodeIfBody unmarshals resp.Body into result unless the response carries no
// body — a 204/205 status or Content-Length: 0. Prevents callers that pass a
// non-nil result from surfacing `io.EOF` on endpoints that legitimately return
// no content (e.g. POST /exec/{id}/kill returns 204 No Content).
func decodeIfBody(resp *http.Response, result interface{}) error {
if result == nil {
return nil
}
if resp.StatusCode == http.StatusNoContent || resp.StatusCode == http.StatusResetContent {
return nil
}
if resp.ContentLength == 0 {
return nil
}
return json.NewDecoder(resp.Body).Decode(result)
}

// Get performs a GET request and decodes the JSON response.
func (c *Client) Get(ctx context.Context, path string, result interface{}) error {
req, err := http.NewRequestWithContext(ctx, "GET", c.baseURL+path, nil)
Expand All @@ -147,10 +164,7 @@ func (c *Client) Get(ctx context.Context, path string, result interface{}) error
return err
}
defer resp.Body.Close()
if result != nil {
return json.NewDecoder(resp.Body).Decode(result)
}
return nil
return decodeIfBody(resp, result)
}

// Post performs a POST request with a JSON body and decodes the response.
Expand All @@ -175,10 +189,7 @@ func (c *Client) Post(ctx context.Context, path string, body, result interface{}
return err
}
defer resp.Body.Close()
if result != nil {
return json.NewDecoder(resp.Body).Decode(result)
}
return nil
return decodeIfBody(resp, result)
}

// Patch performs a PATCH request with a JSON body and decodes the response.
Expand All @@ -203,10 +214,7 @@ func (c *Client) Patch(ctx context.Context, path string, body, result interface{
return err
}
defer resp.Body.Close()
if result != nil {
return json.NewDecoder(resp.Body).Decode(result)
}
return nil
return decodeIfBody(resp, result)
}

// GetStream performs a GET request and returns the raw response so the
Expand Down Expand Up @@ -279,10 +287,7 @@ func (c *Client) PutJSON(ctx context.Context, path string, body, result interfac
return err
}
defer resp.Body.Close()
if result != nil {
return json.NewDecoder(resp.Body).Decode(result)
}
return nil
return decodeIfBody(resp, result)
}

// Delete performs a DELETE request.
Expand Down
Loading