diff --git a/.changelog/14145.txt b/.changelog/14145.txt new file mode 100644 index 000000000000..5a543dac8de1 --- /dev/null +++ b/.changelog/14145.txt @@ -0,0 +1,3 @@ +```release-note:bug +api: cleanup whitespace from failed api response body +``` diff --git a/GNUmakefile b/GNUmakefile index 3165a8db0f9f..07852dcae7a5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -143,7 +143,7 @@ deps: ## Install build and development dependencies lint-deps: ## Install linter dependencies ## Keep versions in sync with tools/go.mod (see https://github.com/golang/go/issues/30515) @echo "==> Updating linter dependencies..." - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2 + go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.48.0 go install github.com/client9/misspell/cmd/misspell@v0.3.4 go install github.com/hashicorp/go-hclog/hclogvet@v0.1.4 diff --git a/api/api.go b/api/api.go index adf523f0e2f8..9a16a8333d6a 100644 --- a/api/api.go +++ b/api/api.go @@ -1098,9 +1098,10 @@ func requireOK(d time.Duration, resp *http.Response, e error) (time.Duration, *h } if resp.StatusCode != 200 { var buf bytes.Buffer - io.Copy(&buf, resp.Body) - resp.Body.Close() - return d, nil, fmt.Errorf("Unexpected response code: %d (%s)", resp.StatusCode, buf.Bytes()) + _, _ = io.Copy(&buf, resp.Body) + _ = resp.Body.Close() + body := strings.TrimSpace(buf.String()) + return d, nil, fmt.Errorf("Unexpected response code: %d (%s)", resp.StatusCode, body) } return d, resp, nil }