chore: Fix linter findings for revive:enforce-slice-style in `plugi…

…ns/inputs/[e-j]*` (influxdata#16088)
s-r-engineer · Nov 11, 2024 · e49f171 · e49f171
1 parent 03af908
commit e49f171
Show file tree

Hide file tree

Showing 25 changed files with 62 additions and 94 deletions.
diff --git a/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go b/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go
@@ -331,7 +331,6 @@ var testEsAggregationData = []esAggregationQueryTest{
 			FilterQuery:     "response: 200",
 			DateField:       "@timestamp",
 			QueryPeriod:     queryPeriod,
-			Tags:            []string{},
 			mapMetricFields: map[string]string{},
 		},
 		nil,
@@ -357,7 +356,6 @@ var testEsAggregationData = []esAggregationQueryTest{
 			MetricFunction:  "max",
 			DateField:       "@timestamp",
 			QueryPeriod:     queryPeriod,
-			Tags:            []string{},
 			mapMetricFields: map[string]string{"size": "long"},
 		},
 		[]aggregationQueryData{
@@ -388,7 +386,6 @@ var testEsAggregationData = []esAggregationQueryTest{
 			MetricFunction:  "average",
 			DateField:       "@timestamp",
 			QueryPeriod:     queryPeriod,
-			Tags:            []string{},
 			mapMetricFields: map[string]string{"size": "long"},
 		},
 		nil,
@@ -405,7 +402,6 @@ var testEsAggregationData = []esAggregationQueryTest{
 			MetricFields:    []string{"none"},
 			DateField:       "@timestamp",
 			QueryPeriod:     queryPeriod,
-			Tags:            []string{},
 			mapMetricFields: map[string]string{},
 		},
 		nil,
@@ -421,7 +417,6 @@ var testEsAggregationData = []esAggregationQueryTest{
 			MeasurementName: "measurement11",
 			DateField:       "@timestamp",
 			QueryPeriod:     queryPeriod,
-			Tags:            []string{},
 			mapMetricFields: map[string]string{},
 		},
 		nil,
@@ -439,7 +434,6 @@ var testEsAggregationData = []esAggregationQueryTest{
 			MetricFunction:  "avg",
 			DateField:       "@notatimestamp",
 			QueryPeriod:     queryPeriod,
-			Tags:            []string{},
 			mapMetricFields: map[string]string{"size": "long"},
 		},
 		[]aggregationQueryData{
@@ -496,7 +490,6 @@ var testEsAggregationData = []esAggregationQueryTest{
 			DateField:       "@timestamp",
 			DateFieldFormat: "yyyy",
 			QueryPeriod:     queryPeriod,
-			Tags:            []string{},
 			mapMetricFields: map[string]string{},
 		},
 		nil,

diff --git a/plugins/inputs/ethtool/ethtool_linux.go b/plugins/inputs/ethtool/ethtool_linux.go
@@ -360,11 +360,7 @@ func (c *commandEthtool) interfaces(includeNamespaces bool) ([]namespacedInterfa
 func init() {
 	inputs.Add(pluginName, func() telegraf.Input {
 		return &Ethtool{
-			InterfaceInclude: []string{},
-			InterfaceExclude: []string{},
-			NamespaceInclude: []string{},
-			NamespaceExclude: []string{},
-			command:          newCommandEthtool(),
+			command: newCommandEthtool(),
 		}
 	})
 }
diff --git a/plugins/inputs/ethtool/ethtool_test.go b/plugins/inputs/ethtool/ethtool_test.go
@@ -580,10 +580,8 @@ func setup() {
 
 	c := &commandEthtoolMock{interfaceMap}
 	eth = &Ethtool{
-		InterfaceInclude: []string{},
-		InterfaceExclude: []string{},
-		DownInterfaces:   "expose",
-		command:          c,
+		DownInterfaces: "expose",
+		command:        c,
 	}
 }
 
@@ -932,7 +930,6 @@ func TestNormalizedKeys(t *testing.T) {
 			},
 		},
 		{
-			normalization: []string{},
 			stats: map[string]interface{}{
 				"  Port RX ":   uint64(1),
 				" Port_tx":     uint64(0),
@@ -946,7 +943,6 @@ func TestNormalizedKeys(t *testing.T) {
 			},
 		},
 		{
-			normalization: []string{},
 			stats: map[string]interface{}{
 				"  Port RX ": uint64(1),
 				" Port_tx":   uint64(0),
@@ -972,10 +968,8 @@ func TestNormalizedKeys(t *testing.T) {
 
 		cmd := &commandEthtoolMock{interfaceMap}
 		eth = &Ethtool{
-			InterfaceInclude: []string{},
-			InterfaceExclude: []string{},
-			NormalizeKeys:    c.normalization,
-			command:          cmd,
+			NormalizeKeys: c.normalization,
+			command:       cmd,
 		}
 
 		err := eth.Init()

diff --git a/plugins/inputs/eventhub_consumer/eventhub_consumer.go b/plugins/inputs/eventhub_consumer/eventhub_consumer.go
@@ -81,7 +81,7 @@ func (e *EventHub) Init() (err error) {
 	}
 
 	// Set hub options
-	hubOpts := []eventhub.HubOption{}
+	hubOpts := make([]eventhub.HubOption, 0, 2)
 
 	if e.PersistenceDir != "" {
 		persister, err := persist.NewFilePersister(e.PersistenceDir)
@@ -162,7 +162,7 @@ func (e *EventHub) Stop() {
 }
 
 func (e *EventHub) configureReceiver() []eventhub.ReceiveOption {
-	receiveOpts := []eventhub.ReceiveOption{}
+	receiveOpts := make([]eventhub.ReceiveOption, 0, 4)
 
 	if e.ConsumerGroup != "" {
 		receiveOpts = append(receiveOpts, eventhub.ReceiveWithConsumerGroup(e.ConsumerGroup))

diff --git a/plugins/inputs/execd/shim/goshim.go b/plugins/inputs/execd/shim/goshim.go
@@ -304,8 +304,7 @@ func getEnv(key string) string {
 }
 
 func loadConfigIntoInputs(md toml.MetaData, inputConfigs map[string][]toml.Primitive) ([]telegraf.Input, error) {
-	renderedInputs := []telegraf.Input{}
-
+	renderedInputs := make([]telegraf.Input, 0, len(inputConfigs))
 	for name, primitives := range inputConfigs {
 		inputCreator, ok := inputs.Inputs[name]
 		if !ok {

diff --git a/plugins/inputs/filecount/filecount.go b/plugins/inputs/filecount/filecount.go
@@ -285,8 +285,9 @@ func (fc *FileCount) getDirs() []string {
 }
 
 func (fc *FileCount) initGlobPaths(acc telegraf.Accumulator) {
-	fc.globPaths = []globpath.GlobPath{}
-	for _, directory := range fc.getDirs() {
+	dirs := fc.getDirs()
+	fc.globPaths = make([]globpath.GlobPath, 0, len(dirs))
+	for _, directory := range dirs {
 		glob, err := globpath.Compile(directory)
 		if err != nil {
 			acc.AddError(err)
@@ -299,7 +300,6 @@ func (fc *FileCount) initGlobPaths(acc telegraf.Accumulator) {
 func newFileCount() *FileCount {
 	return &FileCount{
 		Directory:      "",
-		Directories:    []string{},
 		Name:           "*",
 		Recursive:      true,
 		RegularOnly:    true,

diff --git a/plugins/inputs/gnmi/handler.go b/plugins/inputs/gnmi/handler.go
@@ -330,9 +330,10 @@ func guessPrefixFromUpdate(fields []updateField) string {
 	if len(fields) == 1 {
 		return fields[0].path.dir()
 	}
+	segments := make([]segment, 0, len(fields[0].path.segments))
 	commonPath := &pathInfo{
 		origin:   fields[0].path.origin,
-		segments: append([]segment{}, fields[0].path.segments...),
+		segments: append(segments, fields[0].path.segments...),
 	}
 	for _, f := range fields[1:] {
 		commonPath.keepCommonPart(f.path)

diff --git a/plugins/inputs/gnmi/path.go b/plugins/inputs/gnmi/path.go
@@ -103,10 +103,11 @@ func (pi *pathInfo) empty() bool {
 
 func (pi *pathInfo) append(paths ...*gnmi.Path) *pathInfo {
 	// Copy the existing info
+	segments := make([]segment, 0, len(pi.segments))
 	path := &pathInfo{
 		origin:    pi.origin,
 		target:    pi.target,
-		segments:  append([]segment{}, pi.segments...),
+		segments:  append(segments, pi.segments...),
 		keyValues: make([]keySegment, 0, len(pi.keyValues)),
 	}
 	for _, elem := range pi.keyValues {
@@ -150,10 +151,11 @@ func (pi *pathInfo) append(paths ...*gnmi.Path) *pathInfo {
 
 func (pi *pathInfo) appendSegments(segments ...string) *pathInfo {
 	// Copy the existing info
+	seg := make([]segment, 0, len(segments))
 	path := &pathInfo{
 		origin:    pi.origin,
 		target:    pi.target,
-		segments:  append([]segment{}, pi.segments...),
+		segments:  append(seg, pi.segments...),
 		keyValues: make([]keySegment, 0, len(pi.keyValues)),
 	}
 	for _, elem := range pi.keyValues {

diff --git a/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go b/plugins/inputs/google_cloud_storage/google_cloud_storage_test.go
@@ -315,7 +315,7 @@ func stateFullGCSServer(t *testing.T) *httptest.Server {
 			} else if pageToken == "page4" {
 				objListing["items"] = []interface{}{fourthElement}
 			} else if offset == "prefix/1604148850994" {
-				objListing["items"] = []interface{}{}
+				objListing["items"] = make([]interface{}, 0)
 			} else {
 				objListing["items"] = []interface{}{firstElement}
 				objListing["nextPageToken"] = "page2"

diff --git a/plugins/inputs/hugepages/hugepages_test.go b/plugins/inputs/hugepages/hugepages_test.go
@@ -25,7 +25,7 @@ func TestInit(t *testing.T) {
 	})
 
 	t.Run("when empty hugepages types is provided then plugin should fail to initialize", func(t *testing.T) {
-		h := Hugepages{Types: []string{}}
+		h := Hugepages{Types: make([]string, 0)}
 		err := h.Init()
 
 		require.Error(t, err)

diff --git a/plugins/inputs/icinga2/icinga2_test.go b/plugins/inputs/icinga2/icinga2_test.go
@@ -30,7 +30,6 @@ func TestIcinga2Default(t *testing.T) {
 func TestIcinga2DeprecatedHostConfig(t *testing.T) {
 	icinga2 := &Icinga2{
 		ObjectType: "hosts", // deprecated
-		Objects:    []string{},
 	}
 	require.NoError(t, icinga2.Init())
 
@@ -40,7 +39,6 @@ func TestIcinga2DeprecatedHostConfig(t *testing.T) {
 func TestIcinga2DeprecatedServicesConfig(t *testing.T) {
 	icinga2 := &Icinga2{
 		ObjectType: "services", // deprecated
-		Objects:    []string{},
 	}
 	require.NoError(t, icinga2.Init())
 

diff --git a/plugins/inputs/intel_dlb/intel_dlb_test.go b/plugins/inputs/intel_dlb/intel_dlb_test.go
@@ -149,7 +149,7 @@ func TestDLB_writeReadSocketMessage(t *testing.T) {
 			connection: mockConn,
 			Log:        testutil.Logger{},
 		}
-		mockConn.On("Write", []byte{}).Return(0, errors.New("write error")).Once().
+		mockConn.On("Write", make([]byte, 0)).Return(0, errors.New("write error")).Once().
 			On("Close").Return(nil).Once()
 
 		_, _, err := dlb.writeReadSocketMessage("")
@@ -180,7 +180,7 @@ func TestDLB_writeReadSocketMessage(t *testing.T) {
 			connection: mockConn,
 			Log:        testutil.Logger{},
 		}
-		mockConn.On("Write", []byte{}).Return(0, nil).Once().
+		mockConn.On("Write", make([]byte, 0)).Return(0, nil).Once().
 			On("Read", mock.Anything).Return(0, nil).
 			On("Close").Return(nil).Once()
 

diff --git a/plugins/inputs/intel_pmt/intel_pmt_test.go b/plugins/inputs/intel_pmt/intel_pmt_test.go
@@ -348,7 +348,7 @@ func TestGather(t *testing.T) {
 				},
 			},
 			files: []testFile{
-				{guid: "test-guid", content: []byte{}},
+				{guid: "test-guid"},
 			},
 			wantErr: true,
 		},

diff --git a/plugins/inputs/intel_pmu/intel_pmu_test.go b/plugins/inputs/intel_pmu/intel_pmu_test.go
@@ -472,7 +472,7 @@ func TestAddFiles(t *testing.T) {
 	mError := errors.New("mock error")
 
 	t.Run("no paths", func(t *testing.T) {
-		err := checkFiles([]string{}, mFileInfo)
+		err := checkFiles(nil, mFileInfo)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "no paths were given")
 	})