This commit is contained in:
Kenneth Kehl
2023-08-29 14:54:30 -07:00
parent 19dcd7a48b
commit 1ecb747c6d
588 changed files with 34100 additions and 23589 deletions

View File

@@ -19,7 +19,7 @@ class AwsCloudwatchClient(Client):
region_name=cloud_config.sns_region,
aws_access_key_id=cloud_config.sns_access_key,
aws_secret_access_key=cloud_config.sns_secret_key,
config=AWS_CLIENT_CONFIG
config=AWS_CLIENT_CONFIG,
)
super(Client, self).__init__(*args, **kwargs)
self.current_app = current_app
@@ -27,10 +27,9 @@ class AwsCloudwatchClient(Client):
@property
def name(self):
return 'cloudwatch'
return "cloudwatch"
def _get_log(self, my_filter, log_group_name, sent_at):
# Check all cloudwatch logs from the time the notification was sent (currently 5 minutes previously) until now
now = round(time.time() * 1000)
beginning = sent_at
@@ -43,48 +42,51 @@ class AwsCloudwatchClient(Client):
filterPattern=my_filter,
nextToken=next_token,
startTime=beginning,
endTime=now
endTime=now,
)
else:
response = self._client.filter_log_events(
logGroupName=log_group_name,
filterPattern=my_filter,
startTime=beginning,
endTime=now
endTime=now,
)
log_events = response.get('events', [])
log_events = response.get("events", [])
all_log_events.extend(log_events)
if len(log_events) > 0:
# We found it
break
next_token = response.get('nextToken')
next_token = response.get("nextToken")
if not next_token:
break
return all_log_events
def check_sms(self, message_id, notification_id, created_at):
# TODO this clumsy approach to getting the account number will be fixed as part of notify-api #258
account_number = cloud_config.ses_domain_arn
account_number = account_number.replace('arn:aws:ses:us-west-2:', '')
account_number = account_number.replace("arn:aws:ses:us-west-2:", "")
account_number = account_number.split(":")
account_number = account_number[0]
log_group_name = f'sns/us-west-2/{account_number}/DirectPublishToPhoneNumber'
log_group_name = f"sns/us-west-2/{account_number}/DirectPublishToPhoneNumber"
filter_pattern = '{$.notification.messageId="XXXXX"}'
filter_pattern = filter_pattern.replace("XXXXX", message_id)
all_log_events = self._get_log(filter_pattern, log_group_name, created_at)
if all_log_events and len(all_log_events) > 0:
event = all_log_events[0]
message = json.loads(event['message'])
return "success", message['delivery']['providerResponse']
message = json.loads(event["message"])
return "success", message["delivery"]["providerResponse"]
log_group_name = f'sns/us-west-2/{account_number}/DirectPublishToPhoneNumber/Failure'
log_group_name = (
f"sns/us-west-2/{account_number}/DirectPublishToPhoneNumber/Failure"
)
all_failed_events = self._get_log(filter_pattern, log_group_name, created_at)
if all_failed_events and len(all_failed_events) > 0:
event = all_failed_events[0]
message = json.loads(event['message'])
return "failure", message['delivery']['providerResponse']
message = json.loads(event["message"])
return "failure", message["delivery"]["providerResponse"]
raise Exception(f'No event found for message_id {message_id} notification_id {notification_id}')
raise Exception(
f"No event found for message_id {message_id} notification_id {notification_id}"
)