From 6506eecc9b13e236ca0fc495a42ddd3babd9bc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20=C5=BBak?= Date: Mon, 12 Feb 2024 15:47:15 +0100 Subject: [PATCH] chore(linters): Bump golangci-lint to v1.56.0 (#14742) --- .circleci/config.yml | 6 +- .golangci.yml | 8 +- Makefile | 2 +- config/types_test.go | 4 +- plugins/inputs/burrow/burrow_test.go | 12 +-- plugins/inputs/cloudwatch/cloudwatch_test.go | 4 +- plugins/inputs/ecs/types_test.go | 1 + .../inputs/ipmi_sensor/ipmi_sensor_test.go | 2 +- plugins/inputs/opcua/opcua_test.go | 10 +-- plugins/inputs/statsd/statsd_test.go | 4 +- .../win_perf_counters_integration_test.go | 8 +- plugins/inputs/zfs/zfs_linux_test.go | 3 +- plugins/inputs/zipkin/codec/jsonV1/jsonV1.go | 2 +- .../outputs/stackdriver/stackdriver_test.go | 81 ++++++++++--------- plugins/outputs/timestream/timestream_test.go | 4 +- 15 files changed, 82 insertions(+), 69 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1025a6767..4ff607a7a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,7 +96,7 @@ jobs: - run: 'make check-deps' - run: name: "Install golangci-lint" - command: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2 + command: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0 - run: name: "golangci-lint/Linux" command: GOGC=80 GOMEMLIMIT=6656MiB /go/bin/golangci-lint run --verbose @@ -107,7 +107,7 @@ jobs: - check-changed-files-or-halt - run: name: "Install golangci-lint" - command: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2 + command: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0 - run: name: "golangci-lint/macOS" command: GOGC=80 GOMEMLIMIT=6656MiB GOOS=darwin /go/bin/golangci-lint run --verbose --timeout=30m @@ -119,7 +119,7 @@ jobs: - check-changed-files-or-halt - run: name: "Install golangci-lint" - command: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2 + command: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0 - run: name: "golangci-lint/Windows" command: GOGC=80 GOMEMLIMIT=6656MiB GOOS=windows /go/bin/golangci-lint run --verbose --timeout=30m diff --git a/.golangci.yml b/.golangci.yml index 9f5fa8a32..2646a36a3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -105,7 +105,6 @@ linters-settings: - nilValReturn - offBy1 - regexpPattern - - sloppyTestFuncName - sloppyReassign - sloppyTypeAssert - sortSlice @@ -277,6 +276,9 @@ linters-settings: # Default: false all: true testifylint: + # Disable all checkers (https://github.com/Antonboom/testifylint#checkers). + # Default: false + disable-all: true # Enable specific checkers. # https://github.com/Antonboom/testifylint#checkers # Default: ["bool-compare", "compares", "empty", "error-is-as", "error-nil", "expected-actual", "float-compare", "len", "require-error", "suite-dont-use-pkg", "suite-extra-assert-call"] @@ -317,6 +319,10 @@ run: skip-files: - plugins/parsers/influx/machine.go* + # Show statistics per linter. + # Default: false + show-stats: true + issues: # Maximum issues count per one linter. Set to 0 to disable. Default is 50. max-issues-per-linter: 0 diff --git a/Makefile b/Makefile index 0366c048c..ce774c188 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ vet: .PHONY: lint-install lint-install: @echo "Installing golangci-lint" - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2 + go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0 @echo "Installing markdownlint" npm install -g markdownlint-cli diff --git a/config/types_test.go b/config/types_test.go index f66dc9b02..813d71ab2 100644 --- a/config/types_test.go +++ b/config/types_test.go @@ -27,8 +27,8 @@ func TestConfigDuration(t *testing.T) { require.NoError(t, err) require.Len(t, c.Processors, 1) 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.EqualValues(t, 3*time.Hour, p.CacheTTL) + require.EqualValues(t, 17*time.Second, p.LookupTimeout) require.Equal(t, 13, p.MaxParallelLookups) require.True(t, p.Ordered) } diff --git a/plugins/inputs/burrow/burrow_test.go b/plugins/inputs/burrow/burrow_test.go index 5b4779fd8..c00e354a1 100644 --- a/plugins/inputs/burrow/burrow_test.go +++ b/plugins/inputs/burrow/burrow_test.go @@ -191,7 +191,7 @@ func TestMultipleServers(t *testing.T) { acc := &testutil.Accumulator{} require.NoError(t, plugin.Gather(acc)) - require.Exactly(t, 14, len(acc.Metrics)) + require.Len(t, acc.Metrics, 14) require.Empty(t, acc.Errors) } @@ -207,7 +207,7 @@ func TestMultipleRuns(t *testing.T) { acc := &testutil.Accumulator{} require.NoError(t, plugin.Gather(acc)) - require.Exactly(t, 7, len(acc.Metrics)) + require.Len(t, acc.Metrics, 7) require.Empty(t, acc.Errors) } } @@ -226,7 +226,7 @@ func TestBasicAuthConfig(t *testing.T) { acc := &testutil.Accumulator{} require.NoError(t, plugin.Gather(acc)) - require.Exactly(t, 7, len(acc.Metrics)) + require.Len(t, acc.Metrics, 7) require.Empty(t, acc.Errors) } @@ -244,7 +244,7 @@ func TestFilterClusters(t *testing.T) { require.NoError(t, plugin.Gather(acc)) // no match by cluster - require.Exactly(t, 0, len(acc.Metrics)) + require.Empty(t, acc.Metrics) require.Empty(t, acc.Errors) } @@ -262,7 +262,7 @@ func TestFilterGroups(t *testing.T) { acc := &testutil.Accumulator{} require.NoError(t, plugin.Gather(acc)) - require.Exactly(t, 1, len(acc.Metrics)) + require.Len(t, acc.Metrics, 1) require.Empty(t, acc.Errors) } @@ -280,6 +280,6 @@ func TestFilterTopics(t *testing.T) { acc := &testutil.Accumulator{} require.NoError(t, plugin.Gather(acc)) - require.Exactly(t, 3, len(acc.Metrics)) + require.Len(t, acc.Metrics, 3) require.Empty(t, acc.Errors) } diff --git a/plugins/inputs/cloudwatch/cloudwatch_test.go b/plugins/inputs/cloudwatch/cloudwatch_test.go index 831d83a90..7a5d5f212 100644 --- a/plugins/inputs/cloudwatch/cloudwatch_test.go +++ b/plugins/inputs/cloudwatch/cloudwatch_test.go @@ -400,7 +400,7 @@ func TestGenerateStatisticsInputParams(t *testing.T) { require.EqualValues(t, *params.StartTime, now.Add(-time.Duration(c.Period)).Add(-time.Duration(c.Delay))) require.Len(t, params.MetricDataQueries, 5) require.Len(t, params.MetricDataQueries[0].MetricStat.Metric.Dimensions, 1) - require.EqualValues(t, *params.MetricDataQueries[0].MetricStat.Period, 60) + require.EqualValues(t, 60, *params.MetricDataQueries[0].MetricStat.Period) } func TestGenerateStatisticsInputParamsFiltered(t *testing.T) { @@ -441,7 +441,7 @@ func TestGenerateStatisticsInputParamsFiltered(t *testing.T) { require.EqualValues(t, *params.StartTime, now.Add(-time.Duration(c.Period)).Add(-time.Duration(c.Delay))) require.Len(t, params.MetricDataQueries, 2) require.Len(t, params.MetricDataQueries[0].MetricStat.Metric.Dimensions, 1) - require.EqualValues(t, *params.MetricDataQueries[0].MetricStat.Period, 60) + require.EqualValues(t, 60, *params.MetricDataQueries[0].MetricStat.Period) } func TestMetricsCacheTimeout(t *testing.T) { diff --git a/plugins/inputs/ecs/types_test.go b/plugins/inputs/ecs/types_test.go index 63aac0b3f..083728e10 100644 --- a/plugins/inputs/ecs/types_test.go +++ b/plugins/inputs/ecs/types_test.go @@ -42,6 +42,7 @@ func Test_mergeTaskStats(t *testing.T) { mergeTaskStats(parsedMetadata, parsedStats) for i := range parsedMetadata.Containers { + //nolint:testifylint // values are in proper order (expected, actual) require.Equal(t, validStats[parsedMetadata.Containers[i].ID], &parsedMetadata.Containers[i].Stats) } } diff --git a/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go b/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go index b5662f0c4..77bed9ddc 100644 --- a/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go +++ b/plugins/inputs/ipmi_sensor/ipmi_sensor_test.go @@ -30,7 +30,7 @@ func TestGather(t *testing.T) { require.NoError(t, i.Init()) require.NoError(t, acc.GatherError(i.Gather)) - require.EqualValues(t, acc.NFields(), 262, "non-numeric measurements should be ignored") + require.EqualValues(t, 262, acc.NFields(), "non-numeric measurements should be ignored") conn := NewConnection(i.Servers[0], i.Privilege, i.HexKey) require.EqualValues(t, "USERID", conn.Username) diff --git a/plugins/inputs/opcua/opcua_test.go b/plugins/inputs/opcua/opcua_test.go index 1926e5698..bebedc76b 100644 --- a/plugins/inputs/opcua/opcua_test.go +++ b/plugins/inputs/opcua/opcua_test.go @@ -432,9 +432,9 @@ use_unregistered_reads = true err = o.Init() require.NoError(t, err) require.Len(t, o.client.NodeMetricMapping, 5, "incorrect number of nodes") - require.EqualValues(t, o.client.NodeMetricMapping[0].MetricTags, map[string]string{"tag0": "val0"}) - require.EqualValues(t, o.client.NodeMetricMapping[1].MetricTags, map[string]string{"tag6": "val6"}) - require.EqualValues(t, o.client.NodeMetricMapping[2].MetricTags, map[string]string{"tag1": "val1", "tag2": "val2", "tag3": "val3"}) - require.EqualValues(t, o.client.NodeMetricMapping[3].MetricTags, map[string]string{"tag1": "override", "tag2": "val2"}) - require.EqualValues(t, o.client.NodeMetricMapping[4].MetricTags, map[string]string{"tag1": "val1", "tag2": "val2"}) + require.EqualValues(t, map[string]string{"tag0": "val0"}, o.client.NodeMetricMapping[0].MetricTags) + require.EqualValues(t, map[string]string{"tag6": "val6"}, o.client.NodeMetricMapping[1].MetricTags) + require.EqualValues(t, map[string]string{"tag1": "val1", "tag2": "val2", "tag3": "val3"}, o.client.NodeMetricMapping[2].MetricTags) + require.EqualValues(t, map[string]string{"tag1": "override", "tag2": "val2"}, o.client.NodeMetricMapping[3].MetricTags) + require.EqualValues(t, map[string]string{"tag1": "val1", "tag2": "val2"}, o.client.NodeMetricMapping[4].MetricTags) } diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go index cbf67d7b7..7fe6f892e 100644 --- a/plugins/inputs/statsd/statsd_test.go +++ b/plugins/inputs/statsd/statsd_test.go @@ -1290,9 +1290,9 @@ func TestParse_MeasurementsWithMultipleValues(t *testing.T) { // A 0 with invalid samplerate will add a single 0, // plus the last bit of value 1 // which adds up to 12 individual datapoints to be cached - require.EqualValuesf(t, cachedtiming.fields[defaultFieldName].n, 12, "Expected 12 additions, got %d", cachedtiming.fields[defaultFieldName].n) + require.EqualValuesf(t, 12, cachedtiming.fields[defaultFieldName].n, "Expected 12 additions, got %d", cachedtiming.fields[defaultFieldName].n) - require.EqualValuesf(t, cachedtiming.fields[defaultFieldName].upper, 1, "Expected max input to be 1, got %f", cachedtiming.fields[defaultFieldName].upper) + require.EqualValuesf(t, 1, cachedtiming.fields[defaultFieldName].upper, "Expected max input to be 1, got %f", cachedtiming.fields[defaultFieldName].upper) // test if sSingle and sMultiple did compute the same stats for valid.multiple.duplicate require.NoError(t, testValidateSet("valid_multiple_duplicate", 2, sSingle.sets)) diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go index b08576163..7ad2c2350 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go +++ b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go @@ -77,13 +77,13 @@ func TestWinPerformanceQueryImplIntegration(t *testing.T) { paths, err := query.ExpandWildCardPath(counterPath) require.NoError(t, err) require.NotNil(t, paths) - require.Greater(t, len(paths), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6 + require.Greater(t, len(paths), 1) counterPath = "\\Process(_Total)\\*" paths, err = query.ExpandWildCardPath(counterPath) require.NoError(t, err) require.NotNil(t, paths) - require.Greater(t, len(paths), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6 + require.Greater(t, len(paths), 1) require.NoError(t, query.Open()) @@ -572,7 +572,7 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) { time.Sleep(2000 * time.Millisecond) require.NoError(t, m.Gather(&acc)) - require.Greater(t, len(acc.Metrics), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6 + require.Greater(t, len(acc.Metrics), 1) expectedCounter := "Percent_Idle_Time_Raw" for _, metric := range acc.Metrics { @@ -597,7 +597,7 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) { time.Sleep(2000 * time.Millisecond) require.NoError(t, m.Gather(&acc2)) - require.Greater(t, len(acc2.Metrics), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6 + require.Greater(t, len(acc2.Metrics), 1) for _, metric := range acc2.Metrics { val, ok := metric.Fields[expectedCounter] diff --git a/plugins/inputs/zfs/zfs_linux_test.go b/plugins/inputs/zfs/zfs_linux_test.go index ee45c45f4..fc97d8e86 100644 --- a/plugins/inputs/zfs/zfs_linux_test.go +++ b/plugins/inputs/zfs/zfs_linux_test.go @@ -3,7 +3,6 @@ package zfs import ( - "fmt" "os" "testing" @@ -391,7 +390,7 @@ func TestGetTags(t *testing.T) { } for _, tc := range tests { - t.Run(fmt.Sprintf(tc.name), func(t *testing.T) { + t.Run(tc.name, func(t *testing.T) { tags := getTags(tc.pools) require.Equal(t, tc.expected, tags) }) diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go index eaec42304..1fd08138b 100644 --- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go +++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go @@ -235,7 +235,7 @@ func TraceIDFromString(s string) (string, error) { } } if hi == 0 { - return fmt.Sprintf("%x", lo), nil + return strconv.FormatUint(lo, 16), nil } return fmt.Sprintf("%x%016x", hi, lo), nil } diff --git a/plugins/outputs/stackdriver/stackdriver_test.go b/plugins/outputs/stackdriver/stackdriver_test.go index e5ea6ec2f..bfa1912b4 100644 --- a/plugins/outputs/stackdriver/stackdriver_test.go +++ b/plugins/outputs/stackdriver/stackdriver_test.go @@ -401,31 +401,34 @@ func TestWriteAscendingTime(t *testing.T) { require.Len(t, request.TimeSeries, 1) ts := request.TimeSeries[0] require.Len(t, ts.Points, 1) - require.Equal(t, ts.Points[0].Interval, &monitoringpb.TimeInterval{ - EndTime: ×tamppb.Timestamp{ - Seconds: 1, - }, - }) - require.Equal(t, ts.Points[0].Value, &monitoringpb.TypedValue{ - Value: &monitoringpb.TypedValue_Int64Value{ - Int64Value: int64(43), - }, - }) + require.Equal(t, + &monitoringpb.TimeInterval{ + EndTime: ×tamppb.Timestamp{ + Seconds: 1, + }, + }, ts.Points[0].Interval) + require.Equal(t, + &monitoringpb.TypedValue{ + Value: &monitoringpb.TypedValue_Int64Value{ + Int64Value: int64(43), + }, + }, ts.Points[0].Value) request = mockMetric.reqs[1].(*monitoringpb.CreateTimeSeriesRequest) require.Len(t, request.TimeSeries, 1) ts = request.TimeSeries[0] require.Len(t, ts.Points, 1) - require.Equal(t, ts.Points[0].Interval, &monitoringpb.TimeInterval{ - EndTime: ×tamppb.Timestamp{ - Seconds: 2, - }, - }) - require.Equal(t, ts.Points[0].Value, &monitoringpb.TypedValue{ + require.Equal(t, + &monitoringpb.TimeInterval{ + EndTime: ×tamppb.Timestamp{ + Seconds: 2, + }, + }, ts.Points[0].Interval) + require.Equal(t, &monitoringpb.TypedValue{ Value: &monitoringpb.TypedValue_Int64Value{ Int64Value: int64(42), }, - }) + }, ts.Points[0].Value) } func TestWriteBatchable(t *testing.T) { @@ -534,29 +537,33 @@ func TestWriteBatchable(t *testing.T) { require.Len(t, request.TimeSeries, 2) ts := request.TimeSeries[0] require.Len(t, ts.Points, 1) - require.Equal(t, ts.Points[0].Interval, &monitoringpb.TimeInterval{ - EndTime: ×tamppb.Timestamp{ - Seconds: 1, - }, - }) - require.Equal(t, ts.Points[0].Value, &monitoringpb.TypedValue{ - Value: &monitoringpb.TypedValue_Int64Value{ - Int64Value: int64(43), - }, - }) + require.Equal(t, + &monitoringpb.TimeInterval{ + EndTime: ×tamppb.Timestamp{ + Seconds: 1, + }, + }, ts.Points[0].Interval) + require.Equal(t, + &monitoringpb.TypedValue{ + Value: &monitoringpb.TypedValue_Int64Value{ + Int64Value: int64(43), + }, + }, ts.Points[0].Value) ts = request.TimeSeries[1] require.Len(t, ts.Points, 1) - require.Equal(t, ts.Points[0].Interval, &monitoringpb.TimeInterval{ - EndTime: ×tamppb.Timestamp{ - Seconds: 1, - }, - }) - require.Equal(t, ts.Points[0].Value, &monitoringpb.TypedValue{ - Value: &monitoringpb.TypedValue_Int64Value{ - Int64Value: int64(43), - }, - }) + require.Equal(t, + &monitoringpb.TimeInterval{ + EndTime: ×tamppb.Timestamp{ + Seconds: 1, + }, + }, ts.Points[0].Interval) + require.Equal(t, + &monitoringpb.TypedValue{ + Value: &monitoringpb.TypedValue_Int64Value{ + Int64Value: int64(43), + }, + }, ts.Points[0].Value) // Request 2 with 1 time series request = mockMetric.reqs[1].(*monitoringpb.CreateTimeSeriesRequest) diff --git a/plugins/outputs/timestream/timestream_test.go b/plugins/outputs/timestream/timestream_test.go index 5f2dc755e..99b4e663e 100644 --- a/plugins/outputs/timestream/timestream_test.go +++ b/plugins/outputs/timestream/timestream_test.go @@ -419,7 +419,7 @@ func TestBuildMultiMeasuresInSingleAndMultiTableMode(t *testing.T) { result := plugin.TransformMetrics([]telegraf.Metric{input1, input2, input3, input4, input5, input6}) require.Len(t, result, 1, "Expected 1 WriteRecordsInput requests") - require.EqualValues(t, result[0], expectedResultMultiTable) + require.EqualValues(t, expectedResultMultiTable, result[0]) require.True(t, arrayContains(result, expectedResultMultiTable), "Expected that the list of requests to Timestream: %+v\n "+ "will contain request: %+v\n\n", result, expectedResultMultiTable) @@ -444,7 +444,7 @@ func TestBuildMultiMeasuresInSingleAndMultiTableMode(t *testing.T) { result = plugin.TransformMetrics([]telegraf.Metric{input1, input2, input3, input4, input5, input6}) require.Len(t, result, 1, "Expected 1 WriteRecordsInput requests") - require.EqualValues(t, result[0], expectedResultSingleTable) + require.EqualValues(t, expectedResultSingleTable, result[0]) require.True(t, arrayContains(result, expectedResultSingleTable), "Expected that the list of requests to Timestream: %+v\n "+ "will contain request: %+v\n\n", result, expectedResultSingleTable)