From 7c9d5e52b04ef44378af4082409881d8eb46b119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20=C5=BBak?= Date: Mon, 28 Oct 2024 13:58:03 +0100 Subject: [PATCH] chore(linters): Fix findings found by `testifylint`: `go-require` for handlers for `plugins/inputs/[a-m]` (#16076) --- plugins/inputs/activemq/activemq_test.go | 21 ++- plugins/inputs/apache/apache_test.go | 7 +- plugins/inputs/aurora/aurora_test.go | 19 ++- plugins/inputs/beat/beat_test.go | 59 ++++++-- plugins/inputs/clickhouse/clickhouse_test.go | 132 +++++++++++++++--- .../inputs/consul_agent/consul_agent_test.go | 13 +- plugins/inputs/couchbase/couchbase_test.go | 84 +++++++---- plugins/inputs/couchdb/couchdb_test.go | 7 +- .../ctrlx_datalayer/ctrlx_datalayer_test.go | 84 +++++++---- plugins/inputs/fibaro/fibaro_test.go | 50 +++++-- plugins/inputs/fireboard/fireboard_test.go | 7 +- plugins/inputs/fluentd/fluentd_test.go | 7 +- .../google_cloud_storage_test.go | 40 ++++-- plugins/inputs/haproxy/haproxy_test.go | 35 +++-- plugins/inputs/http/http_test.go | 35 +++-- .../http_response/http_response_test.go | 40 ++++-- plugins/inputs/icinga2/icinga2_test.go | 28 ++-- plugins/inputs/influxdb/influxdb_test.go | 49 +++++-- .../jolokia2_agent/jolokia2_agent_test.go | 12 +- .../jolokia2_proxy/jolokia2_proxy_test.go | 21 ++- plugins/inputs/kapacitor/kapacitor_test.go | 21 ++- plugins/inputs/kubernetes/kubernetes_test.go | 14 +- plugins/inputs/logstash/logstash_test.go | 42 ++++-- plugins/inputs/mailchimp/mailchimp_test.go | 21 ++- plugins/inputs/marklogic/marklogic_test.go | 7 +- plugins/inputs/monit/monit_test.go | 12 +- 26 files changed, 653 insertions(+), 214 deletions(-) diff --git a/plugins/inputs/activemq/activemq_test.go b/plugins/inputs/activemq/activemq_test.go index cfece824c..a31b1547d 100644 --- a/plugins/inputs/activemq/activemq_test.go +++ b/plugins/inputs/activemq/activemq_test.go @@ -149,16 +149,25 @@ func TestURLs(t *testing.T) { switch r.URL.Path { case "/admin/xml/queues.jsp": w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte("")) - require.NoError(t, err) + if _, err := w.Write([]byte("")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case "/admin/xml/topics.jsp": w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte("")) - require.NoError(t, err) + if _, err := w.Write([]byte("")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case "/admin/xml/subscribers.jsp": w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte("")) - require.NoError(t, err) + if _, err := w.Write([]byte("")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } default: w.WriteHeader(http.StatusNotFound) t.Fatalf("unexpected path: %s", r.URL.Path) diff --git a/plugins/inputs/apache/apache_test.go b/plugins/inputs/apache/apache_test.go index 55f3cf225..3c9a6bbcc 100644 --- a/plugins/inputs/apache/apache_test.go +++ b/plugins/inputs/apache/apache_test.go @@ -32,8 +32,11 @@ 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, _ *http.Request) { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, apacheStatus) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, apacheStatus); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() diff --git a/plugins/inputs/aurora/aurora_test.go b/plugins/inputs/aurora/aurora_test.go index b43949f25..ee3800b1d 100644 --- a/plugins/inputs/aurora/aurora_test.go +++ b/plugins/inputs/aurora/aurora_test.go @@ -248,11 +248,22 @@ func TestBasicAuth(t *testing.T) { t.Run(tt.name, func(t *testing.T) { ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { username, password, _ := r.BasicAuth() - require.Equal(t, tt.username, username) - require.Equal(t, tt.password, password) + if username != tt.username { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", tt.username, username) + return + } + if password != tt.password { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", tt.password, password) + return + } w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte("{}")) - require.NoError(t, err) + if _, err := w.Write([]byte("{}")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }) var acc testutil.Accumulator diff --git a/plugins/inputs/beat/beat_test.go b/plugins/inputs/beat/beat_test.go index c9b9d6071..ee0dd8d70 100644 --- a/plugins/inputs/beat/beat_test.go +++ b/plugins/inputs/beat/beat_test.go @@ -29,13 +29,22 @@ func Test_BeatStats(t *testing.T) { case suffixStats: jsonFilePath = "beat6_stats.json" default: - require.FailNow(t, "cannot handle request") + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Cannot handle request") + return } data, err := os.ReadFile(jsonFilePath) - require.NoErrorf(t, err, "could not read from data file %s", jsonFilePath) - _, err = w.Write(data) - require.NoError(t, err, "could not write data") + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Could not read from data file %q: %v", jsonFilePath, err) + return + } + if _, err = w.Write(data); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) requestURL, err := url.Parse(beatTest.URL) require.NoErrorf(t, err, "can't parse URL %s", beatTest.URL) @@ -173,18 +182,42 @@ func Test_BeatRequest(t *testing.T) { case suffixStats: jsonFilePath = "beat6_stats.json" default: - require.FailNow(t, "cannot handle request") + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Cannot handle request") + return } data, err := os.ReadFile(jsonFilePath) - require.NoErrorf(t, err, "could not read from data file %s", jsonFilePath) - require.Equal(t, "beat.test.local", request.Host) - require.Equal(t, "POST", request.Method) - require.Equal(t, "Basic YWRtaW46UFdE", request.Header.Get("Authorization")) - require.Equal(t, "test-value", request.Header.Get("X-Test")) - - _, err = w.Write(data) - require.NoError(t, err, "could not write data") + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Could not read from data file %q: %v", jsonFilePath, err) + return + } + if request.Host != "beat.test.local" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "beat.test.local", request.Host) + return + } + if request.Method != "POST" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "POST", request.Method) + return + } + if request.Header.Get("Authorization") != "Basic YWRtaW46UFdE" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "Basic YWRtaW46UFdE", request.Header.Get("Authorization")) + return + } + if request.Header.Get("X-Test") != "test-value" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "test-value", request.Header.Get("X-Test")) + return + } + if _, err = w.Write(data); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) requestURL, err := url.Parse(beatTest.URL) diff --git a/plugins/inputs/clickhouse/clickhouse_test.go b/plugins/inputs/clickhouse/clickhouse_test.go index 048969351..d63d430c3 100644 --- a/plugins/inputs/clickhouse/clickhouse_test.go +++ b/plugins/inputs/clickhouse/clickhouse_test.go @@ -74,7 +74,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.events"): err := enc.Encode(result{ Data: []struct { @@ -91,7 +95,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.metrics"): err := enc.Encode(result{ Data: []struct { @@ -108,7 +116,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.asynchronous_metrics"): err := enc.Encode(result{ Data: []struct { @@ -125,7 +137,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "zk_exists"): err := enc.Encode(result{ Data: []struct { @@ -136,7 +152,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "zk_root_nodes"): err := enc.Encode(result{ Data: []struct { @@ -147,7 +167,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "replication_queue_exists"): err := enc.Encode(result{ Data: []struct { @@ -158,7 +182,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "replication_too_many_tries_replicas"): err := enc.Encode(result{ Data: []struct { @@ -171,7 +199,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.detached_parts"): err := enc.Encode(result{ Data: []struct { @@ -182,7 +214,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.dictionaries"): err := enc.Encode(result{ Data: []struct { @@ -197,7 +233,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.mutations"): err := enc.Encode(result{ Data: []struct { @@ -212,7 +252,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.disks"): err := enc.Encode(result{ Data: []struct { @@ -229,7 +273,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.processes"): err := enc.Encode(result{ Data: []struct { @@ -258,7 +306,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "text_log_exists"): err := enc.Encode(result{ Data: []struct { @@ -269,7 +321,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "system.text_log"): err := enc.Encode(result{ Data: []struct { @@ -298,7 +354,11 @@ func TestGather(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } })) ch = &ClickHouse{ @@ -451,7 +511,11 @@ func TestGatherWithSomeTablesNotExists(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "replication_queue_exists"): err := enc.Encode(result{ Data: []struct { @@ -462,7 +526,11 @@ func TestGatherWithSomeTablesNotExists(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "text_log_exists"): err := enc.Encode(result{ Data: []struct { @@ -473,7 +541,11 @@ func TestGatherWithSomeTablesNotExists(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } })) ch = &ClickHouse{ @@ -509,7 +581,11 @@ func TestGatherClickhouseCloud(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case strings.Contains(query, "zk_root_nodes"): err := enc.Encode(result{ Data: []struct { @@ -520,7 +596,11 @@ func TestGatherClickhouseCloud(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } })) defer ts.Close() @@ -545,7 +625,11 @@ func TestWrongJSONMarshalling(t *testing.T) { err := enc.Encode(result{ Data: []struct{}{}, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) ch = &ClickHouse{ Servers: []string{ @@ -631,7 +715,11 @@ func TestAutoDiscovery(t *testing.T) { }, }, }) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } })) ch = &ClickHouse{ diff --git a/plugins/inputs/consul_agent/consul_agent_test.go b/plugins/inputs/consul_agent/consul_agent_test.go index cb1b778f2..ce20aee4d 100644 --- a/plugins/inputs/consul_agent/consul_agent_test.go +++ b/plugins/inputs/consul_agent/consul_agent_test.go @@ -75,9 +75,16 @@ func TestConsulStats(t *testing.T) { if r.RequestURI == "/v1/agent/metrics" { w.WriteHeader(http.StatusOK) responseKeyMetrics, err := os.ReadFile("testdata/response_key_metrics.json") - require.NoError(t, err) - _, err = fmt.Fprintln(w, string(responseKeyMetrics)) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } + if _, err = fmt.Fprintln(w, string(responseKeyMetrics)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } })) defer ts.Close() diff --git a/plugins/inputs/couchbase/couchbase_test.go b/plugins/inputs/couchbase/couchbase_test.go index 9621843a9..1aabc19e6 100644 --- a/plugins/inputs/couchbase/couchbase_test.go +++ b/plugins/inputs/couchbase/couchbase_test.go @@ -17,17 +17,29 @@ func TestGatherServer(t *testing.T) { bucket := "blastro-df" fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/pools" { - _, err := w.Write(readJSON(t, "testdata/pools_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/pools_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else if r.URL.Path == "/pools/default" { - _, err := w.Write(readJSON(t, "testdata/pools_default_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/pools_default_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else if r.URL.Path == "/pools/default/buckets" { - _, err := w.Write(readJSON(t, "testdata/bucket_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/bucket_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else if r.URL.Path == "/pools/default/buckets/"+bucket+"/stats" { - _, err := w.Write(readJSON(t, "testdata/bucket_stats_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/bucket_stats_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -116,8 +128,11 @@ func TestGatherDetailedBucketMetrics(t *testing.T) { t.Run(test.name, func(t *testing.T) { fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/pools/default/buckets/"+bucket+"/stats" || r.URL.Path == "/pools/default/buckets/"+bucket+"/nodes/"+node+"/stats" { - _, err := w.Write(test.response) - require.NoError(t, err) + if _, err := w.Write(test.response); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -153,14 +168,23 @@ func TestGatherDetailedBucketMetrics(t *testing.T) { func TestGatherNodeOnly(t *testing.T) { faker := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/pools" { - _, err := w.Write(readJSON(t, "testdata/pools_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/pools_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else if r.URL.Path == "/pools/default" { - _, err := w.Write(readJSON(t, "testdata/pools_default_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/pools_default_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else if r.URL.Path == "/pools/default/buckets" { - _, err := w.Write(readJSON(t, "testdata/bucket_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/bucket_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -183,17 +207,29 @@ func TestGatherFailover(t *testing.T) { faker := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { case "/pools": - _, err := w.Write(readJSON(t, "testdata/pools_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/pools_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case "/pools/default": - _, err := w.Write(readJSON(t, "testdata/pools_default_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/pools_default_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case "/pools/default/buckets": - _, err := w.Write(readJSON(t, "testdata/bucket_response.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/bucket_response.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case "/settings/autoFailover": - _, err := w.Write(readJSON(t, "testdata/settings_autofailover.json")) - require.NoError(t, err) + if _, err := w.Write(readJSON(t, "testdata/settings_autofailover.json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } default: w.WriteHeader(http.StatusNotFound) } diff --git a/plugins/inputs/couchdb/couchdb_test.go b/plugins/inputs/couchdb/couchdb_test.go index 4cbd59d63..2e7c5af79 100644 --- a/plugins/inputs/couchdb/couchdb_test.go +++ b/plugins/inputs/couchdb/couchdb_test.go @@ -305,8 +305,11 @@ func TestBasic(t *testing.T) { ` fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/_stats" { - _, err := w.Write([]byte(js)) - require.NoError(t, err) + if _, err := w.Write([]byte(js)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } diff --git a/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_test.go b/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_test.go index 1d70022fa..06262fec4 100644 --- a/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_test.go +++ b/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_test.go @@ -36,8 +36,11 @@ func getMultiEntries() bool { func TestCtrlXCreateSubscriptionBasic(t *testing.T) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusCreated) - _, err := w.Write([]byte("201 created")) - require.NoError(t, err) + if _, err := w.Write([]byte("201 created")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer server.Close() @@ -80,8 +83,11 @@ func TestCtrlXCreateSubscriptionDriven(t *testing.T) { t.Run(test.res, func(t *testing.T) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(test.status) - _, err := w.Write([]byte(test.res)) - require.NoError(t, err) + if _, err := w.Write([]byte(test.res)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer server.Close() subs := make([]subscription, 0) @@ -118,45 +124,75 @@ func newServer(t *testing.T) *httptest.Server { mux := http.NewServeMux() // Handle request to fetch token mux.HandleFunc("/identity-manager/api/v2/auth/token", func(w http.ResponseWriter, _ *http.Request) { - _, err := w.Write([]byte("{\"access_token\": \"eyJhbGciOiJIU.xxx.xxx\", \"token_type\":\"Bearer\"}")) - require.NoError(t, err) + if _, err := w.Write([]byte("{\"access_token\": \"eyJhbGciOiJIU.xxx.xxx\", \"token_type\":\"Bearer\"}")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }) // Handle request to validate token mux.HandleFunc("/identity-manager/api/v2/auth/token/validity", func(w http.ResponseWriter, _ *http.Request) { - _, err := w.Write([]byte("{\"valid\": \"true\"}")) - require.NoError(t, err) + if _, err := w.Write([]byte("{\"valid\": \"true\"}")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }) // Handle request to create subscription mux.HandleFunc(path, func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusCreated) - _, err := w.Write([]byte("201 created")) - require.NoError(t, err) + if _, err := w.Write([]byte("201 created")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }) // Handle request to fetch sse data mux.HandleFunc(path+"/", func(w http.ResponseWriter, r *http.Request) { if r.Method == http.MethodGet { w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte("event: update\n")) - require.NoError(t, err) - _, err = w.Write([]byte("id: 12345\n")) - require.NoError(t, err) + if _, err := w.Write([]byte("event: update\n")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } + if _, err := w.Write([]byte("id: 12345\n")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } if getMultiEntries() { data := "data: {\n" - _, err = w.Write([]byte(data)) - require.NoError(t, err) + if _, err := w.Write([]byte(data)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } data = "data: \"node\":\"plc/app/Application/sym/PLC_PRG/counter\", \"timestamp\":132669450604571037,\"type\":\"double\",\"value\":44.0\n" - _, err = w.Write([]byte(data)) - require.NoError(t, err) + if _, err := w.Write([]byte(data)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } data = "data: }\n" - _, err = w.Write([]byte(data)) - require.NoError(t, err) + if _, err := w.Write([]byte(data)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { data := "data: {\"node\":\"plc/app/Application/sym/PLC_PRG/counter\", \"timestamp\":132669450604571037,\"type\":\"double\",\"value\":43.0}\n" - _, err = w.Write([]byte(data)) - require.NoError(t, err) + if _, err := w.Write([]byte(data)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } + } + if _, err := w.Write([]byte("\n")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return } - _, err = w.Write([]byte("\n")) - require.NoError(t, err) } }) return httptest.NewServer(mux) diff --git a/plugins/inputs/fibaro/fibaro_test.go b/plugins/inputs/fibaro/fibaro_test.go index 4021f469a..80f365ebd 100644 --- a/plugins/inputs/fibaro/fibaro_test.go +++ b/plugins/inputs/fibaro/fibaro_test.go @@ -42,20 +42,35 @@ func TestJSONSuccess(t *testing.T) { switch r.URL.Path { case "/api/sections": content, err := os.ReadFile(path.Join("testdata", "sections.json")) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } payload = string(content) case "/api/rooms": content, err := os.ReadFile(path.Join("testdata", "rooms.json")) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } payload = string(content) case "/api/devices": content, err := os.ReadFile(path.Join("testdata", "device_hc2.json")) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } payload = string(content) } w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, payload) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, payload); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() @@ -158,20 +173,35 @@ func TestHC3JSON(t *testing.T) { switch r.URL.Path { case "/api/sections": content, err := os.ReadFile(path.Join("testdata", "sections.json")) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } payload = string(content) case "/api/rooms": content, err := os.ReadFile(path.Join("testdata", "rooms.json")) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } payload = string(content) case "/api/devices": content, err := os.ReadFile(path.Join("testdata", "device_hc3.json")) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } payload = string(content) } w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, payload) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, payload); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() diff --git a/plugins/inputs/fireboard/fireboard_test.go b/plugins/inputs/fireboard/fireboard_test.go index 7f4c18720..803ffb94a 100644 --- a/plugins/inputs/fireboard/fireboard_test.go +++ b/plugins/inputs/fireboard/fireboard_test.go @@ -17,8 +17,11 @@ func TestFireboard(t *testing.T) { // Create a test server with the const response JSON ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, response) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, response); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() diff --git a/plugins/inputs/fluentd/fluentd_test.go b/plugins/inputs/fluentd/fluentd_test.go index 2fc108693..263bea8ea 100644 --- a/plugins/inputs/fluentd/fluentd_test.go +++ b/plugins/inputs/fluentd/fluentd_test.go @@ -171,8 +171,11 @@ func Test_Gather(t *testing.T) { ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Header().Set("Content-Type", "application/json") - _, err := fmt.Fprintf(w, "%s", string(sampleJSON)) - require.NoError(t, err) + if _, err := fmt.Fprintf(w, "%s", sampleJSON); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) requestURL, err := url.Parse(fluentdTest.Endpoint) diff --git a/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go b/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go index 3cedc8dff..f6208000c 100644 --- a/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go +++ b/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go @@ -204,12 +204,18 @@ func startGCSServer(t *testing.T) *httptest.Server { switch r.URL.Path { case "/test-bucket/prefix/offset.json": w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte(currentOffSetKey)) - require.NoError(t, err) + if _, err := w.Write([]byte(currentOffSetKey)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } case "/test-bucket/prefix/offset-key.json": w.WriteHeader(http.StatusOK) - _, err := w.Write([]byte("{\"offSet\":\"offsetfile\"}")) - require.NoError(t, err) + if _, err := w.Write([]byte("{\"offSet\":\"offsetfile\"}")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } default: failPath(r.URL.Path, t, w) } @@ -265,8 +271,11 @@ func startMultipleItemGCSServer(t *testing.T) *httptest.Server { if data, err := json.Marshal(objListing); err == nil { w.WriteHeader(http.StatusOK) - _, err := w.Write(data) - require.NoError(t, err) + if _, err := w.Write(data); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) t.Fatalf("unexpected path: %s", r.URL.Path) @@ -314,17 +323,28 @@ func stateFullGCSServer(t *testing.T) *httptest.Server { if data, err := json.Marshal(objListing); err == nil { w.WriteHeader(http.StatusOK) - _, err := w.Write(data) - require.NoError(t, err) + if _, err := w.Write(data); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { failPath(r.URL.Path, t, w) } case "/upload/storage/v1/b/test-iteration-bucket/o": _, params, err := mime.ParseMediaType(r.Header["Content-Type"][0]) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } boundary := params["boundary"] currentOffSetKey, err = fetchJSON(t, boundary, r.Body) - require.NoError(t, err) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } default: serveBlobs(t, w, r.URL.Path, currentOffSetKey) } diff --git a/plugins/inputs/haproxy/haproxy_test.go b/plugins/inputs/haproxy/haproxy_test.go index 0b4b0aa0c..884dcdc8d 100644 --- a/plugins/inputs/haproxy/haproxy_test.go +++ b/plugins/inputs/haproxy/haproxy_test.go @@ -49,18 +49,27 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) { username, password, ok := r.BasicAuth() if !ok { w.WriteHeader(http.StatusNotFound) - _, err := fmt.Fprint(w, "Unauthorized") - require.NoError(t, err) + if _, err := fmt.Fprint(w, "Unauthorized"); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } return } if username == "user" && password == "password" { - _, err := fmt.Fprint(w, string(csvOutputSample)) - require.NoError(t, err) + if _, err := fmt.Fprint(w, string(csvOutputSample)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) - _, err := fmt.Fprint(w, "Unauthorized") - require.NoError(t, err) + if _, err := fmt.Fprint(w, "Unauthorized"); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } })) defer ts.Close() @@ -96,8 +105,11 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) { func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { - _, err := fmt.Fprint(w, string(csvOutputSample)) - require.NoError(t, err) + if _, err := fmt.Fprint(w, string(csvOutputSample)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() @@ -217,8 +229,11 @@ func TestHaproxyDefaultGetFromLocalhost(t *testing.T) { func TestHaproxyKeepFieldNames(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { - _, err := fmt.Fprint(w, string(csvOutputSample)) - require.NoError(t, err) + if _, err := fmt.Fprint(w, string(csvOutputSample)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() diff --git a/plugins/inputs/http/http_test.go b/plugins/inputs/http/http_test.go index 7e4254577..3cb2d767d 100644 --- a/plugins/inputs/http/http_test.go +++ b/plugins/inputs/http/http_test.go @@ -32,8 +32,11 @@ import ( func TestHTTPWithJSONFormat(t *testing.T) { fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write([]byte(simpleJSON)) - require.NoError(t, err) + if _, err := w.Write([]byte(simpleJSON)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -73,8 +76,11 @@ func TestHTTPHeaders(t *testing.T) { fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { if r.Header.Get(header) == headerValue { - _, err := w.Write([]byte(simpleJSON)) - require.NoError(t, err) + if _, err := w.Write([]byte(simpleJSON)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusForbidden) } @@ -107,8 +113,11 @@ func TestHTTPContentLengthHeader(t *testing.T) { fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { if r.Header.Get("Content-Length") != "" { - _, err := w.Write([]byte(simpleJSON)) - require.NoError(t, err) + if _, err := w.Write([]byte(simpleJSON)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusForbidden) } @@ -408,8 +417,11 @@ func TestOAuthClientCredentialsGrant(t *testing.T) { func TestHTTPWithCSVFormat(t *testing.T) { fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write([]byte(simpleCSVWithHeader)) - require.NoError(t, err) + if _, err := w.Write([]byte(simpleCSVWithHeader)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -466,8 +478,11 @@ func TestConnectionOverUnixSocket(t *testing.T) { ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/data" { w.Header().Set("Content-Type", "text/csv") - _, err := w.Write([]byte(simpleCSVWithHeader)) - require.NoError(t, err) + if _, err := w.Write([]byte(simpleCSVWithHeader)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go index 6b5eab8d4..9e848687d 100644 --- a/plugins/inputs/http_response/http_response_test.go +++ b/plugins/inputs/http_response/http_response_test.go @@ -170,11 +170,21 @@ func checkOutput(t *testing.T, acc *testutil.Accumulator, presentFields, present func TestHeaders(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - cHeader := r.Header.Get("Content-Type") - uaHeader := r.Header.Get("User-Agent") - require.Equal(t, "Hello", r.Host) - require.Equal(t, "application/json", cHeader) - require.Equal(t, internal.ProductToken(), uaHeader) + if r.Host != "Hello" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "Hello", r.Host) + return + } + if cHeader := r.Header.Get("Content-Type"); cHeader != "application/json" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "application/json", cHeader) + return + } + if uaHeader := r.Header.Get("User-Agent"); uaHeader != internal.ProductToken() { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", internal.ProductToken(), uaHeader) + return + } w.WriteHeader(http.StatusOK) })) defer ts.Close() @@ -1115,8 +1125,11 @@ func TestRedirect(t *testing.T) { ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Header().Add("Location", "http://example.org") w.WriteHeader(http.StatusMovedPermanently) - _, err := w.Write([]byte("test")) - require.NoError(t, err) + if _, err := w.Write([]byte("test")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }) h := &HTTPResponse{ @@ -1158,8 +1171,11 @@ func TestRedirect(t *testing.T) { func TestBasicAuth(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - aHeader := r.Header.Get("Authorization") - require.Equal(t, "Basic bWU6bXlwYXNzd29yZA==", aHeader) + if aHeader := r.Header.Get("Authorization"); aHeader != "Basic bWU6bXlwYXNzd29yZA==" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "Basic bWU6bXlwYXNzd29yZA==", aHeader) + return + } w.WriteHeader(http.StatusOK) })) defer ts.Close() @@ -1336,7 +1352,11 @@ func TestStatusCodeAndStringMatchFail(t *testing.T) { func TestSNI(t *testing.T) { ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - require.Equal(t, "super-special-hostname.example.com", r.TLS.ServerName) + if r.TLS.ServerName != "super-special-hostname.example.com" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "super-special-hostname.example.com", r.TLS.ServerName) + return + } w.WriteHeader(http.StatusOK) })) defer ts.Close() diff --git a/plugins/inputs/icinga2/icinga2_test.go b/plugins/inputs/icinga2/icinga2_test.go index c1bc31aaa..d72ec6aaa 100644 --- a/plugins/inputs/icinga2/icinga2_test.go +++ b/plugins/inputs/icinga2/icinga2_test.go @@ -70,8 +70,11 @@ func TestGatherServicesStatus(t *testing.T) { if r.URL.Path == "/v1/objects/services" { w.WriteHeader(http.StatusOK) w.Header().Set("Content-Type", "application/json") - _, err := w.Write([]byte(icinga2ServiceResponse)) - require.NoError(t, err) + if _, err := w.Write([]byte(icinga2ServiceResponse)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) t.Logf("Req: %s %s\n", r.Host, r.URL.Path) @@ -133,8 +136,11 @@ func TestGatherHostsStatus(t *testing.T) { if r.URL.Path == "/v1/objects/hosts" { w.WriteHeader(http.StatusOK) w.Header().Set("Content-Type", "application/json") - _, err := w.Write([]byte(icinga2HostResponse)) - require.NoError(t, err) + if _, err := w.Write([]byte(icinga2HostResponse)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) t.Logf("Req: %s %s\n", r.Host, r.URL.Path) @@ -192,8 +198,11 @@ func TestGatherStatusCIB(t *testing.T) { if r.URL.Path == "/v1/status/CIB" { w.WriteHeader(http.StatusOK) w.Header().Set("Content-Type", "application/json") - _, err := w.Write([]byte(icinga2StatusCIB)) - require.NoError(t, err) + if _, err := w.Write([]byte(icinga2StatusCIB)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) t.Logf("Req: %s %s\n", r.Host, r.URL.Path) @@ -262,8 +271,11 @@ func TestGatherStatusPgsql(t *testing.T) { if r.URL.Path == "/v1/status/IdoPgsqlConnection" { w.WriteHeader(http.StatusOK) w.Header().Set("Content-Type", "application/json") - _, err := w.Write([]byte(icinga2StatusPgsql)) - require.NoError(t, err) + if _, err := w.Write([]byte(icinga2StatusPgsql)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) t.Logf("Req: %s %s\n", r.Host, r.URL.Path) diff --git a/plugins/inputs/influxdb/influxdb_test.go b/plugins/inputs/influxdb/influxdb_test.go index 2df7f4b7f..ff324be6b 100644 --- a/plugins/inputs/influxdb/influxdb_test.go +++ b/plugins/inputs/influxdb/influxdb_test.go @@ -17,8 +17,11 @@ import ( func TestBasic(t *testing.T) { fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write([]byte(basicJSON)) - require.NoError(t, err) + if _, err := w.Write([]byte(basicJSON)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -68,8 +71,11 @@ func TestInfluxDB(t *testing.T) { fakeInfluxServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write(influxReturn) - require.NoError(t, err) + if _, err := w.Write(influxReturn); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -140,8 +146,11 @@ func TestInfluxDB2(t *testing.T) { fakeInfluxServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write(influxReturn2) - require.NoError(t, err) + if _, err := w.Write(influxReturn2); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -180,8 +189,11 @@ func TestCloud1(t *testing.T) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write(input) - require.NoError(t, err) + if _, err := w.Write(input); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -215,8 +227,11 @@ func TestCloud1(t *testing.T) { func TestErrorHandling(t *testing.T) { badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write([]byte("not json")) - require.NoError(t, err) + if _, err := w.Write([]byte("not json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -234,8 +249,11 @@ func TestErrorHandling(t *testing.T) { func TestErrorHandling404(t *testing.T) { badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write([]byte(basicJSON)) - require.NoError(t, err) + if _, err := w.Write([]byte(basicJSON)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -253,8 +271,11 @@ func TestErrorHandling404(t *testing.T) { func TestErrorResponse(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusUnauthorized) - _, err := w.Write([]byte(`{"error": "unable to parse authentication credentials"}`)) - require.NoError(t, err) + if _, err := w.Write([]byte(`{"error": "unable to parse authentication credentials"}`)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() diff --git a/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go b/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go index 632cb98fd..ee6fadc67 100644 --- a/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go +++ b/plugins/inputs/jolokia2_agent/jolokia2_agent_test.go @@ -628,8 +628,16 @@ func TestJolokia2_ClientAuthRequest(t *testing.T) { username, password, _ = r.BasicAuth() body, err := io.ReadAll(r.Body) - require.NoError(t, err) - require.NoError(t, json.Unmarshal(body, &requests)) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } + if err := json.Unmarshal(body, &requests); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } w.WriteHeader(http.StatusOK) })) diff --git a/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go b/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go index bf7ebe787..7adb318d0 100644 --- a/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go +++ b/plugins/inputs/jolokia2_proxy/jolokia2_proxy_test.go @@ -85,11 +85,24 @@ func TestJolokia2_ClientProxyAuthRequest(t *testing.T) { username, password, _ = r.BasicAuth() body, err := io.ReadAll(r.Body) - require.NoError(t, err) - require.NoError(t, json.Unmarshal(body, &requests)) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } + + if err := json.Unmarshal(body, &requests); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } + w.WriteHeader(http.StatusOK) - _, err = fmt.Fprintf(w, "[]") - require.NoError(t, err) + if _, err = fmt.Fprintf(w, "[]"); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer server.Close() diff --git a/plugins/inputs/kapacitor/kapacitor_test.go b/plugins/inputs/kapacitor/kapacitor_test.go index 6ca6e5f63..8591063ba 100644 --- a/plugins/inputs/kapacitor/kapacitor_test.go +++ b/plugins/inputs/kapacitor/kapacitor_test.go @@ -18,8 +18,11 @@ func TestKapacitor(t *testing.T) { fakeInfluxServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write(kapacitorReturn) - require.NoError(t, err) + if _, err := w.Write(kapacitorReturn); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } @@ -80,8 +83,11 @@ func TestKapacitor(t *testing.T) { func TestMissingStats(t *testing.T) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { - _, err := w.Write([]byte(`{}`)) - require.NoError(t, err) + if _, err := w.Write([]byte(`{}`)); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer server.Close() @@ -99,8 +105,11 @@ func TestMissingStats(t *testing.T) { func TestErrorHandling(t *testing.T) { badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/endpoint" { - _, err := w.Write([]byte("not json")) - require.NoError(t, err) + if _, err := w.Write([]byte("not json")); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } else { w.WriteHeader(http.StatusNotFound) } diff --git a/plugins/inputs/kubernetes/kubernetes_test.go b/plugins/inputs/kubernetes/kubernetes_test.go index fa770997c..e28a24c5b 100644 --- a/plugins/inputs/kubernetes/kubernetes_test.go +++ b/plugins/inputs/kubernetes/kubernetes_test.go @@ -15,13 +15,19 @@ func TestKubernetesStats(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.RequestURI == "/stats/summary" { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, responseStatsSummery) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, responseStatsSummery); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } if r.RequestURI == "/pods" { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, responsePods) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, responsePods); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } } })) defer ts.Close() diff --git a/plugins/inputs/logstash/logstash_test.go b/plugins/inputs/logstash/logstash_test.go index 1965f332a..607b4f2de 100644 --- a/plugins/inputs/logstash/logstash_test.go +++ b/plugins/inputs/logstash/logstash_test.go @@ -28,8 +28,11 @@ var ( func Test_Logstash5GatherProcessStats(test *testing.T) { fakeServer := httptest.NewUnstartedServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) { writer.Header().Set("Content-Type", "application/json") - _, err := fmt.Fprintf(writer, "%s", string(logstash5ProcessJSON)) - require.NoError(test, err) + if _, err := fmt.Fprintf(writer, "%s", logstash5ProcessJSON); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + test.Error(err) + return + } })) requestURL, err := url.Parse(logstashTest.URL) require.NoErrorf(test, err, "Can't connect to: %s", logstashTest.URL) @@ -73,8 +76,11 @@ func Test_Logstash5GatherProcessStats(test *testing.T) { func Test_Logstash6GatherProcessStats(test *testing.T) { fakeServer := httptest.NewUnstartedServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) { writer.Header().Set("Content-Type", "application/json") - _, err := fmt.Fprintf(writer, "%s", string(logstash6ProcessJSON)) - require.NoError(test, err) + if _, err := fmt.Fprintf(writer, "%s", logstash6ProcessJSON); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + test.Error(err) + return + } })) requestURL, err := url.Parse(logstashTest.URL) require.NoErrorf(test, err, "Can't connect to: %s", logstashTest.URL) @@ -119,8 +125,11 @@ func Test_Logstash5GatherPipelineStats(test *testing.T) { logstash5accPipelineStats.SetDebug(true) fakeServer := httptest.NewUnstartedServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) { writer.Header().Set("Content-Type", "application/json") - _, err := fmt.Fprintf(writer, "%s", string(logstash5PipelineJSON)) - require.NoError(test, err) + if _, err := fmt.Fprintf(writer, "%s", logstash5PipelineJSON); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + test.Error(err) + return + } })) requestURL, err := url.Parse(logstashTest.URL) require.NoErrorf(test, err, "Can't connect to: %s", logstashTest.URL) @@ -217,8 +226,11 @@ func Test_Logstash6GatherPipelinesStats(test *testing.T) { logstash6accPipelinesStats.SetDebug(true) fakeServer := httptest.NewUnstartedServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) { writer.Header().Set("Content-Type", "application/json") - _, err := fmt.Fprintf(writer, "%s", string(logstash6PipelinesJSON)) - require.NoError(test, err) + if _, err := fmt.Fprintf(writer, "%s", logstash6PipelinesJSON); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + test.Error(err) + return + } })) requestURL, err := url.Parse(logstashTest.URL) require.NoErrorf(test, err, "Can't connect to: %s", logstashTest.URL) @@ -559,8 +571,11 @@ func Test_Logstash6GatherPipelinesStats(test *testing.T) { func Test_Logstash5GatherJVMStats(test *testing.T) { fakeServer := httptest.NewUnstartedServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) { writer.Header().Set("Content-Type", "application/json") - _, err := fmt.Fprintf(writer, "%s", string(logstash5JvmJSON)) - require.NoError(test, err) + if _, err := fmt.Fprintf(writer, "%s", logstash5JvmJSON); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + test.Error(err) + return + } })) requestURL, err := url.Parse(logstashTest.URL) require.NoErrorf(test, err, "Can't connect to: %s", logstashTest.URL) @@ -623,8 +638,11 @@ func Test_Logstash5GatherJVMStats(test *testing.T) { func Test_Logstash6GatherJVMStats(test *testing.T) { fakeServer := httptest.NewUnstartedServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) { writer.Header().Set("Content-Type", "application/json") - _, err := fmt.Fprintf(writer, "%s", string(logstash6JvmJSON)) - require.NoError(test, err) + if _, err := fmt.Fprintf(writer, "%s", logstash6JvmJSON); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + test.Error(err) + return + } })) requestURL, err := url.Parse(logstashTest.URL) require.NoErrorf(test, err, "Can't connect to: %s", logstashTest.URL) diff --git a/plugins/inputs/mailchimp/mailchimp_test.go b/plugins/inputs/mailchimp/mailchimp_test.go index 6fbb3c7fc..3f18013c2 100644 --- a/plugins/inputs/mailchimp/mailchimp_test.go +++ b/plugins/inputs/mailchimp/mailchimp_test.go @@ -17,8 +17,11 @@ func TestMailChimpGatherReports(t *testing.T) { http.HandlerFunc( func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, sampleReports) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, sampleReports); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }, )) defer ts.Close() @@ -82,8 +85,11 @@ func TestMailChimpGatherReport(t *testing.T) { http.HandlerFunc( func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, sampleReport) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, sampleReport); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }, )) defer ts.Close() @@ -148,8 +154,11 @@ func TestMailChimpGatherError(t *testing.T) { http.HandlerFunc( func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, sampleError) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, sampleError); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } }, )) defer ts.Close() diff --git a/plugins/inputs/marklogic/marklogic_test.go b/plugins/inputs/marklogic/marklogic_test.go index 7c8eb7354..52641741d 100644 --- a/plugins/inputs/marklogic/marklogic_test.go +++ b/plugins/inputs/marklogic/marklogic_test.go @@ -16,8 +16,11 @@ func TestMarklogic(t *testing.T) { // Create a test server with the const response JSON ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusOK) - _, err := fmt.Fprintln(w, response) - require.NoError(t, err) + if _, err := fmt.Fprintln(w, response); err != nil { + w.WriteHeader(http.StatusInternalServerError) + t.Error(err) + return + } })) defer ts.Close() diff --git a/plugins/inputs/monit/monit_test.go b/plugins/inputs/monit/monit_test.go index 7538a997e..cf4d79ce6 100644 --- a/plugins/inputs/monit/monit_test.go +++ b/plugins/inputs/monit/monit_test.go @@ -591,7 +591,11 @@ func TestInvalidUsernameOrPassword(t *testing.T) { return } - require.Equal(t, "/_status", r.URL.Path, "Cannot handle request") + if r.URL.Path != "/_status" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "/_status", r.URL.Path) + return + } http.ServeFile(w, r, "testdata/response_servicetype_0.xml") })) @@ -618,7 +622,11 @@ func TestNoUsernameOrPasswordConfiguration(t *testing.T) { return } - require.Equal(t, "/_status", r.URL.Path, "Cannot handle request") + if r.URL.Path != "/_status" { + w.WriteHeader(http.StatusInternalServerError) + t.Errorf("Not equal, expected: %q, actual: %q", "/_status", r.URL.Path) + return + } http.ServeFile(w, r, "testdata/response_servicetype_0.xml") }))