Delete lazyloading of cloudtrail-related regexes

Author: ndakkoune

aws/logs_monitoring_go/internal/handling/cloudtrail.go

@@ -15,19 +15,17 @@ import (
 	"log/slog"
 	"regexp"
 	"strings"
-	"sync"
 )
 
 const (
 	cloudTrailARNKey          = "arn"
 	cloudTrailUserIdentityKey = "userIdentity"
 )
 
-var cloudTrailRegex = regexp.MustCompile(`\d+_CloudTrail(|-Digest|-Insight)_\w{2}(|-gov|-cn)-\w{4,9}-\d_(|.+)\d{8}T\d{4,6}Z(|.+)\.json\.gz$`)
-
-var ec2InstanceRegexp = sync.OnceValue(func() *regexp.Regexp {
-	return regexp.MustCompile(`^arn:aws:sts::.*?:assumed-role/(?P<role>.*?)/(?P<host>i-([0-9a-f]{8}|[0-9a-f]{17}))$`)
-})
+var (
+	cloudTrailRegex   = regexp.MustCompile(`\d+_CloudTrail(|-Digest|-Insight)_\w{2}(|-gov|-cn)-\w{4,9}-\d_(|.+)\d{8}T\d{4,6}Z(|.+)\.json\.gz$`)
+	ec2InstanceRegexp = regexp.MustCompile(`^arn:aws:sts::.*?:assumed-role/(?P<role>.*?)/(?P<host>i-([0-9a-f]{8}|[0-9a-f]{17}))$`)
+)
 
 func decodeCloudTrail(r io.Reader) iter.Seq2[string, error] {
 	return func(yield func(string, error) bool) {

aws/logs_monitoring_go/internal/handling/cloudtrail_test.go

@@ -57,7 +57,7 @@ func TestCloudTrailRegex(t *testing.T) {
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			got := cloudTrailRegex().MatchString(tc.key)
+			got := cloudTrailRegex.MatchString(tc.key)
 			if got != tc.want {
 				t.Errorf("cloudTrailRegex().MatchString(%q) = %v, want %v", tc.key, got, tc.want)
 			}

aws/logs_monitoring_go/internal/handling/s3.go

@@ -77,7 +77,7 @@ func (h S3Handler) processRecord(ctx context.Context, client S3APIClient, out ch
 	}()
 
 	var records iter.Seq2[string, error]
-	isCloudTrail := cloudTrailRegex().MatchString(key)
+	isCloudTrail := cloudTrailRegex.MatchString(key)
 	if isCloudTrail {
 		records = decodeCloudTrail(body)
 	} else {