Another portion of the lint fixes (#447)

- handling skipped errors.
- adding a few log lines.
- fixing a few tests

Signed-off-by: egorikas <[email protected]>

Author: egorikas

agent/agentclient/client.go

@@ -20,6 +20,7 @@ import (
 	"net/url"
 
 	"github.com/uber/kraken/core"
+	"github.com/uber/kraken/utils/closers"
 	"github.com/uber/kraken/utils/httputil"
 )
 
@@ -54,7 +55,7 @@ func (c *HTTPClient) GetTag(tag string) (core.Digest, error) {
 		}
 		return core.Digest{}, err
 	}
-	defer resp.Body.Close()
+	defer closers.Close(resp.Body)
 	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return core.Digest{}, fmt.Errorf("read body: %s", err)

build-index/tagclient/client.go

@@ -27,6 +27,7 @@ import (
 	"github.com/uber/kraken/build-index/tagmodels"
 	"github.com/uber/kraken/core"
 	"github.com/uber/kraken/lib/healthcheck"
+	"github.com/uber/kraken/utils/closers"
 	"github.com/uber/kraken/utils/httputil"
 )
 
@@ -158,7 +159,7 @@ func (c *singleClient) doListPaginated(urlFormat string, pathSub string,
 	if err != nil {
 		return resp, err
 	}
-	defer httpResp.Body.Close()
+	defer closers.Close(httpResp.Body)
 	if err := json.NewDecoder(httpResp.Body).Decode(&resp); err != nil {
 		return resp, fmt.Errorf("json decode: %s", err)
 	}

build-index/tagstore/store_test.go

@@ -161,8 +161,8 @@ func TestGetFromBackendInvalidValue(t *testing.T) {
 		tag, tag,
 		mockutil.MatchWriter([]byte(digest.String()))).DoAndReturn(
 		func(namespace, name string, dst io.Writer) error {
-			dst.Write([]byte("foo"))
-			return nil
+			_, err := dst.Write([]byte("foo"))
+			return err
 		})
 
 	_, err := store.Get(tag)

lib/backend/constants.go

@@ -21,14 +21,14 @@ import (
 )
 
 const (
-	DefaultPartSize    int64             = int64(64 * memsize.MB)
-	DefaultBufferGuard datasize.ByteSize = 10 * datasize.MB
-	DefaultConcurrency int               = 10
-	DefaultListMaxKeys int               = 250
+	DefaultPartSize        = int64(64 * memsize.MB)
+	DefaultBufferGuard     = 10 * datasize.MB
+	DefaultConcurrency int = 10
+	DefaultListMaxKeys int = 250
 )
 
 var (
-	ReadinessCheckNamespace string = core.NamespaceFixture()
-	ReadinessCheckName      string = core.DigestFixture().Hex()
-	ReadinessCheckDigest, _        = core.NewSHA256DigestFromHex(ReadinessCheckName)
+	ReadinessCheckNamespace = core.NamespaceFixture()
+	ReadinessCheckName      = core.DigestFixture().Hex()
+	ReadinessCheckDigest, _ = core.NewSHA256DigestFromHex(ReadinessCheckName) //nolint:errcheck
 )

lib/backend/hdfsbackend/webhdfs/client.go

@@ -25,6 +25,8 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/uber/kraken/utils/closers"
+
 	"github.com/cenkalti/backoff"
 	"github.com/uber/kraken/lib/backend/backenderrors"
 	"github.com/uber/kraken/utils/httputil"
@@ -150,7 +152,7 @@ func (c *client) Create(path string, src io.Reader) error {
 			}
 			return nnErr
 		}
-		defer nameresp.Body.Close()
+		defer closers.Close(nameresp.Body)
 
 		// Follow redirect location manually per WebHDFS protocol.
 		loc, ok := nameresp.Header["Location"]
@@ -172,7 +174,7 @@ func (c *client) Create(path string, src io.Reader) error {
 			}
 			return nnErr
 		}
-		defer dataresp.Body.Close()
+		defer closers.Close(dataresp.Body)
 
 		return nil
 	}
@@ -196,8 +198,7 @@ func (c *client) Rename(from, to string) error {
 			}
 			return nnErr
 		}
-		resp.Body.Close()
-		return nil
+		return resp.Body.Close()
 	}
 	return allNameNodesFailedError{nnErr}
 }
@@ -219,8 +220,7 @@ func (c *client) Mkdirs(path string) error {
 			}
 			return nnErr
 		}
