From b85efc007c5a61f83e4c7b10f654e777d0cc51f8 Mon Sep 17 00:00:00 2001 From: Dylan Yang Date: Mon, 5 Dec 2022 17:06:57 -0500 Subject: [PATCH 1/2] type check detail field in event payload --- datadog_lambda/trigger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datadog_lambda/trigger.py b/datadog_lambda/trigger.py index 72285ead..ecd88cf6 100644 --- a/datadog_lambda/trigger.py +++ b/datadog_lambda/trigger.py @@ -138,8 +138,8 @@ def parse_event_source(event: dict) -> _EventSource: event_source = _EventSource(EventTypes.EVENTBRIDGE) event_detail = event.get("detail") - cw_event_categories = event_detail and event_detail.get("EventCategories") - if event.get("source") == "aws.events" or cw_event_categories: + has_event_categories = isinstance(event_detail, dict) and event_detail.get("EventCategories") is not None + if event.get("source") == "aws.events" or has_event_categories: event_source = _EventSource(EventTypes.CLOUDWATCH_EVENTS) event_record = get_first_record(event) From 38df8bbb841c970c9309d2549b0c69a8a751d29c Mon Sep 17 00:00:00 2001 From: Dylan Yang Date: Mon, 5 Dec 2022 17:17:38 -0500 Subject: [PATCH 2/2] formatting --- datadog_lambda/trigger.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/datadog_lambda/trigger.py b/datadog_lambda/trigger.py index ecd88cf6..0576e3f9 100644 --- a/datadog_lambda/trigger.py +++ b/datadog_lambda/trigger.py @@ -138,7 +138,10 @@ def parse_event_source(event: dict) -> _EventSource: event_source = _EventSource(EventTypes.EVENTBRIDGE) event_detail = event.get("detail") - has_event_categories = isinstance(event_detail, dict) and event_detail.get("EventCategories") is not None + has_event_categories = ( + isinstance(event_detail, dict) + and event_detail.get("EventCategories") is not None + ) if event.get("source") == "aws.events" or has_event_categories: event_source = _EventSource(EventTypes.CLOUDWATCH_EVENTS)