darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 09:26:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1501 from GSA/notify-api-1465

Browse Source 
fix json structure bug in mass updates
This commit is contained in:
Kenneth Kehl
2024-12-26 07:15:08 -08:00
committed by GitHub
parent d5e1008b19 05755cb317
commit 73d7ddfab0
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/clients/cloudwatch/aws_cloudwatch.py
View File

@@ -100,12 +100,20 @@ class AwsCloudwatchClient(Client):
if isinstance(event, str): if isinstance(event, str):
event = json.loads(event) event = json.loads(event)
# Don't trust AWS to always send the same JSON structure back
# However, if we don't get message_id and status we might as well blow up
# because it's pointless to continue
phone_carrier = self._aws_value_or_default(event, "delivery", "phoneCarrier")
provider_response = self._aws_value_or_default(
event, "delivery", "providerResponse"
)
my_timestamp = self._aws_value_or_default(event, "notification", "timestamp")
return { return {
"notification.messageId": event["notification"]["messageId"], "notification.messageId": event["notification"]["messageId"],
"status": event["status"], "status": event["status"],
"delivery.phoneCarrier": event["delivery"]["phoneCarrier"], "delivery.phoneCarrier": phone_carrier,
"delivery.providerResponse": event["delivery"]["providerResponse"], "delivery.providerResponse": provider_response,
"@timestamp": event["notification"]["timestamp"], "@timestamp": my_timestamp,
} }
# Here is an example of how to get the events with log insights # Here is an example of how to get the events with log insights
@@ -155,16 +163,34 @@ class AwsCloudwatchClient(Client):
account_number = self._extract_account_number(cloud_config.ses_domain_arn) account_number = self._extract_account_number(cloud_config.ses_domain_arn)
log_group_name = f"sns/{region}/{account_number[4]}/DirectPublishToPhoneNumber" log_group_name = f"sns/{region}/{account_number[4]}/DirectPublishToPhoneNumber"
delivered_event_set = self._get_receipts(log_group_name, start, end) delivered_event_set = self._get_receipts(log_group_name, start, end)
current_app.logger.info(
(f"Delivered message count: {len(delivered_event_set)}")
)
log_group_name = ( log_group_name = (
f"sns/{region}/{account_number[4]}/DirectPublishToPhoneNumber/Failure" f"sns/{region}/{account_number[4]}/DirectPublishToPhoneNumber/Failure"
) )
failed_event_set = self._get_receipts(log_group_name, start, end) failed_event_set = self._get_receipts(log_group_name, start, end)
current_app.logger.info((f"Failed message count: {len(failed_event_set)}"))
return delivered_event_set, failed_event_set return delivered_event_set, failed_event_set
def _get_receipts(self, log_group_name, start, end): def _get_receipts(self, log_group_name, start, end):
event_set = set() event_set = set()
all_events = self._get_log(log_group_name, start, end) all_events = self._get_log(log_group_name, start, end)
for event in all_events: for event in all_events:
actual_event = self.event_to_db_format(event["message"]) try:
event_set.add(json.dumps(actual_event)) actual_event = self.event_to_db_format(event["message"])
event_set.add(json.dumps(actual_event))
except Exception:
current_app.logger.exception(
f"Could not format delivery receipt {event} for db insert"
)
return event_set return event_set
def _aws_value_or_default(self, event, top_level, second_level):
if event.get(top_level) is None or event[top_level].get(second_level) is None:
my_var = ""
else:
my_var = event[top_level][second_level]
return my_var