simplify event bridge source

Author: ndakkoune

aws/logs_monitoring_go/internal/handling/eventbridge.go

@@ -30,17 +30,16 @@ func NewEventBridge(cfg *config.Config) *EventBridgeHandler {
 }
 
 func (h *EventBridgeHandler) Handle(ctx context.Context, event json.RawMessage, out chan<- model.LogEntry) error {
-	ebSource, err := decodeEventBridgeSource(event)
-	if err != nil {
-		return err
-	}
-
 	lambdaOrigin, err := model.GetLambdaOrigin(ctx)
 	if err != nil {
 		return fmt.Errorf("get lambda origin: %w", err)
 	}
 
-	source := cmp.Or(h.cfg.Source, EventBridgeSource(ebSource))
+	ebSource, err := decodeEventBridgeSource(event)
+	if err != nil {
+		return err
+	}
+	source := cmp.Or(h.cfg.Source, ebSource)
 	service := cmp.Or(h.cfg.Service, source)
 
 	entry := model.NewLogEntry()
@@ -58,14 +57,6 @@ func (h *EventBridgeHandler) Handle(ctx context.Context, event json.RawMessage,
 	return concurrent.SafeSender(ctx, out, entry)
 }
 
-func EventBridgeSource(source string) string {
-	_, after, found := strings.Cut(source, ".")
-	if found {
-		return after
-	}
-	return sourceCloudwatch
-}
-
 func decodeEventBridgeSource(event json.RawMessage) (string, error) {
 	dec := json.NewDecoder(bytes.NewReader(event))
 
@@ -83,7 +74,7 @@ func decodeEventBridgeSource(event json.RawMessage) (string, error) {
 			if err := dec.Decode(&source); err != nil {
 				return "", fmt.Errorf("decode eventbridge source: %w", err)
 			}
-			return source, nil
+			return eventBridgeSource(source), nil
 		}
 		var skip json.RawMessage
 		if err := dec.Decode(&skip); err != nil {
@@ -93,3 +84,11 @@ func decodeEventBridgeSource(event json.RawMessage) (string, error) {
 
 	return "", nil
 }
+
+func eventBridgeSource(source string) string {
+	_, after, found := strings.Cut(source, ".")
+	if found {
+		return after
+	}
+	return sourceCloudwatch
+}

aws/logs_monitoring_go/internal/handling/eventbridge_test.go

@@ -35,7 +35,6 @@ func TestEventBridgeHandler_Handle(t *testing.T) {
 					Source:         "events",
 					SourceCategory: "aws",
 					Service:        "events",
-					Tags:           model.Tags{"service:events"},
 					Metadata:       testutil.LambdaOrigin(),
 				},
 			},
@@ -49,7 +48,6 @@ func TestEventBridgeHandler_Handle(t *testing.T) {
 					Source:         "ec2",
 					SourceCategory: "aws",
 					Service:        "ec2",
-					Tags:           model.Tags{"service:ec2"},
 					Metadata:       testutil.LambdaOrigin(),
 				},
 			},
@@ -63,7 +61,6 @@ func TestEventBridgeHandler_Handle(t *testing.T) {
 					Source:         "custom-source",
 					SourceCategory: "aws",
 					Service:        "custom-source",
-					Tags:           model.Tags{"service:custom-source"},
 					Metadata:       testutil.LambdaOrigin(),
 				},
 			},
@@ -119,14 +116,14 @@ func TestEventBridgeSource(t *testing.T) {
 		"aws.ec2":      {source: "aws.ec2", want: "ec2"},
 		"aws.s3":       {source: "aws.s3", want: "s3"},
 		"custom.app":   {source: "custom.app", want: "app"},
-		"no dot":        {source: "nodot", want: "cloudwatch"},
-		"empty string":  {source: "", want: "cloudwatch"},
+		"no dot":       {source: "nodot", want: "cloudwatch"},
+		"empty string": {source: "", want: "cloudwatch"},
 	}
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			got := EventBridgeSource(tc.source)
+			got := eventBridgeSource(tc.source)
 			if got != tc.want {
 				t.Errorf("got %q, want %q", got, tc.want)
 			}