Fixed all lint errcheck in number of TLDs (#2978)

This fixes all errors in client, cmd, experimental, integration, log, merkle, quota, and testonly. The storage top level directory still has a huge number, so this change does not modify the .golangci.yaml file to enable checks across the repo.
google · Apr 26, 2023 · 96e5b23 · 96e5b23
1 parent 897e956
commit 96e5b23
Show file tree

Hide file tree

Showing 23 changed files with 168 additions and 53 deletions.
diff --git a/client/rpcflags/rpcflags_test.go b/client/rpcflags/rpcflags_test.go
@@ -52,7 +52,11 @@ func TestNewClientDialOptionsFromFlagsWithTLSCertFileNotSet(t *testing.T) {
 	if err != nil {
 		t.Errorf("failed to dial %v: %v", logEnv.Address, err)
 	}
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			t.Error(err)
+		}
+	}()
 
 	adminClient := trillian.NewTrillianAdminClient(conn)
 	if _, err = adminClient.ListTrees(context.Background(), &trillian.ListTreesRequest{}); err != nil {
@@ -127,7 +131,11 @@ func TestNewClientDialOptionsFromFlagsWithTLSCertFileSet(t *testing.T) {
 	if err != nil {
 		t.Errorf("failed to dial %v: %v", logEnv.Address, err)
 	}
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			t.Error(err)
+		}
+	}()
 
 	adminClient := trillian.NewTrillianAdminClient(conn)
 	if _, err := adminClient.ListTrees(context.Background(), &trillian.ListTreesRequest{}); err != nil {

diff --git a/cmd/createtree/main.go b/cmd/createtree/main.go
@@ -77,7 +77,11 @@ func createTree(ctx context.Context) (*trillian.Tree, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to dial %v: %v", *adminServerAddr, err)
 	}
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			klog.Errorf("Close(): %v", err)
+		}
+	}()
 
 	adminClient := trillian.NewTrillianAdminClient(conn)
 	logClient := trillian.NewTrillianLogClient(conn)

diff --git a/cmd/deletetree/main.go b/cmd/deletetree/main.go
@@ -49,7 +49,11 @@ func main() {
 	if err != nil {
 		klog.Exitf("Failed to dial %v: %v", *adminServerAddr, err)
 	}
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			klog.Errorf("Close(): %v", err)
+		}
+	}()
 
 	a := trillian.NewTrillianAdminClient(conn)
 	if !*undeleteTree {

diff --git a/cmd/internal/serverutil/main.go b/cmd/internal/serverutil/main.go
@@ -98,11 +98,15 @@ func (m *Main) healthz(rw http.ResponseWriter, req *http.Request) {
 		defer cancel()
 		if err := m.IsHealthy(ctx); err != nil {
 			rw.WriteHeader(http.StatusServiceUnavailable)
-			rw.Write([]byte(err.Error()))
+			if _, err := rw.Write([]byte(err.Error())); err != nil {
+				klog.Errorf("Write(): %v", err)
+			}
 			return
 		}
 	}
-	rw.Write([]byte("ok"))
+	if _, err := rw.Write([]byte("ok")); err != nil {
+		klog.Errorf("Write(): %v", err)
+	}
 }
 
 // Run starts the configured server. Blocks until the server exits.
@@ -119,7 +123,11 @@ func (m *Main) Run(ctx context.Context) error {
 	}
 	defer srv.GracefulStop()
 
-	defer m.DBClose()
+	defer func() {
+		if err := m.DBClose(); err != nil {
+			klog.Errorf("DBClose(): %v", err)
+		}
+	}()
 
 	if err := m.RegisterServerFn(srv, m.Registry); err != nil {
 		return err
@@ -278,15 +286,21 @@ func AnnounceSelf(ctx context.Context, client *clientv3.Client, etcdService, end
 		klog.Exitf("Failed to create etcd manager: %v", err)
 	}
 	fullEndpoint := fmt.Sprintf("%s/%s", etcdService, endpoint)
-	em.AddEndpoint(ctx, fullEndpoint, endpoints.Endpoint{Addr: endpoint})
+	if err := em.AddEndpoint(ctx, fullEndpoint, endpoints.Endpoint{Addr: endpoint}); err != nil {
+		klog.Exitf("Failed to add endpoint: %v", err)
+	}
 	klog.Infof("Announcing our presence in %v", etcdService)
 
 	return func() {
 		// Use a background context because the original context may have been cancelled.
 		klog.Infof("Removing our presence in %v", etcdService)
 		ctx := context.Background()
-		em.DeleteEndpoint(ctx, fullEndpoint)
-		client.Revoke(ctx, leaseRsp.ID)
+		if err := em.DeleteEndpoint(ctx, fullEndpoint); err != nil {
+			klog.Exitf("Failed to delete endpoint: %v", err)
+		}
+		if _, err := client.Revoke(ctx, leaseRsp.ID); err != nil {
+			klog.Exitf("Failed to revoke lease: %v", err)
+		}
 	}
 }
 

