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

Update config to new s3 bucket names

Browse Source
This commit is contained in:
Ken Tsang
2017-08-02 11:05:17 +01:00
parent 81d8494755
commit 6c18c9d6ac
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/config.py
View File

@@ -87,7 +87,7 @@ class Config(object):
r"cqc\.org\.uk", r"cqc\.org\.uk",
] ]
LOGO_UPLOAD_BUCKET_NAME = 'local-notifications-logo-upload' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local'
class Development(Config): class Development(Config):
@@ -105,7 +105,7 @@ class Test(Development):
STATSD_ENABLED = True STATSD_ENABLED = True
WTF_CSRF_ENABLED = False WTF_CSRF_ENABLED = False
CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'test-notifications-logo-upload' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-test'
NOTIFY_ENVIRONMENT = 'test' NOTIFY_ENVIRONMENT = 'test'
TEMPLATE_PREVIEW_API_HOST = 'http://localhost:9999' TEMPLATE_PREVIEW_API_HOST = 'http://localhost:9999'
@@ -115,7 +115,7 @@ class Preview(Config):
HEADER_COLOUR = '#F499BE' # $baby-pink HEADER_COLOUR = '#F499BE' # $baby-pink
STATSD_ENABLED = True STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'preview-notifications-logo-upload' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-preview'
NOTIFY_ENVIRONMENT = 'preview' NOTIFY_ENVIRONMENT = 'preview'
@@ -125,7 +125,7 @@ class Staging(Config):
HEADER_COLOUR = '#6F72AF' # $mauve HEADER_COLOUR = '#6F72AF' # $mauve
STATSD_ENABLED = True STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'staging-notifications-logo-upload' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-staging'
NOTIFY_ENVIRONMENT = 'staging' NOTIFY_ENVIRONMENT = 'staging'
@@ -135,7 +135,7 @@ class Live(Config):
HTTP_PROTOCOL = 'https' HTTP_PROTOCOL = 'https'
STATSD_ENABLED = True STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'live-notifications-logo-upload' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-live'
NOTIFY_ENVIRONMENT = 'live' NOTIFY_ENVIRONMENT = 'live'

4
tests/app/test_utils.py
View File

@@ -159,6 +159,7 @@ def test_generate_notifications_csv_calls_twice_if_next_link(mocker):
assert mock_get_notifications.mock_calls[1][2]['page'] == 2 assert mock_get_notifications.mock_calls[1][2]['page'] == 2
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
@freeze_time('2017-07-14 14:59:59') # Friday, before print deadline @freeze_time('2017-07-14 14:59:59') # Friday, before print deadline
@pytest.mark.parametrize('upload_time, expected_print_time, is_printed, expected_earliest, expected_latest', [ @pytest.mark.parametrize('upload_time, expected_print_time, is_printed, expected_earliest, expected_latest', [
@@ -298,6 +299,9 @@ def test_get_estimated_delivery_date_for_letter(
>>>>>>> Update emails to use logos cdn >>>>>>> Update emails to use logos cdn
def test_get_cdn_domain_on_localhost(client, mocker): def test_get_cdn_domain_on_localhost(client, mocker):
mocker.patch.dict('app.current_app.config', values={'ADMIN_BASE_URL': 'http://localhost:6012'}) mocker.patch.dict('app.current_app.config', values={'ADMIN_BASE_URL': 'http://localhost:6012'})
=======
def test_get_cdn_domain_on_localhost(client):
>>>>>>> Update config to new s3 bucket names
domain = get_cdn_domain() domain = get_cdn_domain()
assert domain == 'static-logos.notify.tools' assert domain == 'static-logos.notify.tools'