Fix linter errors #4

elastic · May 29, 2023 · 087a8e1 · 087a8e1
1 parent 5906ba3
commit 087a8e1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/libbeat/reader/readfile/line.go b/libbeat/reader/readfile/line.go
@@ -307,7 +307,7 @@ func (r *LineReader) decode(end int) (int, error) {
 		nDst, nSrc, err = r.decoder.Transform(r.tempBuffer, inBytes[start:end], false)
 		if err != nil {
 			// Check if error is different from destination buffer too short
-			if !(err == transform.ErrShortDst) {
+			if !(errors.Is(err, transform.ErrShortDst)) {
 				_, _ = r.outBuffer.Write(inBytes[0:end])
 				start = end
 				break

diff --git a/libbeat/reader/readfile/line_test.go b/libbeat/reader/readfile/line_test.go
@@ -489,7 +489,7 @@ func TestBufferSize(t *testing.T) {
 	for i := 0; i < len(lines); i++ {
 		b, n, err := reader.Next()
 		if err != nil {
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				break
 			} else {
 				t.Fatal("unexpected error:", err)

diff --git a/x-pack/filebeat/input/awss3/s3_objects.go b/x-pack/filebeat/input/awss3/s3_objects.go
@@ -12,6 +12,7 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"

diff --git a/x-pack/filebeat/input/awss3/s3_objects_test.go b/x-pack/filebeat/input/awss3/s3_objects_test.go
@@ -57,7 +57,8 @@ func newS3GetObjectResponse(filename string, data []byte, contentType string) *s
 }
 
 func TestS3ObjectProcessor(t *testing.T) {
-	logp.TestingSetup()
+	errSetup := logp.TestingSetup()
+	if errSetup != nil
 
 	t.Run("download text/plain file", func(t *testing.T) {
 		testProcessS3Object(t, "testdata/log.txt", "text/plain", 2)