Use correct access credentials for each bucket

tests/app/aws/test_s3.py

@@ -1,3 +1,4 @@
+import os
 from datetime import datetime, timedelta
 
 import pytest
@@ -22,7 +23,9 @@ def test_get_s3_file_makes_correct_call(notify_api, mocker):
 
     get_s3_mock.assert_called_with(
         'foo-bucket',
-        'bar-file.txt'
+        'bar-file.txt',
+        os.environ['AWS_ACCESS_KEY_ID'],
+        os.environ['AWS_SECRET_ACCESS_KEY']
     )
 
 

tests/app/celery/test_ftp_update_tasks.py

@@ -1,3 +1,4 @@
+import os
 from collections import defaultdict, namedtuple
 from datetime import date, datetime
 
@@ -90,7 +91,9 @@ def test_update_letter_notifications_statuses_calls_with_correct_bucket_location
         update_letter_notifications_statuses(filename='NOTIFY-20170823160812-RSP.TXT')
         s3_mock.assert_called_with('{}-ftp'.format(
             current_app.config['NOTIFY_EMAIL_DOMAIN']),
-            'NOTIFY-20170823160812-RSP.TXT'
+            'NOTIFY-20170823160812-RSP.TXT',
+            os.environ['AWS_ACCESS_KEY_ID'],
+            os.environ['AWS_SECRET_ACCESS_KEY']
         )
 
 

tests/app/test_cloudfoundry_config.py

@@ -23,13 +23,17 @@ def vcap_services():
             {
                 'name': 'notifications-api-csv-upload-bucket-test',
                 'credentials': {
-                    'bucket': 'csv-upload-bucket'
+                    'access_key_id': 'csv-access',
+                    'bucket': 'csv-upload-bucket',
+                    'secret_access_key': 'csv-secret'
                 }
             },
             {
                 'name': 'notifications-api-contact-list-bucket-test',
                 'credentials': {
-                    'bucket': 'contact-list-bucket'
+                    'access_key_id': 'contact-access',
+                    'bucket': 'contact-list-bucket',
+                    'secret_access_key': 'contact-secret'
                 }
             }
         ],