Linter fixes (unhandled errors) -- Part 2 (influxdata#9122)

srebhan · Apr 22, 2021 · 03b2dae · 03b2dae
1 parent 4d00e21
commit 03b2dae
Show file tree

Hide file tree

Showing 56 changed files with 640 additions and 460 deletions.
diff --git a/plugins/inputs/activemq/activemq_test.go b/plugins/inputs/activemq/activemq_test.go
@@ -30,7 +30,7 @@ func TestGatherQueuesMetrics(t *testing.T) {
 
 	queues := Queues{}
 
-	xml.Unmarshal([]byte(s), &queues)
+	require.NoError(t, xml.Unmarshal([]byte(s), &queues))
 
 	records := make(map[string]interface{})
 	tags := make(map[string]string)
@@ -49,7 +49,7 @@ func TestGatherQueuesMetrics(t *testing.T) {
 	activeMQ := new(ActiveMQ)
 	activeMQ.Server = "localhost"
 	activeMQ.Port = 8161
-	activeMQ.Init()
+	require.NoError(t, activeMQ.Init())
 
 	activeMQ.GatherQueuesMetrics(&acc, queues)
 	acc.AssertContainsTaggedFields(t, "activemq_queues", records, tags)
@@ -76,7 +76,7 @@ func TestGatherTopicsMetrics(t *testing.T) {
 
 	topics := Topics{}
 
-	xml.Unmarshal([]byte(s), &topics)
+	require.NoError(t, xml.Unmarshal([]byte(s), &topics))
 
 	records := make(map[string]interface{})
 	tags := make(map[string]string)
@@ -95,7 +95,7 @@ func TestGatherTopicsMetrics(t *testing.T) {
 	activeMQ := new(ActiveMQ)
 	activeMQ.Server = "localhost"
 	activeMQ.Port = 8161
-	activeMQ.Init()
+	require.NoError(t, activeMQ.Init())
 
 	activeMQ.GatherTopicsMetrics(&acc, topics)
 	acc.AssertContainsTaggedFields(t, "activemq_topics", records, tags)
@@ -110,7 +110,7 @@ func TestGatherSubscribersMetrics(t *testing.T) {
 
 	subscribers := Subscribers{}
 
-	xml.Unmarshal([]byte(s), &subscribers)
+	require.NoError(t, xml.Unmarshal([]byte(s), &subscribers))
 
 	records := make(map[string]interface{})
 	tags := make(map[string]string)
@@ -135,7 +135,7 @@ func TestGatherSubscribersMetrics(t *testing.T) {
 	activeMQ := new(ActiveMQ)
 	activeMQ.Server = "localhost"
 	activeMQ.Port = 8161
-	activeMQ.Init()
+	require.NoError(t, activeMQ.Init())
 
 	activeMQ.GatherSubscribersMetrics(&acc, subscribers)
 	acc.AssertContainsTaggedFields(t, "activemq_subscribers", records, tags)
@@ -149,13 +149,16 @@ func TestURLs(t *testing.T) {
 		switch r.URL.Path {
 		case "/admin/xml/queues.jsp":
 			w.WriteHeader(http.StatusOK)
-			w.Write([]byte("<queues></queues>"))
+			_, err := w.Write([]byte("<queues></queues>"))
+			require.NoError(t, err)
 		case "/admin/xml/topics.jsp":
 			w.WriteHeader(http.StatusOK)
-			w.Write([]byte("<topics></topics>"))
+			_, err := w.Write([]byte("<topics></topics>"))
+			require.NoError(t, err)
 		case "/admin/xml/subscribers.jsp":
 			w.WriteHeader(http.StatusOK)
-			w.Write([]byte("<subscribers></subscribers>"))
+			_, err := w.Write([]byte("<subscribers></subscribers>"))
+			require.NoError(t, err)
 		default:
 			w.WriteHeader(http.StatusNotFound)
 			t.Fatalf("unexpected path: " + r.URL.Path)

diff --git a/plugins/inputs/apache/apache_test.go b/plugins/inputs/apache/apache_test.go
@@ -31,7 +31,8 @@ Scoreboard: WW_____W_RW_R_W__RRR____WR_W___WW________W_WW_W_____R__R_WR__WRWR_RR
 func TestHTTPApache(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprintln(w, apacheStatus)
+		_, err := fmt.Fprintln(w, apacheStatus)
+		require.NoError(t, err)
 	}))
 	defer ts.Close()
 

diff --git a/plugins/inputs/apcupsd/apcupsd_test.go b/plugins/inputs/apcupsd/apcupsd_test.go
@@ -43,7 +43,7 @@ func listen(ctx context.Context, t *testing.T, out [][]byte) (string, error) {
 				continue
 			}
 			defer conn.Close()
-			conn.SetReadDeadline(time.Now().Add(time.Second))
+			require.NoError(t, conn.SetReadDeadline(time.Now().Add(time.Second)))
 
 			in := make([]byte, 128)
 			n, err := conn.Read(in)

diff --git a/plugins/inputs/aurora/aurora.go b/plugins/inputs/aurora/aurora.go
@@ -190,7 +190,9 @@ func (a *Aurora) gatherRole(ctx context.Context, origin *url.URL) (RoleType, err
 	if err != nil {
 		return Unknown, err
 	}
-	resp.Body.Close()
+	if err := resp.Body.Close(); err != nil {
+		return Unknown, fmt.Errorf("closing body failed: %v", err)
+	}
 
 	switch resp.StatusCode {
 	case http.StatusOK:

diff --git a/plugins/inputs/aurora/aurora_test.go b/plugins/inputs/aurora/aurora_test.go
@@ -46,7 +46,8 @@ func TestAurora(t *testing.T) {
 					"variable_scrape_micros_total_per_sec": 1485.0
 				}`
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(body))
+				_, err := w.Write([]byte(body))
+				require.NoError(t, err)
 			},
 			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
 				require.NoError(t, err)
@@ -86,7 +87,8 @@ func TestAurora(t *testing.T) {
 			},
 			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte("{}"))
+				_, err := w.Write([]byte("{}"))
+				require.NoError(t, err)
 			},
 			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
 				require.NoError(t, err)
@@ -104,7 +106,8 @@ func TestAurora(t *testing.T) {
 					"foo": "bar"
 				}`
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(body))
+				_, err := w.Write([]byte(body))
+				require.NoError(t, err)
 			},
 			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
 				require.NoError(t, err)
@@ -123,7 +126,8 @@ func TestAurora(t *testing.T) {
 					"foo": 1e309
 				}`
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(body))
+				_, err := w.Write([]byte(body))
+				require.NoError(t, err)
 			},
 			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
 				require.NoError(t, err)
@@ -142,7 +146,8 @@ func TestAurora(t *testing.T) {
 					"foo": 9223372036854775808
 				}`
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(body))
+				_, err := w.Write([]byte(body))
+				require.NoError(t, err)
 			},
 			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
 				require.NoError(t, err)
@@ -158,7 +163,8 @@ func TestAurora(t *testing.T) {
 			varsjson: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				body := `{]`
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(body))
+				_, err := w.Write([]byte(body))
+				require.NoError(t, err)
 			},
 			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
 				require.NoError(t, err)
@@ -176,7 +182,8 @@ func TestAurora(t *testing.T) {
 					"value": 42
 				}`
 				w.WriteHeader(http.StatusServiceUnavailable)
-				w.Write([]byte(body))
+				_, err := w.Write([]byte(body))
+				require.NoError(t, err)
 			},
 			check: func(t *testing.T, err error, acc *testutil.Accumulator) {
 				require.NoError(t, err)
@@ -244,7 +251,8 @@ func TestBasicAuth(t *testing.T) {
 				require.Equal(t, tt.username, username)
 				require.Equal(t, tt.password, password)
 				w.WriteHeader(http.StatusOK)
-				w.Write([]byte("{}"))
+				_, err := w.Write([]byte("{}"))
+				require.NoError(t, err)
 			})
 
 			var acc testutil.Accumulator

diff --git a/plugins/inputs/bcache/bcache.go b/plugins/inputs/bcache/bcache.go
@@ -6,6 +6,7 @@ package bcache
 
 import (
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -128,7 +129,7 @@ func (b *Bcache) Gather(acc telegraf.Accumulator) error {
 	}
 	bdevs, _ := filepath.Glob(bcachePath + "/*/bdev*")
 	if len(bdevs) < 1 {
-		return errors.New("Can't find any bcache device")
+		return errors.New("can't find any bcache device")
 	}
 	for _, bdev := range bdevs {
 		if restrictDevs {
@@ -137,7 +138,9 @@ func (b *Bcache) Gather(acc telegraf.Accumulator) error {
 				continue
 			}
 		}
-		b.gatherBcache(bdev, acc)
+		if err := b.gatherBcache(bdev, acc); err != nil {
+			return fmt.Errorf("gathering bcache failed: %v", err)
+		}
 	}
 	return nil
 }

diff --git a/plugins/inputs/beanstalkd/beanstalkd.go b/plugins/inputs/beanstalkd/beanstalkd.go
@@ -62,7 +62,10 @@ func (b *Beanstalkd) Gather(acc telegraf.Accumulator) error {
 	for _, tube := range tubes {
 		wg.Add(1)
 		go func(tube string) {
-			b.gatherTubeStats(connection, tube, acc)
+			err := b.gatherTubeStats(connection, tube, acc)
+			if err != nil {
+				acc.AddError(err)
+			}
 			wg.Done()
 		}(tube)
 	}

diff --git a/plugins/inputs/beanstalkd/beanstalkd_test.go b/plugins/inputs/beanstalkd/beanstalkd_test.go
@@ -22,6 +22,7 @@ func TestBeanstalkd(t *testing.T) {
 		tubesConfig      []string
 		expectedTubes    []tubeStats
 		notExpectedTubes []tubeStats
+		expectedError    string
 	}{
 		{
 			name:        "All tubes stats",
@@ -50,15 +51,14 @@ func TestBeanstalkd(t *testing.T) {
 				{name: "default", fields: defaultTubeFields},
 				{name: "test", fields: testTubeFields},
 			},
+			expectedError: "input does not match format",
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			server, err := startTestServer(t)
-			if err != nil {
-				t.Fatalf("Unable to create test server")
-			}
+			require.NoError(t, err, "Unable to create test server")
 			defer server.Close()
 
 			serverAddress := server.Addr().String()
@@ -68,8 +68,13 @@ func TestBeanstalkd(t *testing.T) {
 			}
 
 			var acc testutil.Accumulator
-			require.NoError(t, acc.GatherError(plugin.Gather))
-
+			err = acc.GatherError(plugin.Gather)
+			if test.expectedError == "" {
+				require.NoError(t, err)
+			} else {
+				require.Error(t, err)
+				require.Equal(t, test.expectedError, err.Error())
+			}
 			acc.AssertContainsTaggedFields(t, "beanstalkd_overview",
 				overviewFields,
 				getOverviewTags(serverAddress),
@@ -110,8 +115,8 @@ func startTestServer(t *testing.T) (net.Listener, error) {
 		tp := textproto.NewConn(connection)
 		defer tp.Close()
 
-		sendSuccessResponse := func(body string) {
-			tp.PrintfLine("OK %d\r\n%s", len(body), body)
+		sendSuccessResponse := func(body string) error {
+			return tp.PrintfLine("OK %d\r\n%s", len(body), body)
 		}
 
 		for {
@@ -125,15 +130,30 @@ func startTestServer(t *testing.T) (net.Listener, error) {
 
 			switch cmd {
 			case "list-tubes":
-				sendSuccessResponse(listTubesResponse)
+				if err := sendSuccessResponse(listTubesResponse); err != nil {
+					t.Logf("sending response %q failed: %v", listTubesResponse, err)
+					return
+				}
 			case "stats":
-				sendSuccessResponse(statsResponse)
+				if err := sendSuccessResponse(statsResponse); err != nil {
+					t.Logf("sending response %q failed: %v", statsResponse, err)
+					return
+				}
 			case "stats-tube default":
-				sendSuccessResponse(statsTubeDefaultResponse)
+				if err := sendSuccessResponse(statsTubeDefaultResponse); err != nil {
+					t.Logf("sending response %q failed: %v", statsTubeDefaultResponse, err)
+					return
+				}
 			case "stats-tube test":
-				sendSuccessResponse(statsTubeTestResponse)
+				if err := sendSuccessResponse(statsTubeTestResponse); err != nil {
+					t.Logf("sending response %q failed: %v", statsTubeTestResponse, err)
+					return
+				}
 			case "stats-tube unknown":
-				tp.PrintfLine("NOT_FOUND")
+				if err := tp.PrintfLine("NOT_FOUND"); err != nil {
+					t.Logf("sending response %q failed: %v", "NOT_FOUND", err)
+					return
+				}
 			default:
 				t.Log("Test server: unknown command")
 			}