ci: enable rowserrcheck and bodyclose linters (#380)

.github/workflows/build.yml

@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.36.0
+          version: v1.42.0
           args: --verbose
       - run: git diff --exit-code
 

.golangci.yml

@@ -6,8 +6,7 @@ run:
     - test
 linters:
   enable:
-    # TODO
-    # - bodyclose
+    - bodyclose
     - deadcode
     - errcheck
     # only minor issues
@@ -21,8 +20,7 @@ linters:
     - govet
     - ineffassign
     - misspell
-    # TODO
-    # - rowserrcheck
+    - rowserrcheck
     - sqlclosecheck
     - staticcheck
     - structcheck

runner/sidecar/in.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -135,9 +136,13 @@ func waitReady(ctx context.Context) error {
 				}
 			}
 			logger.Info("waiting for HTTP in interface to be ready")
-			if resp, err := httpClient.Get("http://127.0.0.1:8080/ready"); err == nil && resp.StatusCode < 300 {
-				logger.Info("HTTP in interface ready")
-				return nil
+			if resp, err := httpClient.Get("http://127.0.0.1:8080/ready"); err == nil {
+				_, _ = io.Copy(io.Discard, resp.Body)
+				_ = resp.Body.Close()
+				if resp.StatusCode < 300 {
+					logger.Info("HTTP in interface ready")
+					return nil
+				}
 			}
 			time.Sleep(1 * time.Second)
 		}
@@ -151,9 +156,16 @@ func waitUnready(ctx context.Context) error {
 			return fmt.Errorf("failed to wait for un-ready: %w", ctx.Err())
 		default:
 			logger.Info("waiting for HTTP in interface to be unready")
-			if resp, err := httpClient.Get("http://127.0.0.1:8080/ready"); err != nil || resp.StatusCode >= 300 {
+			if resp, err := httpClient.Get("http://127.0.0.1:8080/ready"); err != nil {
 				logger.Info("HTTP in interface unready")
 				return nil
+			} else {
+				_, _ = io.Copy(io.Discard, resp.Body)
+				_ = resp.Body.Close()
+				if resp.StatusCode >= 300 {
+					logger.Info("HTTP in interface unready")
+					return nil
+				}
 			}
 			time.Sleep(1 * time.Second)
 		}

runner/sidecar/source/db/db.go

@@ -175,6 +175,9 @@ func queryData(ctx context.Context, db *sql.DB, sourceURN, query, offsetColumn,
 		return fmt.Errorf("failed to execute sql query: %w", err)
 	}
 	defer func() { _ = rows.Close() }()
+	if rows.Err() != nil {
+		return fmt.Errorf("failed to execute sql query: %w", rows.Err())
+	}
 
 	columns, err := rows.Columns()
 	if err != nil {

runner/sidecar/source/loadbalanced/loadbalanced.go

@@ -110,8 +110,11 @@ func New(ctx context.Context, secretInterface corev1.SecretInterface, r NewReq)
 					endpoint := "https://" + r.PipelineName + "-" + r.StepName + "/ready"
 					logger.Info("waiting for HTTP service to be ready", "endpoint", endpoint)
 					resp, err := httpClient.Get(endpoint)
-					if err == nil && resp.StatusCode < 300 {
-						break OUTER
+					if err == nil {
+						_ = resp.Body.Close()
+						if resp.StatusCode < 300 {
+							break OUTER
+						}
 					}
 					time.Sleep(3 * time.Second)
 				}

test/http.go

@@ -23,6 +23,7 @@ func SendMessageViaHTTP(msg string) {
 		panic(err)
 	} else {
 		body, _ := ioutil.ReadAll(resp.Body)
+		_ = resp.Body.Close()
 		if resp.StatusCode != 204 {
 			panic(fmt.Errorf("%s: %q", resp.Status, body))
 		}

test/testapi.go

@@ -14,22 +14,23 @@ import (
 func InvokeTestAPI(format string, args ...interface{}) string {
 	url := "http://localhost:8378" + fmt.Sprintf(format, args...)
 	log.Printf("GET %s\n", url)
-	r, err := http.Get(url)
+	resp, err := http.Get(url)
 	if err != nil {
 		panic(err)
 	}
-	log.Printf("> %s\n", r.Status)
+	log.Printf("> %s\n", resp.Status)
 	body := ""
-	for s := bufio.NewScanner(r.Body); s.Scan(); {
+	defer resp.Body.Close()
+	for s := bufio.NewScanner(resp.Body); s.Scan(); {
 		x := s.Text()
 		if strings.Contains(x, "ERROR") { // hacky way to return an error from an octet-stream
 			panic(errors.New(x))
 		}
 		log.Printf("> %s\n", x)
 		body += x
 	}
-	if r.StatusCode >= 300 {
-		panic(errors.New(r.Status))
+	if resp.StatusCode >= 300 {
+		panic(errors.New(resp.Status))
 	}
 	return body
 }

testapi/http.go

@@ -103,9 +103,11 @@ func init() {
 		url := r.URL.Query().Get("url")
 		w.WriteHeader(200)
 		for {
-			if _, err := httpClient.Get(url); err != nil {
+			if resp, err := httpClient.Get(url); err != nil {
 				_, _ = fmt.Fprintf(w, "%q is not ready: %v\n", url, err)
 			} else {
+				_, _ = io.Copy(io.Discard, resp.Body)
+				_ = resp.Body.Close()
 				return
 			}
 			time.Sleep(1 * time.Second)