Skip to content

Response: Remove odd response body discard reader #563

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
roosterfish wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

Response: Remove odd response body discard reader #563

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
17 changes: 2 additions & 15 deletions microcluster/rest/response/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ import (
"bytes"
"encoding/json"
"fmt"
"io"
"log/slog"
"net/http"

"github.com/canonical/lxd/shared/api"

"github.com/canonical/microcluster/v3/internal/log"
)

// Init registers smart error mappings.
Expand Down Expand Up @@ -170,6 +166,8 @@ func (r *manualResponse) String() string {

// ParseResponse takes an HTTP response, parses it and returns the extracted result.
func ParseResponse(resp *http.Response) (*api.Response, error) {
defer resp.Body.Close()

decoder := json.NewDecoder(resp.Body)
response := api.Response{}

Expand All @@ -186,16 +184,5 @@ func ParseResponse(resp *http.Response) (*api.Response, error) {
return nil, api.StatusErrorf(resp.StatusCode, "%s", response.Error)
}

defer resp.Body.Close()
_, err = io.Copy(io.Discard, resp.Body)
if err != nil {
logger, logErr := log.LoggerFromContext(resp.Request.Context())
if logErr != nil {
return nil, err
}

logger.Error("Failed to read response body", slog.String("error", err.Error()))
}

return &response, nil
}