-		resp.Body.Close()
-		return nil
+		return resp.Body.Close()
 	}
 	return allNameNodesFailedError{nnErr}
 }
@@ -251,7 +251,7 @@ func (c *client) Open(path string, dst io.Writer) error {
 			}
 			return nnErr
 		}
-		defer resp.Body.Close()
+		defer closers.Close(resp.Body)
 		if n, err := io.Copy(dst, resp.Body); err != nil {
 			return fmt.Errorf("copy response: %s", err)
 		} else if n != resp.ContentLength {

lib/backend/hdfsbackend/webhdfs/client_test.go

@@ -24,9 +24,11 @@ import (
 	"testing"
 
 	"github.com/uber/kraken/lib/backend/backenderrors"
+	"github.com/uber/kraken/utils/log"
 	"github.com/uber/kraken/utils/randutil"
 	"github.com/uber/kraken/utils/rwutil"
 	"github.com/uber/kraken/utils/testutil"
+	"go.uber.org/zap"
 
 	"github.com/go-chi/chi"
 	"github.com/stretchr/testify/require"
@@ -57,7 +59,10 @@ func redirectToDataNode(w http.ResponseWriter, r *http.Request) {
 func writeResponse(status int, body []byte) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(status)
-		w.Write(body)
+		_, err := w.Write(body)
+		if err != nil {
+			log.Desugar().Error("failed to write response", zap.Error(err))
+		}
 	}
 }
 

lib/backend/registrybackend/blobclient_test.go

@@ -113,7 +113,8 @@ func TestBlobDownloadFileNotFound(t *testing.T) {
 	})
 	r.Head(fmt.Sprintf("/v2/%s/blobs/{blob}", namespace), func(w http.ResponseWriter, req *http.Request) {
 		w.WriteHeader(http.StatusNotFound)
-		w.Write([]byte("file not found"))
+		_, err := w.Write([]byte("file not found"))
+		require.NoError(err)
 	})
 	addr, stop := testutil.StartServer(r)
 	defer stop()

lib/backend/registrybackend/tagclient_test.go

@@ -80,7 +80,8 @@ func TestTagDownloadFileNotFound(t *testing.T) {
 	r := chi.NewRouter()
 	r.Get(fmt.Sprintf("/v2/%s/manifests/{tag}", namespace), func(w http.ResponseWriter, req *http.Request) {
 		w.WriteHeader(http.StatusNotFound)
-		w.Write([]byte("file not found"))
+		_, err := w.Write([]byte("file not found"))
+		require.NoError(err)
 	})
 	r.Head(fmt.Sprintf("/v2/%s/manifests/{tag}", namespace), func(w http.ResponseWriter, req *http.Request) {
 		w.WriteHeader(http.StatusNotFound)

lib/blobrefresh/refresher_test.go

@@ -39,6 +39,7 @@ type refresherMocks struct {
 	cas      *store.CAStore
 	backends *backend.Manager
 	config   Config
+	t        *testing.T
 }
 
 func newRefresherMocks(t *testing.T) (*refresherMocks, func()) {
@@ -53,7 +54,7 @@ func newRefresherMocks(t *testing.T) (*refresherMocks, func()) {
 
 	backends := backend.ManagerFixture()
 
-	return &refresherMocks{ctrl, cas, backends, Config{}}, cleanup.Run
+	return &refresherMocks{ctrl, cas, backends, Config{}, t}, cleanup.Run
 }
 
 func (m *refresherMocks) new() *Refresher {
@@ -62,7 +63,8 @@ func (m *refresherMocks) new() *Refresher {
 
 func (m *refresherMocks) newClient(namespace string) *mockbackend.MockClient {
 	client := mockbackend.NewMockClient(m.ctrl)
-	m.backends.Register(namespace, client, false)
+	err := m.backends.Register(namespace, client, false)
+	require.NoError(m.t, err)
 	return client
 }
 

lib/containerruntime/dockerdaemon/cli.go

@@ -25,6 +25,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/uber/kraken/utils/closers"
 	"golang.org/x/net/context/ctxhttp"
 )
 
@@ -136,7 +137,7 @@ func (cli *dockerClient) PullImage(ctx context.Context, repo, tag string) error
 	if err != nil {
 		return fmt.Errorf("send post request: %s", err)
 	}
-	defer resp.Body.Close()
+	defer closers.Close(resp.Body)
 	if resp.StatusCode != 200 {
 		errMsg, err := io.ReadAll(resp.Body)
 		if err != nil {