From a360cfd0b51c4dc5f483210c5d0652677d32f8dd Mon Sep 17 00:00:00 2001 From: Martin Hutchinson Date: Mon, 15 Apr 2024 13:07:24 +0100 Subject: [PATCH] Check error returned for Body.Close in defer (#154) This resolves a lint error --- .github/workflows/golangci-lint.yml | 2 +- client/client.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 431ee07..518c22d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -19,5 +19,5 @@ jobs: uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v3.7.1 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.55.0 + version: v1.57.2 args: --timeout 5m diff --git a/client/client.go b/client/client.go index cd8d8df..0ead0ed 100644 --- a/client/client.go +++ b/client/client.go @@ -24,6 +24,7 @@ import ( "net/url" "strconv" + "github.com/golang/glog" "github.com/transparency-dev/distributor/api" ) @@ -104,7 +105,12 @@ func (d *RestDistributor) fetchData(u *url.URL) ([]byte, error) { if err != nil { return nil, err } - defer resp.Body.Close() + defer func() { + if err := resp.Body.Close(); err != nil { + glog.Errorf("Failed to close body: %v", err) + } + }() + body, err := io.ReadAll(resp.Body) if err != nil { return nil, fmt.Errorf("failed to read body: %v", err)