diff --git a/cmd/trillian_log_server/main.go b/cmd/trillian_log_server/main.go
@@ -117,7 +117,11 @@ func main() {
 	if err != nil {
 		klog.Exitf("Failed to get storage provider: %v", err)
 	}
-	defer sp.Close()
+	defer func() {
+		if err := sp.Close(); err != nil {
+			klog.Errorf("Close(): %v", err)
+		}
+	}()
 
 	var client *clientv3.Client
 	if servers := *etcd.Servers; servers != "" {
@@ -127,7 +131,11 @@ func main() {
 		}); err != nil {
 			klog.Exitf("Failed to connect to etcd at %v: %v", servers, err)
 		}
-		defer client.Close()
+		defer func() {
+			if err := client.Close(); err != nil {
+				klog.Errorf("Close(): %v", err)
+			}
+		}()
 	}
 
 	// Announce our endpoints to etcd if so configured.
@@ -154,7 +162,9 @@ func main() {
 	// Enable CPU profile if requested.
 	if *cpuProfile != "" {
 		f := mustCreate(*cpuProfile)
-		pprof.StartCPUProfile(f)
+		if err := pprof.StartCPUProfile(f); err != nil {
+			klog.Exitf("StartCPUProfile(): %v", err)
+		}
 		defer pprof.StopCPUProfile()
 	}
 
@@ -196,7 +206,9 @@ func main() {
 
 	if *memProfile != "" {
 		f := mustCreate(*memProfile)
-		pprof.WriteHeapProfile(f)
+		if err := pprof.WriteHeapProfile(f); err != nil {
+			klog.Exitf("WriteHeapProfile(): %v", err)
+		}
 	}
 }
 

diff --git a/cmd/trillian_log_signer/main.go b/cmd/trillian_log_signer/main.go
@@ -114,7 +114,11 @@ func main() {
 	if err != nil {
 		klog.Exitf("Failed to get storage provider: %v", err)
 	}
-	defer sp.Close()
+	defer func() {
+		if err := sp.Close(); err != nil {
+			klog.Errorf("Close(): %v", err)
+		}
+	}()
 
 	var client *clientv3.Client
 	if servers := *etcd.Servers; servers != "" {
@@ -124,7 +128,11 @@ func main() {
 		}); err != nil {
 			klog.Exitf("Failed to connect to etcd at %v: %v", servers, err)
 		}
-		defer client.Close()
+		defer func() {
+			if err := client.Close(); err != nil {
+				klog.Errorf("Close(): %v", err)
+			}
+		}()
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -188,7 +196,9 @@ func main() {
 	// Enable CPU profile if requested
 	if *cpuProfile != "" {
 		f := mustCreate(*cpuProfile)
-		pprof.StartCPUProfile(f)
+		if err := pprof.StartCPUProfile(f); err != nil {
+			klog.Exitf("StartCPUProfile(): %v", err)
+		}
 		defer pprof.StopCPUProfile()
 	}
 
@@ -211,7 +221,9 @@ func main() {
 
 	if *memProfile != "" {
 		f := mustCreate(*memProfile)
-		pprof.WriteHeapProfile(f)
+		if err := pprof.WriteHeapProfile(f); err != nil {
+			klog.Exitf("WriteHeapProfile(): %v", err)
+		}
 	}
 
 	// Give things a few seconds to tidy up

diff --git a/cmd/updatetree/main.go b/cmd/updatetree/main.go
@@ -104,7 +104,11 @@ func updateTree(ctx context.Context) (*trillian.Tree, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to dial %v: %v", *adminServerAddr, err)
 	}
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			klog.Errorf("Close(): %v", err)
+		}
+	}()
 
 	client := trillian.NewTrillianAdminClient(conn)
 	for {

diff --git a/experimental/batchmap/cmd/build/mapdemo.go b/experimental/batchmap/cmd/build/mapdemo.go
@@ -130,7 +130,12 @@ func (fn *writeTileFn) ProcessElement(ctx context.Context, t *batchmap.Tile) err
 	if err != nil {
 		return err
 	}
-	defer w.Close()
+
+	defer func() {
+		if err := w.Close(); err != nil {
+			klog.Errorf("Close(): %v", err)
+		}
+	}()
 
 	bs, err := json.Marshal(t)
 	if err != nil {

diff --git a/integration/format/format.go b/integration/format/format.go
@@ -41,6 +41,7 @@ import (
 	"github.com/transparency-dev/merkle/rfc6962"
 	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/types/known/durationpb"
+	"k8s.io/klog/v2"
 )
 
 func run(treeSize, batchSize int, leafFormat string) (string, error) {
@@ -171,7 +172,10 @@ func latestRevisions(ls storage.LogStorage, treeID int64, hasher merkle.LogHashe
 	out := new(bytes.Buffer)
 	for _, k := range keys {
 		subtree := vMap[k].subtree
-		cache.PopulateLogTile(subtree, hasher)
+		if err := cache.PopulateLogTile(subtree, hasher); err != nil {
+			// TODO(mhutchinson): This error should be propagated.
+			klog.Errorf("PopulateLogTile(): %v", err)
+		}
 		fmt.Fprintf(out, "%s\n", prototext.Format(subtree))
 	}
 	return out.String(), nil

diff --git a/integration/log_integration_test.go b/integration/log_integration_test.go
@@ -85,7 +85,11 @@ func TestLiveLogIntegration(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to connect to log server: %v", err)
 	}
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			t.Errorf("Close(): %v", err)
+		}
+	}()
 
 	lc := trillian.NewTrillianLogClient(conn)
 	if err := RunLogIntegration(lc, params); err != nil {

diff --git a/integration/quota/quota_test.go b/integration/quota/quota_test.go
@@ -43,6 +43,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/status"
+	"k8s.io/klog/v2"
 
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 )
@@ -206,18 +207,20 @@ type testServer struct {
 
 func (s *testServer) close() {
 	if s.conn != nil {
-		s.conn.Close()
+		_ = s.conn.Close()
 	}
 	if s.server != nil {
 		s.server.GracefulStop()
 	}
 	if s.lis != nil {
-		s.lis.Close()
+		_ = s.lis.Close()
 	}
 }
 
 func (s *testServer) serve() {
-	s.server.Serve(s.lis)
+	if err := s.server.Serve(s.lis); err != nil {
+		klog.Errorf("Serve(): %v", err)
+	}
 }
 
 // newTestServer returns a new testServer configured for integration tests.

diff --git a/integration/storagetest/logtests.go b/integration/storagetest/logtests.go
@@ -117,15 +117,21 @@ func (*logTests) TestSnapshot(ctx context.Context, t *testing.T, s storage.LogSt
 			tx, err := s.SnapshotForTree(ctx, test.tree)
 
 			if err == storage.ErrTreeNeedsInit {
-				defer tx.Close()
+				defer func() {
+					if err := tx.Close(); err != nil {
+						t.Errorf("Close(): %v", err)
+					}
+				}()
 			}
 
 			if hasErr := err != nil; hasErr != test.wantErr {
 				t.Fatalf("err: %v, wantErr = %v", err, test.wantErr)
 			} else if hasErr {
 				return
 			}
-			defer tx.Close()
+			defer func() {
+				_ = tx.Close()
+			}()
 
 			_, err = tx.LatestSignedLogRoot(ctx)
 			if err != nil {

diff --git a/log/operation_manager_test.go b/log/operation_manager_test.go
@@ -408,14 +408,18 @@ func TestMasterFor(t *testing.T) {
 			lom := NewOperationManager(info, nil)
 
 			// Check mastership twice, to give the election threads a chance to get started and report.
-			lom.masterFor(testCtx, firstIDs)
+			if _, err := lom.masterFor(testCtx, firstIDs); err != nil {
+				t.Error(err)
+			}
 			time.Sleep(100 * time.Millisecond)
 			logIDs, err := lom.masterFor(testCtx, firstIDs)
 			if !reflect.DeepEqual(logIDs, test.want1) {
 				t.Fatalf("masterFor(factory=%T)=%v,%v; want %v,_", test.factory, logIDs, err, test.want1)
 			}
 			// Now add extra IDs and re-check.
-			lom.masterFor(testCtx, allIDs)
+			if _, err := lom.masterFor(testCtx, allIDs); err != nil {
+				t.Error(err)
+			}
 			time.Sleep(100 * time.Millisecond)
 			logIDs, err = lom.masterFor(testCtx, allIDs)
 			if !reflect.DeepEqual(logIDs, test.want2) {

diff --git a/log/sequencer_manager_test.go b/log/sequencer_manager_test.go
@@ -105,7 +105,9 @@ func TestSequencerManagerSingleLogNoLeaves(t *testing.T) {
 	}
 
 	sm := NewSequencerManager(registry, zeroDuration)
-	sm.ExecutePass(ctx, logID, createTestInfo(registry))
+	if _, err := sm.ExecutePass(ctx, logID, createTestInfo(registry)); err != nil {
+		t.Error(err)
+	}
 }
 
 func TestSequencerManagerCachesSigners(t *testing.T) {
@@ -181,7 +183,9 @@ func TestSequencerManagerSingleLogOneLeaf(t *testing.T) {
 	}
 
 	sm := NewSequencerManager(registry, zeroDuration)
-	sm.ExecutePass(ctx, logID, createTestInfo(registry))
+	if _, err := sm.ExecutePass(ctx, logID, createTestInfo(registry)); err != nil {
+		t.Error(err)
+	}
 }
 
 // cmpMatcher is a custom gomock.Matcher that uses cmp.Equal combined with a
@@ -224,7 +228,9 @@ func TestSequencerManagerGuardWindow(t *testing.T) {
 	}
 
 	sm := NewSequencerManager(registry, time.Second*5)
-	sm.ExecutePass(ctx, logID, createTestInfo(registry))
+	if _, err := sm.ExecutePass(ctx, logID, createTestInfo(registry)); err != nil {
+		t.Error(err)
+	}
 }
 
 func createTestInfo(registry extension.Registry) *OperationInfo {