Refactor method of retrieving credentials out of VCAP_SERVICES

tests/app/main/views/uploads/test_upload_contact_list.py

@@ -208,7 +208,7 @@ def test_upload_csv_file_shows_error_banner(
     mock_upload.assert_called_once_with(
         filedata='',
         region='us-west-2',
-        bucket_name='test-contact-list',
+        bucket_name='local-contact-list',
         file_location=f"service-{SERVICE_ONE_ID}-notify/{fake_uuid}.csv",
         access_key=default_access_key,
         secret_key=default_secret_key,

tests/app/s3_client/test_s3_csv_client.py

@@ -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(bucket_name='test-notifications-csv-upload', key='service-1234-notify/5678.csv')
+    mocked_s3_object = Mock(bucket_name='local-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,
@@ -14,7 +14,7 @@ def test_sets_metadata(client_request, mocker):
 
     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',
+        CopySource='local-notifications-csv-upload/service-1234-notify/5678.csv',
         Metadata={'baz': 'True', 'foo': 'bar'},
         MetadataDirective='REPLACE',
         ServerSideEncryption='AES256',

tests/app/s3_client/test_s3_logo_client.py

@@ -21,6 +21,12 @@ from app.s3_client.s3_logo_client import (
 )
 
 bucket = 'test_bucket'
+bucket_credentials = {
+    'bucket': bucket,
+    'access_key_id': default_access_key,
+    'secret_access_key': default_secret_key,
+    'region': default_region
+}
 data = {'data': 'some_data'}
 filename = 'test.png'
 svg_filename = 'test.svg'
@@ -45,7 +51,7 @@ def letter_upload_filename(fake_uuid):
 
 def test_upload_email_logo_calls_correct_args(client_request, mocker, fake_uuid, upload_filename):
     mocker.patch('uuid.uuid4', return_value=upload_id)
-    mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET_NAME': bucket})
+    mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET': bucket_credentials})
     mocked_s3_upload = mocker.patch('app.s3_client.s3_logo_client.utils_s3upload')
 
     upload_email_logo(filename=filename, user_id=fake_uuid, filedata=data)
@@ -63,7 +69,7 @@ def test_upload_email_logo_calls_correct_args(client_request, mocker, fake_uuid,
 
 def test_upload_letter_temp_logo_calls_correct_args(mocker, fake_uuid, letter_upload_filename):
     mocker.patch('uuid.uuid4', return_value=upload_id)
-    mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET_NAME': bucket})
+    mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET': bucket_credentials})
     mocked_s3_upload = mocker.patch('app.s3_client.s3_logo_client.utils_s3upload')
 
     new_filename = upload_letter_temp_logo(filename=svg_filename, user_id=fake_uuid, filedata=data)
@@ -81,7 +87,7 @@ def test_upload_letter_temp_logo_calls_correct_args(mocker, fake_uuid, letter_up
 
 
 def test_persist_logo(client_request, mocker, fake_uuid, upload_filename):
-    mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET_NAME': bucket})
+    mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET': bucket_credentials})
     mocked_get_s3_object = mocker.patch('app.s3_client.s3_logo_client.get_s3_object')
     mocked_delete_s3_object = mocker.patch('app.s3_client.s3_logo_client.delete_s3_object')
 

tests/app/test_cloudfoundry_config.py

@@ -3,7 +3,14 @@ import os
 
 import pytest
 
-from app.cloudfoundry_config import extract_cloudfoundry_config
+from app.cloudfoundry_config import CloudfoundryConfig
+
+bucket_credentials = {
+    'access_key_id': 'contact-list-access',
+    'bucket': 'contact-list-bucket',
+    'region': 'us-gov-west-1',
+    'secret_access_key': 'contact-list-secret'
+}
 
 
 @pytest.fixture
@@ -26,22 +33,39 @@ def vcap_services():
             },
             {
                 'name': 'notifications-api-contact-list-bucket-test',
-                'credentials': {
-                    'access_key_id': 'contact-list-access',
-                    'bucket': 'contact-list-bucket',
-                    'region': 'us-gov-west-1',
-                    'secret_access_key': 'contact-list-secret'
-                }
+                'credentials': bucket_credentials
             }
         ],
     }
 
 
-def test_extract_cloudfoundry_config_populates_other_vars(os_environ, vcap_services):
-    os.environ['DEPLOY_ENV'] = 'test'
+def test_redis_url(vcap_services):
     os.environ['VCAP_SERVICES'] = json.dumps(vcap_services)
-    extract_cloudfoundry_config()
 
-    assert os.environ['REDIS_URL'] == 'rediss://xxx:6379'
-    assert os.environ['CSV_UPLOAD_BUCKET_NAME'] == 'csv-upload-bucket'
-    assert os.environ['CONTACT_LIST_BUCKET_NAME'] == 'contact-list-bucket'
+    assert CloudfoundryConfig().redis_url == 'rediss://xxx:6379'
+
+
+def test_redis_url_falls_back_to_REDIS_URL():
+    expected = 'rediss://yyy:6379'
+    os.environ['REDIS_URL'] = expected
+    os.environ['VCAP_SERVICES'] = ""
+
+    assert CloudfoundryConfig().redis_url == expected
+
+
+def test_s3_bucket_credentials(vcap_services):
+    os.environ['VCAP_SERVICES'] = json.dumps(vcap_services)
+
+    assert CloudfoundryConfig().s3_credentials('notifications-api-contact-list-bucket-test') == bucket_credentials
+
+
+def test_s3_bucket_credentials_falls_back_to_empty_creds():
+    os.environ['VCAP_SERVICES'] = ""
+    expected = {
+        'bucket': '',
+        'access_key_id': '',
+        'secret_access_key': '',
+        'region': ''
+    }
+
+    assert CloudfoundryConfig().s3_credentials('bucket') == expected

tests/app/test_config.py

@@ -1,53 +0,0 @@
-import importlib
-import os
-from unittest import mock
-
-import pytest
-
-from app import config
-
-
-def cf_conf():
-    os.environ['REDIS_URL'] = 'rediss://xxx:6379'
-
-
-@pytest.fixture
-def reload_config(os_environ):
-    """
-    Reset config, by simply re-running config.py from a fresh environment
-    """
-    old_env = os.environ.copy()
-    os.environ.clear()
-
-    yield
-
-    os.environ.clear()
-    for k, v in old_env.items():
-        os.environ[k] = v
-    importlib.reload(config)
-
-
-def test_load_cloudfoundry_config_if_available(reload_config):
-    os.environ['REDIS_URL'] = 'some uri'
-    os.environ['VCAP_SERVICES'] = 'some json blob'
-
-    with mock.patch('app.cloudfoundry_config.extract_cloudfoundry_config', side_effect=cf_conf):
-        # reload config so that its module level code (ie: all of it) is re-instantiated
-        importlib.reload(config)
-
-    assert os.environ['REDIS_URL'] == 'rediss://xxx:6379'
-    assert config.Config.REDIS_URL == 'rediss://xxx:6379'
-
-
-def test_load_config_if_cloudfoundry_not_available(reload_config):
-    os.environ['REDIS_URL'] = 'redis://xxx:6379'
-    os.environ.pop('VCAP_SERVICES', None)
-
-    with mock.patch('app.cloudfoundry_config.extract_cloudfoundry_config') as cf_config:
-        # reload config so that its module level code (ie: all of it) is re-instantiated
-        importlib.reload(config)
-
-    assert not cf_config.called
-
-    assert os.environ['REDIS_URL'] == 'redis://xxx:6379'
-    assert config.Config.REDIS_URL == 'redis://xxx:6379'