Simplify deleting old letters

Previously we made a call to S3 to list objects for a letter, even
though we already had the precise key of the single object to hand.
This removes the one usage of "get_s3_bucket_objects" and uses the
filename directly in the call to remove the object.

app/aws/s3.py

@@ -69,22 +69,6 @@ def remove_contact_list_from_s3(service_id, contact_list_id):
     return remove_s3_object(*get_contact_list_location(service_id, contact_list_id))
 
 
-def get_s3_bucket_objects(bucket_name, subfolder=''):
-    boto_client = client('s3', current_app.config['AWS_REGION'])
-    paginator = boto_client.get_paginator('list_objects_v2')
-    page_iterator = paginator.paginate(
-        Bucket=bucket_name,
-        Prefix=subfolder
-    )
-
-    all_objects_in_bucket = []
-    for page in page_iterator:
-        if page.get('Contents'):
-            all_objects_in_bucket.extend(page['Contents'])
-
-    return all_objects_in_bucket
-
-
 def remove_s3_object(bucket_name, object_key):
     obj = get_s3_object(bucket_name, object_key)
     return obj.delete()

app/dao/notifications_dao.py

@@ -22,7 +22,7 @@ from sqlalchemy.sql.expression import case
 from werkzeug.datastructures import MultiDict
 
 from app import create_uuid, db
-from app.aws.s3 import get_s3_bucket_objects, remove_s3_object
+from app.aws.s3 import remove_s3_object
 from app.clients.sms.firetext import (
     get_message_status_and_reason_from_firetext_code,
 )
@@ -454,19 +454,11 @@ def _delete_letters_from_s3(
     ).limit(query_limit).all()
     for letter in letters_to_delete_from_s3:
         try:
-            prefix = find_letter_pdf_filename(letter)
-        except LetterPDFNotFound:
+            filename = find_letter_pdf_filename(letter)
+            remove_s3_object(bucket_name, filename)
+        except (ClientError, LetterPDFNotFound):
             current_app.logger.exception(
                 "Could not delete S3 object for letter: {}".format(letter.id))
-            continue
-
-        s3_objects = get_s3_bucket_objects(bucket_name=bucket_name, subfolder=prefix)
-        for s3_object in s3_objects:
-            try:
-                remove_s3_object(bucket_name, s3_object['Key'])
-            except ClientError:
-                current_app.logger.exception(
-                    "Could not delete S3 object with filename: {}".format(s3_object['Key']))
 
 
 @transactional