chore(linters): Fix findings found by testifylint: expected-actual (#…

…14229)

(cherry picked from commit 8fbea28)

config/types_test.go

@@ -29,7 +29,7 @@ func TestConfigDuration(t *testing.T) {
 	p := c.Processors[0].Processor.(*reverse_dns.ReverseDNS)
 	require.EqualValues(t, p.CacheTTL, 3*time.Hour)
 	require.EqualValues(t, p.LookupTimeout, 17*time.Second)
-	require.Equal(t, p.MaxParallelLookups, 13)
+	require.Equal(t, 13, p.MaxParallelLookups)
 	require.True(t, p.Ordered)
 }
 

plugins/common/opcua/input/input_client_test.go

@@ -7,20 +7,21 @@ import (
 	"time"
 
 	"github.com/gopcua/opcua/ua"
+	"github.com/stretchr/testify/require"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/common/opcua"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
 )
 
 func TestTagsSliceToMap(t *testing.T) {
 	m, err := tagsSliceToMap([][]string{{"foo", "bar"}, {"baz", "bat"}})
 	require.NoError(t, err)
 	require.Len(t, m, 2)
-	require.Equal(t, m["foo"], "bar")
-	require.Equal(t, m["baz"], "bat")
+	require.Equal(t, "bar", m["foo"])
+	require.Equal(t, "bat", m["baz"])
 }
 
 func TestTagsSliceToMap_twoStrings(t *testing.T) {
@@ -316,7 +317,7 @@ func TestNewNodeMetricMappingIdStrInstantiated(t *testing.T) {
 		TagsSlice:      [][]string{},
 	}, map[string]string{})
 	require.NoError(t, err)
