[pkg/stanza] Enable govet (open-telemetry#10377)

* [pkg/stanza] Enable revive linter on operator/parser and fix issues * [pkg/stanza] Enable govet and remove custom golangci.yaml
sakulali · May 27, 2022 · 7a722af · 7a722af
1 parent 6dade28
commit 7a722af
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 158 deletions.
diff --git a/pkg/stanza/.golangci.yml b/pkg/stanza/.golangci.yml
diff --git a/pkg/stanza/operator/helper/operatortest/operatortest.go b/pkg/stanza/operator/helper/operatortest/operatortest.go
@@ -54,7 +54,7 @@ func configFromFileViaMapstructure(file string, config interface{}) error {
 
  raw := map[string]interface{}{}
 
- if err := yaml.Unmarshal(bytes, raw); err != nil {
+ if err = yaml.Unmarshal(bytes, raw); err != nil {
  return fmt.Errorf("failed to read data from yaml: %s", err)
  }
 

diff --git a/pkg/stanza/operator/helper/parser.go b/pkg/stanza/operator/helper/parser.go
@@ -113,7 +113,7 @@ func (p *ParserOperator) ProcessWithCallback(ctx context.Context, entry *entry.E
  return nil
  }
 
- if err := p.ParseWith(ctx, entry, parse); err != nil {
+ if err = p.ParseWith(ctx, entry, parse); err != nil {
  return err
  }
  if cb != nil {

diff --git a/pkg/stanza/operator/helper/scope_name_test.go b/pkg/stanza/operator/helper/scope_name_test.go
@@ -177,7 +177,7 @@ func ScopeConfigFromFileViaMapstructure(file string, result *ScopeNameParser) er
 
  raw := map[string]interface{}{}
 
- if err := yaml.Unmarshal(bytes, raw); err != nil {
+ if err = yaml.Unmarshal(bytes, raw); err != nil {
  return fmt.Errorf("failed to read data from yaml: %s", err)
  }
 

diff --git a/pkg/stanza/operator/helper/severity_test.go b/pkg/stanza/operator/helper/severity_test.go
@@ -576,7 +576,7 @@ func severityConfigFromFileViaMapstructure(file string, result *Config) error {
 
  raw := map[string]interface{}{}
 
- if err := yaml.Unmarshal(bytes, raw); err != nil {
+ if err = yaml.Unmarshal(bytes, raw); err != nil {
  return fmt.Errorf("failed to read data from yaml: %s", err)
  }
 

diff --git a/pkg/stanza/operator/helper/time_test.go b/pkg/stanza/operator/helper/time_test.go
@@ -718,7 +718,7 @@ func timeConfigFromFileViaMapstructure(file string, result *TimeParser) error {
 
  raw := map[string]interface{}{}
 
- if err := yaml.Unmarshal(bytes, raw); err != nil {
+ if err = yaml.Unmarshal(bytes, raw); err != nil {
  return fmt.Errorf("failed to read data from yaml: %s", err)
  }
 

diff --git a/pkg/stanza/operator/input/file/config.go b/pkg/stanza/operator/input/file/config.go
@@ -84,15 +84,15 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) {
 
  // Ensure includes can be parsed as globs
  for _, include := range c.Include {
- _, err := doublestar.PathMatch(include, "matchstring")
+ _, err = doublestar.PathMatch(include, "matchstring")
  if err != nil {
  return nil, fmt.Errorf("parse include glob: %s", err)
  }
  }
 
  // Ensure excludes can be parsed as globs
  for _, exclude := range c.Exclude {
- _, err := doublestar.PathMatch(exclude, "matchstring")
+ _, err = doublestar.PathMatch(exclude, "matchstring")
  if err != nil {
  return nil, fmt.Errorf("parse exclude glob: %s", err)
  }

diff --git a/pkg/stanza/operator/input/journald/journald.go b/pkg/stanza/operator/input/journald/journald.go
@@ -146,12 +146,12 @@ func (operator *Input) Start(persister operator.Persister) error {
  operator.persister = persister
 
  // Start journalctl
- cmd := operator.newCmd(ctx, cursor)
- stdout, err := cmd.StdoutPipe()
+ journal := operator.newCmd(ctx, cursor)
+ stdout, err := journal.StdoutPipe()
  if err != nil {
  return fmt.Errorf("failed to get journalctl stdout: %s", err)
  }
- err = cmd.Start()
+ err = journal.Start()
  if err != nil {
  return fmt.Errorf("start journalctl: %s", err)
  }

diff --git a/pkg/stanza/operator/input/tcp/tcp.go b/pkg/stanza/operator/input/tcp/tcp.go
@@ -94,7 +94,7 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) {
  }
 
  // validate the input address
- if _, err := net.ResolveTCPAddr("tcp", c.ListenAddress); err != nil {
+ if _, err = net.ResolveTCPAddr("tcp", c.ListenAddress); err != nil {
  return nil, fmt.Errorf("failed to resolve listen_address: %s", err)
  }
 

diff --git a/pkg/stanza/operator/input/tcp/tcp_test.go b/pkg/stanza/operator/input/tcp/tcp_test.go
@@ -105,8 +105,7 @@ func tcpInputTest(input []byte, expected []string) func(t *testing.T) {
  err = tcpInput.Start(testutil.NewMockPersister("test"))
  require.NoError(t, err)
  defer func() {
- err := tcpInput.Stop()
- require.NoError(t, err, "expected to stop tcp input operator without error")
+ require.NoError(t, tcpInput.Stop(), "expected to stop tcp input operator without error")
  }()
 
  conn, err := net.Dial("tcp", tcpInput.listener.Addr().String())
@@ -155,8 +154,7 @@ func tcpInputAttributesTest(input []byte, expected []string) func(t *testing.T)
  err = tcpInput.Start(testutil.NewMockPersister("test"))
  require.NoError(t, err)
  defer func() {
- err := tcpInput.Stop()
- require.NoError(t, err, "expected to stop tcp input operator without error")
+ require.NoError(t, tcpInput.Stop(), "expected to stop tcp input operator without error")
  }()
 
  conn, err := net.Dial("tcp", tcpInput.listener.Addr().String())
@@ -242,8 +240,7 @@ func tlsInputTest(input []byte, expected []string) func(t *testing.T) {
  err = tcpInput.Start(testutil.NewMockPersister("test"))
  require.NoError(t, err)
  defer func() {
- err := tcpInput.Stop()
- require.NoError(t, err, "expected to stop tcp input operator without error")
+ require.NoError(t, tcpInput.Stop(), "expected to stop tcp input operator without error")
  }()
 
  conn, err := tls.Dial("tcp", tcpInput.listener.Addr().String(), &tls.Config{InsecureSkipVerify: true})
@@ -414,8 +411,7 @@ func TestFailToBind(t *testing.T) {
  first, err := startTCP(port)
  require.NoError(t, err, "expected first tcp operator to start")
  defer func() {
- err := first.Stop()
- require.NoError(t, err, "expected to stop tcp input operator without error")
+ require.NoError(t, first.Stop(), "expected to stop tcp input operator without error")
  require.NoError(t, first.Stop(), "expected stopping an already stopped operator to not return an error")
  }()
  _, err = startTCP(port)

diff --git a/pkg/stanza/operator/input/udp/udp_test.go b/pkg/stanza/operator/input/udp/udp_test.go
@@ -51,8 +51,7 @@ func udpInputTest(input []byte, expected []string) func(t *testing.T) {
  err = udpInput.Start(testutil.NewMockPersister("test"))
  require.NoError(t, err)
  defer func() {
- err := udpInput.Stop()
- require.NoError(t, err, "expected to stop udp input operator without error")
+ require.NoError(t, udpInput.Stop(), "expected to stop udp input operator without error")
  }()
 
  conn, err := net.Dial("udp", udpInput.connection.LocalAddr().String())
@@ -103,8 +102,7 @@ func udpInputAttributesTest(input []byte, expected []string) func(t *testing.T)
  err = udpInput.Start(testutil.NewMockPersister("test"))
  require.NoError(t, err)
  defer func() {
- err := udpInput.Stop()
- require.NoError(t, err, "expected to stop udp input operator without error")
+ require.NoError(t, udpInput.Stop(), "expected to stop udp input operator without error")
  }()
 
  conn, err := net.Dial("udp", udpInput.connection.LocalAddr().String())
@@ -206,8 +204,7 @@ func TestFailToBind(t *testing.T) {
  first, err := startUDP(port)
  require.NoError(t, err, "expected first udp operator to start")
  defer func() {
- err := first.Stop()
- require.NoError(t, err, "expected to stop udp input operator without error")
+ require.NoError(t, first.Stop(), "expected to stop udp input operator without error")
  require.NoError(t, first.Stop(), "expected stopping an already stopped operator to not return an error")
  }()
  _, err = startUDP(port)

diff --git a/pkg/stanza/operator/transformer/flatten/config_test.go b/pkg/stanza/operator/transformer/flatten/config_test.go
@@ -110,7 +110,7 @@ func configFromFileViaMapstructure(file string) (*Config, error) {
 
  raw := map[string]interface{}{}
 
- if err := yaml.Unmarshal(bytes, raw); err != nil {
+ if err = yaml.Unmarshal(bytes, raw); err != nil {
  return nil, fmt.Errorf("failed to read data from yaml: %s", err)
  }