darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 14:09:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Provide s3 credentials for each individual bucket

Browse Source
This commit is contained in:
Ryan Ahearn
2022-09-22 12:33:55 -04:00
parent 7ce9f8cfcb
commit a90dcc918b
13 changed files with 211 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/s3_client/test_s3_csv_client.py
View File

@@ -4,7 +4,7 @@ from app.s3_client.s3_csv_client import set_metadata_on_csv_upload
def test_sets_metadata(client_request, mocker):
mocked_s3_object = Mock()
mocked_s3_object = Mock(bucket_name='test-notifications-csv-upload', key='service-1234-notify/5678.csv')
mocked_get_s3_object = mocker.patch(
'app.s3_client.s3_csv_client.get_csv_upload',
return_value=mocked_s3_object,
@@ -12,7 +12,7 @@ def test_sets_metadata(client_request, mocker):
set_metadata_on_csv_upload('1234', '5678', foo='bar', baz=True)
mocked_get_s3_object.assert_called_once_with('1234', '5678', bucket=None)
mocked_get_s3_object.assert_called_once_with('1234', '5678')
mocked_s3_object.copy_from.assert_called_once_with(
CopySource='test-notifications-csv-upload/service-1234-notify/5678.csv',
Metadata={'baz': 'True', 'foo': 'bar'},

11
tests/app/s3_client/test_s3_logo_client.py
View File

@@ -3,6 +3,7 @@ from unittest.mock import call
import pytest
from app.s3_client import default_access_key, default_secret_key
from app.s3_client.s3_logo_client import (
EMAIL_LOGO_LOCATION_STRUCTURE,
LETTER_TEMP_LOGO_LOCATION,
@@ -54,7 +55,9 @@ def test_upload_email_logo_calls_correct_args(client_request, mocker, fake_uuid,
region=region,
file_location=upload_filename,
bucket_name=bucket,
content_type='image/png'
content_type='image/png',
access_key=default_access_key,
secret_key=default_secret_key,
)
@@ -70,7 +73,9 @@ def test_upload_letter_temp_logo_calls_correct_args(mocker, fake_uuid, letter_up
region=region,
bucket_name=bucket,
file_location=letter_upload_filename,
content_type='image/svg+xml'
content_type='image/svg+xml',
access_key=default_access_key,
secret_key=default_secret_key,
)
assert new_filename == 'letters/static/images/letter-template/temp-{}_test_uuid-test.svg'.format(fake_uuid)
@@ -84,7 +89,7 @@ def test_persist_logo(client_request, mocker, fake_uuid, upload_filename):
persist_logo(upload_filename, new_filename)
mocked_get_s3_object.assert_called_once_with(bucket, new_filename)
mocked_get_s3_object.assert_called_once_with(bucket, new_filename, default_access_key, default_secret_key)
mocked_delete_s3_object.assert_called_once_with(upload_filename)