-	require.Equal(t, nmm.idStr, "ns=2;s=h")
+	require.Equal(t, "ns=2;s=h", nmm.idStr)
 }
 
 func TestValidateNodeToAdd(t *testing.T) {

plugins/inputs/beat/beat_test.go

@@ -9,8 +9,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
+
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func Test_BeatStats(t *testing.T) {
@@ -177,10 +178,10 @@ func Test_BeatRequest(t *testing.T) {
 
 		data, err := os.ReadFile(jsonFilePath)
 		require.NoErrorf(t, err, "could not read from data file %s", jsonFilePath)
-		require.Equal(t, request.Host, "beat.test.local")
-		require.Equal(t, request.Method, "POST")
-		require.Equal(t, request.Header.Get("Authorization"), "Basic YWRtaW46UFdE")
-		require.Equal(t, request.Header.Get("X-Test"), "test-value")
+		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")

plugins/inputs/ceph/ceph_test.go

@@ -25,7 +25,7 @@ type expectedResult struct {
 
 func TestParseSockId(t *testing.T) {
 	s := parseSockID(sockFile(osdPrefix, 1), osdPrefix, sockSuffix)
-	require.Equal(t, s, "1")
+	require.Equal(t, "1", s)
 }
 
 func TestParseMonDump(t *testing.T) {

plugins/inputs/cisco_telemetry_mdt/cisco_telemetry_mdt_test.go

@@ -1005,7 +1005,7 @@ func TestTCPDialoutMultiple(t *testing.T) {
 	require.NoError(t, conn.Close())
 
 	// We use the invalid dialout flags to let the server close the connection
-	require.Equal(t, acc.Errors, []error{errors.New("invalid dialout flags: 257"), errors.New("invalid dialout flags: 257")})
+	require.Equal(t, []error{errors.New("invalid dialout flags: 257"), errors.New("invalid dialout flags: 257")}, acc.Errors)
 
 	tags := map[string]string{
 		"path":         "type:model/some/path",
@@ -1060,7 +1060,7 @@ func TestGRPCDialoutError(t *testing.T) {
 	require.True(t, err == nil || errors.Is(err, io.EOF))
 	c.Stop()
 
-	require.Equal(t, acc.Errors, []error{errors.New("GRPC dialout error: foobar")})
+	require.Equal(t, []error{errors.New("GRPC dialout error: foobar")}, acc.Errors)
 }
 
 func TestGRPCDialoutMultiple(t *testing.T) {
@@ -1119,7 +1119,7 @@ func TestGRPCDialoutMultiple(t *testing.T) {
 	c.Stop()
 	require.NoError(t, conn.Close())
 
-	require.Equal(t, acc.Errors, []error{errors.New("GRPC dialout error: testclose"), errors.New("GRPC dialout error: testclose")})
+	require.Equal(t, []error{errors.New("GRPC dialout error: testclose"), errors.New("GRPC dialout error: testclose")}, acc.Errors)
 
 	tags := map[string]string{
 		"path":         "type:model/some/path",

plugins/inputs/cloud_pubsub/cloud_pubsub_test.go

@@ -56,7 +56,7 @@ func TestRunParse(t *testing.T) {
 	sub.messages <- msg
 
 	acc.Wait(1)
-	require.Equal(t, acc.NFields(), 1)
+	require.Equal(t, 1, acc.NFields())
 	metric := acc.Metrics[0]
 	validateTestInfluxMetric(t, metric)
 }
@@ -102,7 +102,7 @@ func TestRunBase64(t *testing.T) {
 	sub.messages <- msg
 
 	acc.Wait(1)
-	require.Equal(t, acc.NFields(), 1)
+	require.Equal(t, 1, acc.NFields())
 	metric := acc.Metrics[0]
 	validateTestInfluxMetric(t, metric)
 }
@@ -151,7 +151,7 @@ func TestRunGzipDecode(t *testing.T) {
 	}
 	sub.messages <- msg
 	acc.Wait(1)
-	require.Equal(t, acc.NFields(), 1)
+	require.Equal(t, 1, acc.NFields())
 	metric := acc.Metrics[0]
 	validateTestInfluxMetric(t, metric)
 }
@@ -200,7 +200,7 @@ func TestRunInvalidMessages(t *testing.T) {
 	// Make sure we acknowledged message so we don't receive it again.
 	testTracker.WaitForAck(1)
 
-	require.Equal(t, acc.NFields(), 0)
+	require.Equal(t, 0, acc.NFields())
 }
 
 func TestRunOverlongMessages(t *testing.T) {
@@ -249,7 +249,7 @@ func TestRunOverlongMessages(t *testing.T) {
 	// Make sure we acknowledged message so we don't receive it again.
 	testTracker.WaitForAck(1)
 
-	require.Equal(t, acc.NFields(), 0)
+	require.Equal(t, 0, acc.NFields())
 }
 
 func TestRunErrorInSubscriber(t *testing.T) {

plugins/inputs/exec/exec_test.go

@@ -98,7 +98,7 @@ func TestExec(t *testing.T) {
 	var acc testutil.Accumulator
 	err := acc.GatherError(e.Gather)
 	require.NoError(t, err)
-	require.Equal(t, acc.NFields(), 8, "non-numeric measurements should be ignored")
+	require.Equal(t, 8, acc.NFields(), "non-numeric measurements should be ignored")
 
 	fields := map[string]interface{}{
 		"num_processes": float64(82),
@@ -125,7 +125,7 @@ func TestExecMalformed(t *testing.T) {
 
 	var acc testutil.Accumulator
 	require.Error(t, acc.GatherError(e.Gather))
-	require.Equal(t, acc.NFields(), 0, "No new points should have been added")
+	require.Equal(t, 0, acc.NFields(), "No new points should have been added")
 }
 
 func TestCommandError(t *testing.T) {
@@ -140,7 +140,7 @@ func TestCommandError(t *testing.T) {
 
 	var acc testutil.Accumulator
 	require.Error(t, acc.GatherError(e.Gather))
-	require.Equal(t, acc.NFields(), 0, "No new points should have been added")
+	require.Equal(t, 0, acc.NFields(), "No new points should have been added")
 }
 
 func TestExecCommandWithGlob(t *testing.T) {

plugins/inputs/hddtemp/hddtemp_test.go

@@ -43,7 +43,7 @@ func TestFetch(t *testing.T) {
 	err := hddTemp.Gather(acc)
 
 	require.NoError(t, err)
-	require.Equal(t, acc.NFields(), 2)
+	require.Equal(t, 2, acc.NFields())
 
 	var tests = []struct {
 		fields map[string]interface{}

plugins/inputs/http/http_test.go

@@ -56,7 +56,7 @@ func TestHTTPWithJSONFormat(t *testing.T) {
 	var metric = acc.Metrics[0]
 	require.Equal(t, metric.Measurement, metricName)
 	require.Len(t, acc.Metrics[0].Fields, 1)
-	require.Equal(t, acc.Metrics[0].Fields["a"], 1.2)
+	require.Equal(t, 1.2, acc.Metrics[0].Fields["a"])
 	require.Equal(t, acc.Metrics[0].Tags["url"], address)
 }
 
@@ -277,7 +277,7 @@ func TestBodyAndContentEncoding(t *testing.T) {
 				Log:             testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
-				require.Equal(t, r.Header.Get("Content-Encoding"), "gzip")
+				require.Equal(t, "gzip", r.Header.Get("Content-Encoding"))
 
 				gr, err := gzip.NewReader(r.Body)
 				require.NoError(t, err)

plugins/inputs/internal/internal_test.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/influxdata/telegraf/selfstat"
 	"github.com/influxdata/telegraf/testutil"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestSelfPlugin(t *testing.T) {
@@ -100,7 +100,7 @@ func TestGostats(t *testing.T) {
 	}
 
 	require.NotNil(t, metric)
-	require.Equal(t, metric.Measurement, "internal_gostats")
+	require.Equal(t, "internal_gostats", metric.Measurement)
 	require.Len(t, metric.Tags, 1)
 	require.Contains(t, metric.Tags, "go_version")
 

plugins/inputs/kafka_consumer/kafka_consumer_test.go

@@ -70,11 +70,11 @@ func TestInit(t *testing.T) {
 			name:   "default config",
 			plugin: &KafkaConsumer{},
 			check: func(t *testing.T, plugin *KafkaConsumer) {
-				require.Equal(t, plugin.ConsumerGroup, defaultConsumerGroup)
-				require.Equal(t, plugin.MaxUndeliveredMessages, defaultMaxUndeliveredMessages)
-				require.Equal(t, plugin.config.ClientID, "Telegraf")
-				require.Equal(t, plugin.config.Consumer.Offsets.Initial, sarama.OffsetOldest)
-				require.Equal(t, plugin.config.Consumer.MaxProcessingTime, 100*time.Millisecond)
+				require.Equal(t, defaultConsumerGroup, plugin.ConsumerGroup)
+				require.Equal(t, defaultMaxUndeliveredMessages, plugin.MaxUndeliveredMessages)
+				require.Equal(t, "Telegraf", plugin.config.ClientID)
+				require.Equal(t, sarama.OffsetOldest, plugin.config.Consumer.Offsets.Initial)
+				require.Equal(t, 100*time.Millisecond, plugin.config.Consumer.MaxProcessingTime)
 			},
 		},
 		{
@@ -114,7 +114,7 @@ func TestInit(t *testing.T) {
 				Log: testutil.Logger{},
 			},
 			check: func(t *testing.T, plugin *KafkaConsumer) {
-				require.Equal(t, plugin.config.ClientID, "custom")
+				require.Equal(t, "custom", plugin.config.ClientID)
 			},
 		},
 		{
@@ -124,7 +124,7 @@ func TestInit(t *testing.T) {
 				Log:    testutil.Logger{},
 			},
 			check: func(t *testing.T, plugin *KafkaConsumer) {
-				require.Equal(t, plugin.config.Consumer.Offsets.Initial, sarama.OffsetNewest)
+				require.Equal(t, sarama.OffsetNewest, plugin.config.Consumer.Offsets.Initial)
 			},
 		},
 		{
@@ -197,7 +197,7 @@ func TestInit(t *testing.T) {
 				Log:               testutil.Logger{},
 			},
 			check: func(t *testing.T, plugin *KafkaConsumer) {
-				require.Equal(t, plugin.config.Consumer.MaxProcessingTime, 1000*time.Millisecond)
+				require.Equal(t, 1000*time.Millisecond, plugin.config.Consumer.MaxProcessingTime)
 			},
 		},
 	}

plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go

@@ -5,13 +5,12 @@ import (
 	"testing"
 
 	"github.com/Shopify/sarama"
+	"github.com/stretchr/testify/require"
 
 	"github.com/influxdata/telegraf/plugins/parsers/graphite"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/plugins/parsers/json"
 	"github.com/influxdata/telegraf/testutil"
-
-	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -52,7 +51,7 @@ func TestRunParser(t *testing.T) {
 	in <- saramaMsg(testMsg)
 	acc.Wait(1)
 
-	require.Equal(t, acc.NFields(), 1)
+	require.Equal(t, 1, acc.NFields())
 }
 
 // Test that the parser ignores invalid messages
@@ -70,7 +69,7 @@ func TestRunParserInvalidMsg(t *testing.T) {
 	in <- saramaMsg(invalidMsg)
 	acc.WaitError(1)
 
-	require.Equal(t, acc.NFields(), 0)
+	require.Equal(t, 0, acc.NFields())
 }
 
 // Test that overlong messages are dropped
@@ -87,7 +86,7 @@ func TestDropOverlongMsg(t *testing.T) {
 	in <- saramaMsg(overlongMsg)
 	acc.WaitError(1)
 
-	require.Equal(t, acc.NFields(), 0)
+	require.Equal(t, 0, acc.NFields())
 }
 
 // Test that the parser parses kafka messages into points
@@ -107,7 +106,7 @@ func TestRunParserAndGather(t *testing.T) {
 
 	require.NoError(t, acc.GatherError(k.Gather))
 
-	require.Equal(t, acc.NFields(), 1)
+	require.Equal(t, 1, acc.NFields())
 	acc.AssertContainsFields(t, "cpu_load_short",
 		map[string]interface{}{"value": float64(23422)})
 }
@@ -128,7 +127,7 @@ func TestRunParserAndGatherGraphite(t *testing.T) {
 
 	require.NoError(t, acc.GatherError(k.Gather))
 
-	require.Equal(t, acc.NFields(), 1)
+	require.Equal(t, 1, acc.NFields())
 	acc.AssertContainsFields(t, "cpu_load_short_graphite",
 		map[string]interface{}{"value": float64(23422)})
 }
@@ -151,7 +150,7 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 
 	require.NoError(t, acc.GatherError(k.Gather))
 
-	require.Equal(t, acc.NFields(), 2)
+	require.Equal(t, 2, acc.NFields())
 	acc.AssertContainsFields(t, "kafka_json_test",
 		map[string]interface{}{
 			"a":   float64(5),

plugins/inputs/libvirt/libvirt_test.go

@@ -299,7 +299,7 @@ func TestLibvirt_calculateMetricNumber(t *testing.T) {
 		}
 		err := l.calculateMetricNumber()
 		require.NoError(t, err)
-		require.Equal(t, l.metricNumber, domainStatsAll)
+		require.Equal(t, domainStatsAll, l.metricNumber)
 	})
 }
 

plugins/inputs/logparser/logparser_test.go

@@ -136,7 +136,7 @@ func TestGrokParseLogFilesAppearLater(t *testing.T) {
 	acc := testutil.Accumulator{}
 	require.NoError(t, logparser.Start(&acc))
 
-	require.Equal(t, acc.NFields(), 0)
+	require.Equal(t, 0, acc.NFields())
 
 	input, err := os.ReadFile(filepath.Join(testdataDir, "test_a.log"))
 	require.NoError(t, err)

plugins/inputs/mesos/mesos_test.go

@@ -416,14 +416,14 @@ func TestWithPathDoesNotModify(t *testing.T) {
 	u, err := url.Parse("http://localhost:5051")
 	require.NoError(t, err)
 	v := withPath(u, "/xyzzy")
-	require.Equal(t, u.String(), "http://localhost:5051")
-	require.Equal(t, v.String(), "http://localhost:5051/xyzzy")
+	require.Equal(t, "http://localhost:5051", u.String())
+	require.Equal(t, "http://localhost:5051/xyzzy", v.String())
 }
 
 func TestURLTagDoesNotModify(t *testing.T) {
 	u, err := url.Parse("http://a:b@localhost:5051?timeout=1ms")
 	require.NoError(t, err)
 	v := urlTag(u)
-	require.Equal(t, u.String(), "http://a:b@localhost:5051?timeout=1ms")
-	require.Equal(t, v, "http://localhost:5051")
+	require.Equal(t, "http://a:b@localhost:5051?timeout=1ms", u.String())
+	require.Equal(t, "http://localhost:5051", v)
 }

plugins/inputs/modbus/modbus_test.go

@@ -293,7 +293,7 @@ func TestRetryFailIllegal(t *testing.T) {
 	require.NoError(t, modbus.Gather(&acc))
 	require.Len(t, acc.Errors, 1)
 	require.EqualError(t, acc.FirstError(), "slave 1: modbus: exception '1' (illegal function), function '129'")
-	require.Equal(t, counter, 1)
+	require.Equal(t, 1, counter)
 }
 
 func TestCases(t *testing.T) {

plugins/inputs/mongodb/mongodb_data_test.go

@@ -329,7 +329,7 @@ func TestAddShardHostStats(t *testing.T) {
 	}
 	sort.Strings(hostsFound)
 	sort.Strings(expectedHosts)
-	require.Equal(t, hostsFound, expectedHosts)
+	require.Equal(t, expectedHosts, hostsFound)
 }
 
 func TestStateTag(t *testing.T) {