Fix linter errors.

influxdata · Apr 9, 2021 · 7edda11 · 7edda11
1 parent 00ca05e
commit 7edda11
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 52 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -204,7 +204,6 @@ func TestConfig_LoadDirectory(t *testing.T) {
 		require.Equalf(t, expectedPlugins[i], plugin.Input, "Plugin %d: incorrect struct produced", i)
 		require.Equalf(t, expectedConfigs[i], plugin.Config, "Plugin %d: incorrect config produced", i)
 	}
-
 }
 
 func TestConfig_LoadSpecialTypes(t *testing.T) {

diff --git a/config/types_test.go b/config/types_test.go
@@ -33,45 +33,45 @@ func TestConfigDuration(t *testing.T) {
 func TestDuration(t *testing.T) {
 	var d config.Duration
 
-	d.UnmarshalTOML([]byte(`"1s"`))
+	require.NoError(t, d.UnmarshalTOML([]byte(`"1s"`)))
 	require.Equal(t, time.Second, time.Duration(d))
 
 	d = config.Duration(0)
-	d.UnmarshalTOML([]byte(`1s`))
+	require.NoError(t, d.UnmarshalTOML([]byte(`1s`)))
 	require.Equal(t, time.Second, time.Duration(d))
 
 	d = config.Duration(0)
-	d.UnmarshalTOML([]byte(`'1s'`))
+	require.NoError(t, d.UnmarshalTOML([]byte(`'1s'`)))
 	require.Equal(t, time.Second, time.Duration(d))
 
 	d = config.Duration(0)
-	d.UnmarshalTOML([]byte(`10`))
+	require.NoError(t, d.UnmarshalTOML([]byte(`10`)))
 	require.Equal(t, 10*time.Second, time.Duration(d))
 
 	d = config.Duration(0)
-	d.UnmarshalTOML([]byte(`1.5`))
+	require.NoError(t, d.UnmarshalTOML([]byte(`1.5`)))
 	require.Equal(t, time.Second, time.Duration(d))
 }
 
 func TestSize(t *testing.T) {
 	var s config.Size
 
-	s.UnmarshalTOML([]byte(`"1B"`))
+	require.NoError(t, s.UnmarshalTOML([]byte(`"1B"`)))
 	require.Equal(t, int64(1), int64(s))
 
 	s = config.Size(0)
-	s.UnmarshalTOML([]byte(`1`))
+	require.NoError(t, s.UnmarshalTOML([]byte(`1`)))
 	require.Equal(t, int64(1), int64(s))
 
 	s = config.Size(0)
-	s.UnmarshalTOML([]byte(`'1'`))
+	require.NoError(t, s.UnmarshalTOML([]byte(`'1'`)))
 	require.Equal(t, int64(1), int64(s))
 
 	s = config.Size(0)
-	s.UnmarshalTOML([]byte(`"1GB"`))
+	require.NoError(t, s.UnmarshalTOML([]byte(`"1GB"`)))
 	require.Equal(t, int64(1000*1000*1000), int64(s))
 
 	s = config.Size(0)
-	s.UnmarshalTOML([]byte(`"12GiB"`))
+	require.NoError(t, s.UnmarshalTOML([]byte(`"12GiB"`)))
 	require.Equal(t, int64(12*1024*1024*1024), int64(s))
 }
diff --git a/plugins/inputs/apcupsd/apcupsd.go b/plugins/inputs/apcupsd/apcupsd.go
@@ -15,7 +15,7 @@ import (
 
 const defaultAddress = "tcp://127.0.0.1:3551"
 
-var defaultTimeout = config.Duration(time.Duration(time.Second * 5))
+var defaultTimeout = config.Duration(5 * time.Second)
 
 type ApcUpsd struct {
 	Servers []string

diff --git a/plugins/inputs/ipset/ipset.go b/plugins/inputs/ipset/ipset.go
@@ -91,15 +91,15 @@ func (i *Ipset) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-func setList(Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error) {
+func setList(timeout config.Duration, useSudo bool) (*bytes.Buffer, error) {
 	// Is ipset installed ?
 	ipsetPath, err := exec.LookPath("ipset")
 	if err != nil {
 		return nil, err
 	}
 	var args []string
 	cmdName := ipsetPath
-	if UseSudo {
+	if useSudo {
 		cmdName = "sudo"
 		args = append(args, ipsetPath)
 	}
@@ -109,7 +109,7 @@ func setList(Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error) {
 
 	var out bytes.Buffer
 	cmd.Stdout = &out
-	err = internal.RunTimeout(cmd, time.Duration(Timeout))
+	err = internal.RunTimeout(cmd, time.Duration(timeout))
 	if err != nil {
 		return &out, fmt.Errorf("error running ipset save: %s", err)
 	}

diff --git a/plugins/inputs/ipset/ipset_test.go b/plugins/inputs/ipset/ipset_test.go
@@ -80,7 +80,7 @@ func TestIpset(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			i++
 			ips := &Ipset{
-				lister: func(Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error) {
+				lister: func(timeout config.Duration, useSudo bool) (*bytes.Buffer, error) {
 					return bytes.NewBufferString(tt.value), nil
 				},
 			}
@@ -123,7 +123,7 @@ func TestIpset(t *testing.T) {
 func TestIpset_Gather_listerError(t *testing.T) {
 	errFoo := errors.New("error foobar")
 	ips := &Ipset{
-		lister: func(Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error) {
+		lister: func(timeout config.Duration, useSudo bool) (*bytes.Buffer, error) {
 			return new(bytes.Buffer), errFoo
 		},
 	}

diff --git a/plugins/inputs/jenkins/jenkins.go b/plugins/inputs/jenkins/jenkins.go
@@ -501,7 +501,7 @@ func mapResultCode(s string) int {
 func init() {
 	inputs.Add("jenkins", func() telegraf.Input {
 		return &Jenkins{
-			MaxBuildAge:       config.Duration(time.Duration(time.Hour)),
+			MaxBuildAge:       config.Duration(time.Hour),
 			MaxConnections:    5,
 			MaxSubJobPerLayer: 10,
 		}

diff --git a/plugins/inputs/nsd/nsd.go b/plugins/inputs/nsd/nsd.go
@@ -16,7 +16,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type runner func(cmdName string, Timeout config.Duration, UseSudo bool, Server string, ConfigFile string) (*bytes.Buffer, error)
+type runner func(cmdName string, timeout config.Duration, useSudo bool, Server string, ConfigFile string) (*bytes.Buffer, error)
 
 // NSD is used to store configuration values
 type NSD struct {
@@ -61,7 +61,7 @@ func (s *NSD) SampleConfig() string {
 }
 
 // Shell out to nsd_stat and return the output
-func nsdRunner(cmdName string, Timeout config.Duration, UseSudo bool, Server string, ConfigFile string) (*bytes.Buffer, error) {
+func nsdRunner(cmdName string, timeout config.Duration, useSudo bool, Server string, ConfigFile string) (*bytes.Buffer, error) {
 	cmdArgs := []string{"stats_noreset"}
 
 	if Server != "" {
@@ -79,14 +79,14 @@ func nsdRunner(cmdName string, Timeout config.Duration, UseSudo bool, Server str
 
 	cmd := exec.Command(cmdName, cmdArgs...)
 
-	if UseSudo {
+	if useSudo {
 		cmdArgs = append([]string{cmdName}, cmdArgs...)
 		cmd = exec.Command("sudo", cmdArgs...)
 	}
 
 	var out bytes.Buffer
 	cmd.Stdout = &out
-	err := internal.RunTimeout(cmd, time.Duration(Timeout))
+	err := internal.RunTimeout(cmd, time.Duration(timeout))
 	if err != nil {
 		return &out, fmt.Errorf("error running nsd-control: %s (%s %v)", err, cmdName, cmdArgs)
 	}

diff --git a/plugins/inputs/openntpd/openntpd.go b/plugins/inputs/openntpd/openntpd.go
@@ -35,7 +35,7 @@ var intI = map[string]int{
 	"poll": 4,
 }
 
-type runner func(cmdName string, Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error)
+type runner func(cmdName string, timeout config.Duration, useSudo bool) (*bytes.Buffer, error)
 
 // Openntpd is used to store configuration values
 type Openntpd struct {
@@ -67,19 +67,19 @@ func (n *Openntpd) SampleConfig() string {
 }
 
 // Shell out to ntpctl and return the output
-func openntpdRunner(cmdName string, Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error) {
+func openntpdRunner(cmdName string, timeout config.Duration, useSudo bool) (*bytes.Buffer, error) {
 	cmdArgs := []string{"-s", "peers"}
 
 	cmd := exec.Command(cmdName, cmdArgs...)
 
-	if UseSudo {
+	if useSudo {
 		cmdArgs = append([]string{cmdName}, cmdArgs...)
 		cmd = exec.Command("sudo", cmdArgs...)
 	}
 
 	var out bytes.Buffer
 	cmd.Stdout = &out
-	err := internal.RunTimeout(cmd, time.Duration(Timeout))
+	err := internal.RunTimeout(cmd, time.Duration(timeout))
 	if err != nil {
 		return &out, fmt.Errorf("error running ntpctl: %s", err)
 	}

diff --git a/plugins/inputs/opensmtpd/opensmtpd.go b/plugins/inputs/opensmtpd/opensmtpd.go
@@ -16,7 +16,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type runner func(cmdName string, Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error)
+type runner func(cmdName string, timeout config.Duration, useSudo bool) (*bytes.Buffer, error)
 
 // Opensmtpd is used to store configuration values
 type Opensmtpd struct {
@@ -51,19 +51,19 @@ func (s *Opensmtpd) SampleConfig() string {
 }
 
 // Shell out to opensmtpd_stat and return the output
-func opensmtpdRunner(cmdName string, Timeout config.Duration, UseSudo bool) (*bytes.Buffer, error) {
+func opensmtpdRunner(cmdName string, timeout config.Duration, useSudo bool) (*bytes.Buffer, error) {
 	cmdArgs := []string{"show", "stats"}
 
 	cmd := exec.Command(cmdName, cmdArgs...)
 
-	if UseSudo {
+	if useSudo {
 		cmdArgs = append([]string{cmdName}, cmdArgs...)
 		cmd = exec.Command("sudo", cmdArgs...)
 	}
 
 	var out bytes.Buffer
 	cmd.Stdout = &out
-	err := internal.RunTimeout(cmd, time.Duration(Timeout))
+	err := internal.RunTimeout(cmd, time.Duration(timeout))
 	if err != nil {
 		return &out, fmt.Errorf("error running smtpctl: %s", err)
 	}

diff --git a/plugins/inputs/snmp/snmp_test.go b/plugins/inputs/snmp/snmp_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/gosnmp/gosnmp"
 	"github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/internal/snmp"
-	snmpcfg "github.com/influxdata/telegraf/internal/snmp"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/influxdata/toml"
@@ -93,7 +92,7 @@ func TestSampleConfig(t *testing.T) {
 	expected := &Snmp{
 		Agents:       []string{"udp://127.0.0.1:161"},
 		AgentHostTag: "",
-		ClientConfig: snmpcfg.ClientConfig{
+		ClientConfig: snmp.ClientConfig{
 			Timeout:        config.Duration(5 * time.Second),
 			Version:        2,
 			Community:      "public",
@@ -239,7 +238,7 @@ func TestSnmpInit_noTranslate(t *testing.T) {
 func TestGetSNMPConnection_v2(t *testing.T) {
 	s := &Snmp{
 		Agents: []string{"1.2.3.4:567", "1.2.3.4", "udp://127.0.0.1"},
-		ClientConfig: snmpcfg.ClientConfig{
+		ClientConfig: snmp.ClientConfig{
 			Timeout:   config.Duration(3 * time.Second),
 			Retries:   4,
 			Version:   2,
@@ -308,7 +307,7 @@ func stubTCPServer(wg *sync.WaitGroup) {
 func TestGetSNMPConnection_v3(t *testing.T) {
 	s := &Snmp{
 		Agents: []string{"1.2.3.4"},
-		ClientConfig: snmpcfg.ClientConfig{
+		ClientConfig: snmp.ClientConfig{
 			Version:        3,
 			MaxRepetitions: 20,
 			ContextName:    "mycontext",
@@ -356,7 +355,7 @@ func TestGetSNMPConnection_v3_blumenthal(t *testing.T) {
 			Algorithm: gosnmp.AES192,
 			Config: &Snmp{
 				Agents: []string{"1.2.3.4"},
-				ClientConfig: snmpcfg.ClientConfig{
+				ClientConfig: snmp.ClientConfig{
 					Version:        3,
 					MaxRepetitions: 20,
 					ContextName:    "mycontext",
@@ -377,7 +376,7 @@ func TestGetSNMPConnection_v3_blumenthal(t *testing.T) {
 			Algorithm: gosnmp.AES192C,
 			Config: &Snmp{
 				Agents: []string{"1.2.3.4"},
-				ClientConfig: snmpcfg.ClientConfig{
+				ClientConfig: snmp.ClientConfig{
 					Version:        3,
 					MaxRepetitions: 20,
 					ContextName:    "mycontext",
@@ -398,7 +397,7 @@ func TestGetSNMPConnection_v3_blumenthal(t *testing.T) {
 			Algorithm: gosnmp.AES256,
 			Config: &Snmp{
 				Agents: []string{"1.2.3.4"},
-				ClientConfig: snmpcfg.ClientConfig{
+				ClientConfig: snmp.ClientConfig{
 					Version:        3,
 					MaxRepetitions: 20,
 					ContextName:    "mycontext",
@@ -419,7 +418,7 @@ func TestGetSNMPConnection_v3_blumenthal(t *testing.T) {
 			Algorithm: gosnmp.AES256C,
 			Config: &Snmp{
 				Agents: []string{"1.2.3.4"},
-				ClientConfig: snmpcfg.ClientConfig{
+				ClientConfig: snmp.ClientConfig{
 					Version:        3,
 					MaxRepetitions: 20,
 					ContextName:    "mycontext",

diff --git a/plugins/inputs/snmp_trap/snmp_trap.go b/plugins/inputs/snmp_trap/snmp_trap.go
@@ -112,11 +112,11 @@ func init() {
 	})
 }
 
-func realExecCmd(Timeout config.Duration, arg0 string, args ...string) ([]byte, error) {
+func realExecCmd(timeout config.Duration, arg0 string, args ...string) ([]byte, error) {
 	cmd := exec.Command(arg0, args...)
 	var out bytes.Buffer
 	cmd.Stdout = &out
-	err := internal.RunTimeout(cmd, time.Duration(Timeout))
+	err := internal.RunTimeout(cmd, time.Duration(timeout))
 	if err != nil {
 		return nil, err
 	}

diff --git a/plugins/inputs/systemd_units/systemd_units_linux.go b/plugins/inputs/systemd_units/systemd_units_linux.go
@@ -21,7 +21,7 @@ type SystemdUnits struct {
 	systemctl systemctl
 }
 
-type systemctl func(Timeout config.Duration, UnitType string) (*bytes.Buffer, error)
+type systemctl func(timeout config.Duration, unitType string) (*bytes.Buffer, error)
 
 const measurement = "systemd_units"
 
@@ -192,20 +192,20 @@ func (s *SystemdUnits) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-func setSystemctl(Timeout config.Duration, UnitType string) (*bytes.Buffer, error) {
+func setSystemctl(timeout config.Duration, unitType string) (*bytes.Buffer, error) {
 	// is systemctl available ?
 	systemctlPath, err := exec.LookPath("systemctl")
 	if err != nil {
 		return nil, err
 	}
 
-	cmd := exec.Command(systemctlPath, "list-units", "--all", "--plain", fmt.Sprintf("--type=%s", UnitType), "--no-legend")
+	cmd := exec.Command(systemctlPath, "list-units", "--all", "--plain", fmt.Sprintf("--type=%s", unitType), "--no-legend")
 
 	var out bytes.Buffer
 	cmd.Stdout = &out
-	err = internal.RunTimeout(cmd, time.Duration(Timeout))
+	err = internal.RunTimeout(cmd, time.Duration(timeout))
 	if err != nil {
-		return &out, fmt.Errorf("error running systemctl list-units --all --plain --type=%s --no-legend: %s", UnitType, err)
+		return &out, fmt.Errorf("error running systemctl list-units --all --plain --type=%s --no-legend: %s", unitType, err)
 	}
 
 	return &out, nil

diff --git a/plugins/inputs/systemd_units/systemd_units_linux_test.go b/plugins/inputs/systemd_units/systemd_units_linux_test.go
@@ -74,7 +74,7 @@ func TestSystemdUnits(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			systemdUnits := &SystemdUnits{
-				systemctl: func(Timeout config.Duration, UnitType string) (*bytes.Buffer, error) {
+				systemctl: func(timeout config.Duration, unitType string) (*bytes.Buffer, error) {
 					return bytes.NewBufferString(tt.line), nil
 				},
 			}

diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go
@@ -18,7 +18,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-type runner func(cmdName string, UseSudo bool, InstanceName string, Timeout config.Duration) (*bytes.Buffer, error)
+type runner func(cmdName string, useSudo bool, instanceName string, timeout config.Duration) (*bytes.Buffer, error)
 
 // Varnish is used to store configuration values
 type Varnish struct {
@@ -67,16 +67,16 @@ func (s *Varnish) SampleConfig() string {
 }
 
 // Shell out to varnish_stat and return the output
-func varnishRunner(cmdName string, UseSudo bool, InstanceName string, Timeout config.Duration) (*bytes.Buffer, error) {
+func varnishRunner(cmdName string, useSudo bool, instanceName string, timeout config.Duration) (*bytes.Buffer, error) {
 	cmdArgs := []string{"-1"}
 
-	if InstanceName != "" {
-		cmdArgs = append(cmdArgs, []string{"-n", InstanceName}...)
+	if instanceName != "" {
+		cmdArgs = append(cmdArgs, []string{"-n", instanceName}...)
 	}
 
 	cmd := exec.Command(cmdName, cmdArgs...)
 
-	if UseSudo {
+	if useSudo {
 		cmdArgs = append([]string{cmdName}, cmdArgs...)
 		cmdArgs = append([]string{"-n"}, cmdArgs...)
 		cmd = exec.Command("sudo", cmdArgs...)
@@ -85,7 +85,7 @@ func varnishRunner(cmdName string, UseSudo bool, InstanceName string, Timeout co
 	var out bytes.Buffer
 	cmd.Stdout = &out
 
-	err := internal.RunTimeout(cmd, time.Duration(Timeout))
+	err := internal.RunTimeout(cmd, time.Duration(timeout))
 	if err != nil {
 		return &out, fmt.Errorf("error running varnishstat: %s", err)
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -204,7 +204,6 @@ func TestConfig_LoadDirectory(t *testing.T) { @@
     		require.Equalf(t, expectedPlugins[i], plugin.Input, "Plugin %d: incorrect struct produced", i)
     		require.Equalf(t, expectedConfigs[i], plugin.Config, "Plugin %d: incorrect config produced", i)
     	}
     }
     func TestConfig_LoadSpecialTypes(t *testing.T) {
@@ Expand Down @@