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

add test

Browse Source
This commit is contained in:
Kenneth Kehl
2024-09-10 11:12:43 -07:00
parent e236ed6404
commit 4e9e014a0c
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ds.baseline
View File

@@ -209,7 +209,7 @@
"filename": "tests/app/aws/test_s3.py", "filename": "tests/app/aws/test_s3.py",
"hashed_secret": "67a74306b06d0c01624fe0d0249a570f4d093747", "hashed_secret": "67a74306b06d0c01624fe0d0249a570f4d093747",
"is_verified": false, "is_verified": false,
"line_number": 25, "line_number": 27,
"is_secret": false "is_secret": false
} }
], ],
@@ -384,5 +384,5 @@
} }
] ]
}, },
"generated_at": "2024-08-22T18:00:24Z" "generated_at": "2024-09-10T18:12:39Z"
} }

8
app/aws/s3.py
View File

@@ -82,15 +82,21 @@ def list_s3_objects():
) )
def get_bucket_name():
return current_app.config["CSV_UPLOAD_BUCKET"]["bucket"]
def cleanup_old_s3_objects(): def cleanup_old_s3_objects():
bucket_name = current_app.config["CSV_UPLOAD_BUCKET"]["bucket"] bucket_name = get_bucket_name()
s3_client = get_s3_client() s3_client = get_s3_client()
# Our reports only support 7 days, but can be scheduled 3 days in advance # Our reports only support 7 days, but can be scheduled 3 days in advance
# Use 14 day for the v1.0 version of this behavior # Use 14 day for the v1.0 version of this behavior
time_limit = aware_utcnow() - datetime.timedelta(days=14) time_limit = aware_utcnow() - datetime.timedelta(days=14)
try: try:
response = s3_client.list_objects_v2(Bucket=bucket_name) response = s3_client.list_objects_v2(Bucket=bucket_name)
print(f"RESPONSE = {response}")
while True: while True:
for obj in response.get("Contents", []): for obj in response.get("Contents", []):
if obj["LastModified"] <= time_limit: if obj["LastModified"] <= time_limit:

14
tests/app/aws/test_s3.py
View File

@@ -5,6 +5,7 @@ import pytest
from botocore.exceptions import ClientError from botocore.exceptions import ClientError
from app.aws.s3 import ( from app.aws.s3 import (
cleanup_old_s3_objects,
file_exists, file_exists,
get_job_from_s3, get_job_from_s3,
get_personalisation_from_s3, get_personalisation_from_s3,
@@ -14,6 +15,7 @@ from app.aws.s3 import (
remove_s3_object, remove_s3_object,
) )
from app.utils import utc_now from app.utils import utc_now
from notifications_utils import aware_utcnow
default_access_key = getenv("CSV_AWS_ACCESS_KEY_ID") default_access_key = getenv("CSV_AWS_ACCESS_KEY_ID")
default_secret_key = getenv("CSV_AWS_SECRET_ACCESS_KEY") default_secret_key = getenv("CSV_AWS_SECRET_ACCESS_KEY")
@@ -28,6 +30,18 @@ def single_s3_object_stub(key="foo", last_modified=None):
} }
def test_cleanup_old_s3_objects(mocker):
mocker.patch("app.aws.s3.get_bucket_name", return_value="Bucket")
mock_s3_client = mocker.Mock()
mocker.patch("app.aws.s3.get_s3_client", return_value=mock_s3_client)
mock_s3_client.list_objects_v2.return_value = {
"Contents": [{"Key": "A", "LastModified": aware_utcnow()}]
}
cleanup_old_s3_objects()
mock_s3_client.list_objects_v2.assert_called_with(Bucket="Bucket")
def test_get_s3_file_makes_correct_call(notify_api, mocker): def test_get_s3_file_makes_correct_call(notify_api, mocker):
get_s3_mock = mocker.patch("app.aws.s3.get_s3_object") get_s3_mock = mocker.patch("app.aws.s3.get_s3_object")
get_s3_file( get_s3_file(