diff --git a/metricbeat/include/list_init.go b/metricbeat/include/list_init.go
index 037e00b28915..fbfa58a65c5c 100644
--- a/metricbeat/include/list_init.go
+++ b/metricbeat/include/list_init.go
@@ -21,10 +21,9 @@ package include
 
 import (
 	// Import packages to perform 'func InitializeModule()' when in-use.
-	m0 "github.com/elastic/beats/v7/metricbeat/autodiscover/builder/hints"
 	m1 "github.com/elastic/beats/v7/metricbeat/autodiscover/appender/kubernetes/token"
+	m0 "github.com/elastic/beats/v7/metricbeat/autodiscover/builder/hints"
 	m2 "github.com/elastic/beats/v7/metricbeat/processor/add_kubernetes_metadata"
-
 	// Import packages that perform 'func init()'.
 )
 
diff --git a/x-pack/filebeat/input/awss3/sqs_s3_event.go b/x-pack/filebeat/input/awss3/sqs_s3_event.go
index fa52f1123827..b3c334810e22 100644
--- a/x-pack/filebeat/input/awss3/sqs_s3_event.go
+++ b/x-pack/filebeat/input/awss3/sqs_s3_event.go
@@ -44,7 +44,7 @@ func (e *nonRetryableError) Error() string {
 }
 
 func (e *nonRetryableError) Is(err error) bool {
-	_, ok := err.(*nonRetryableError) //nolint:errorlint // This is not used directly to detected wrapped errors (errors.Is handles unwrapping).
+	_, ok := err.(*nonRetryableError) // This is not used directly to detected wrapped errors (errors.Is handles unwrapping).
 	return ok
 }
 
@@ -309,8 +309,8 @@ func (p *sqsS3EventProcessor) getS3Notifications(body string) ([]s3EventV2, erro
 }
 
 func convertEventBridge(eventBridgeEvents *eventBridgeEvents, s3Events *s3EventsV2) {
-	for _, message := range eventBridgeEvents.Messages {
-		s3Events.Records = append(s3Events.Records, convertEventBridgeEvent(&message))
+	for i := range eventBridgeEvents.Messages {
+		s3Events.Records = append(s3Events.Records, convertEventBridgeEvent(&eventBridgeEvents.Messages[i]))
 	}
 }
 
@@ -326,7 +326,6 @@ func convertEventBridgeEvent(message *eventBridgeEvent) s3EventV2 {
 	}
 	event.SetS3BucketName(message.Detail.Bucket.Name)
 	event.SetS3ObjectKey(message.Detail.Object.Key)
-	event.SetProvider("aws:s3") //TODO
 	return event
 }
 
diff --git a/x-pack/filebeat/input/awss3/sqs_test.go b/x-pack/filebeat/input/awss3/sqs_test.go
index 2595f1313a6b..c8dbc02c0913 100644
--- a/x-pack/filebeat/input/awss3/sqs_test.go
+++ b/x-pack/filebeat/input/awss3/sqs_test.go
@@ -13,6 +13,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/aws/aws-sdk-go/service/sqs"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/gofrs/uuid"