*: make linters happy

abursavich · Mar 16, 2020 · 8d8502f · 8d8502f
1 parent d06eff9
commit 8d8502f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/dynamic_test.go b/dynamic_test.go
@@ -189,7 +189,7 @@ func TestMTLS(t *testing.T) {
 	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 		fmt.Fprint(w, msg)
 	})
-	go http.Serve(NewListener(lis, serverCfg), handler)
+	go http.Serve(NewListener(lis, serverCfg), handler) //nolint:errcheck
 
 	// create client
 	client := &http.Client{

diff --git a/dynamictls.go b/dynamictls.go
@@ -375,8 +375,12 @@ func readCerts(h hash.Hash, pairs []keyPair) ([]tls.Certificate, error) {
 			return nil, fmt.Errorf("dynamictls: cert parsing error: %w", err)
 		}
 		certs = append(certs, cert)
-		h.Write(certPEMBlock)
-		h.Write(keyPEMBlock)
+		if _, err := h.Write(certPEMBlock); err != nil {
+			return nil, fmt.Errorf("dynamictls: hash write error: %w", err)
+		}
+		if _, err := h.Write(keyPEMBlock); err != nil {
+			return nil, fmt.Errorf("dynamictls: hash write error: %w", err)
+		}
 	}
 	return certs, nil
 }
@@ -392,7 +396,9 @@ func readCAs(h hash.Hash, files []string) (*x509.CertPool, error) {
 			return nil, fmt.Errorf("dynamictls: certificate authorities read error: %w", err)
 		}
 		pool.AppendCertsFromPEM(caPEMCerts)
-		h.Write(caPEMCerts)
+		if _, err := h.Write(caPEMCerts); err != nil {
+			return nil, fmt.Errorf("dynamictls: hash write error: %w", err)
+		}
 	}
 	return pool, nil
 }

diff --git a/dynamictls_hidden_test.go b/dynamictls_hidden_test.go
@@ -6,7 +6,6 @@ package dynamictls_test
 
 import (
 	"log"
-	"net/http"
 )
 
 var (
@@ -15,11 +14,8 @@ var (
 	certFile, keyFile, caFile           string
 	primaryCertFile, primaryKeyFile     string
 	secondaryCertFile, secondaryKeyFile string
-	rootCAsFile, clientCAsFile          string
 )
 
-func makeRequests(*http.Client) {}
-
 func check(err error) {
 	if err != nil {
 		log.Fatal(err)

diff --git a/grpctls/grpctls_test.go b/grpctls/grpctls_test.go
@@ -67,7 +67,7 @@ func TestGRPC(t *testing.T) {
 	srv := grpc.NewServer(grpc.Creds(serverCreds))
 	pb.RegisterTestServiceServer(srv, &testServiceServer{})
 	defer srv.GracefulStop()
-	go srv.Serve(lis)
+	go srv.Serve(lis) //nolint:errcheck
 
 	// create client
 	_, clientCertPEM, clientKeyPEM, err := tlstest.GenerateCert(&tlstest.CertOptions{

diff --git a/internal/http2/ciphers.go b/internal/http2/ciphers.go
@@ -10,6 +10,7 @@ package http2
 // A list of the possible cipher suite ids. Taken from
 // https://www.iana.org/assignments/tls-parameters/tls-parameters.txt
 
+//nolint:unused,varcheck,deadcode
 const (
 	cipherxTLSxNULLxWITHxNULLxNULL               uint16 = 0x0000
 	cipherxTLSxRSAxWITHxNULLxMD5                 uint16 = 0x0001