darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 17:01:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

don't use cloudfront on preview or staging

Browse Source 
cloudfront caching isn't set up on those environments yet, so continue
to use flask for now - in the future we'll want to revert this once
those environments are up and running properly
This commit is contained in:
Leo Hemsted
2016-12-29 12:14:47 +00:00
parent 9e27574298
commit d4f23f1e44
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/delivery/send_to_providers.py
View File

@@ -135,8 +135,11 @@ def get_logo_url(base_url, branding_path, logo_file):
base_url = parse.urlparse(base_url) base_url = parse.urlparse(base_url)
netloc = base_url.netloc netloc = base_url.netloc
if base_url.netloc.startswith('localhost'): if (
netloc = 'localhost:6012' base_url.netloc.startswith('localhost') or
# covers both preview and staging
'notify.works' in base_url.netloc
):
path = '/static' + branding_path + logo_file path = '/static' + branding_path + logo_file
else: else:
if base_url.netloc.startswith('www'): if base_url.netloc.startswith('www'):

11
tests/app/delivery/test_send_to_providers.py
View File

@@ -397,8 +397,15 @@ def test_get_html_email_renderer_prepends_logo_path(notify_api):
('http://localhost:6012', 'http://localhost:6012/static/sub-path/filename.png'), ('http://localhost:6012', 'http://localhost:6012/static/sub-path/filename.png'),
# on other environments, replace www with staging # on other environments, replace www with staging
('https://www.notifications.service.gov.uk', 'https://static.notifications.service.gov.uk/sub-path/filename.png'), ('https://www.notifications.service.gov.uk', 'https://static.notifications.service.gov.uk/sub-path/filename.png'),
('https://www.notify.works', 'https://static.notify.works/sub-path/filename.png'),
('https://notify.works', 'https://static.notify.works/sub-path/filename.png'), # staging and preview do not have cloudfront running, so should act as localhost
pytest.mark.xfail(('https://www.notify.works', 'https://static.notify.works/sub-path/filename.png')),
pytest.mark.xfail(('https://www.staging-notify.works', 'https://static.notify.works/sub-path/filename.png')),
pytest.mark.xfail(('https://notify.works', 'https://static.notify.works/sub-path/filename.png')),
pytest.mark.xfail(('https://staging-notify.works', 'https://static.notify.works/sub-path/filename.png')),
# these tests should be removed when cloudfront works on staging/preview
('https://www.notify.works', 'https://www.notify.works/static/sub-path/filename.png'),
('https://www.staging-notify.works', 'https://www.staging-notify.works/static/sub-path/filename.png'),
]) ])
def test_get_logo_url_works_for_different_environments(base_url, expected_url): def test_get_logo_url_works_for_different_environments(base_url, expected_url):
branding_path = '/sub-path/' branding_path = '/sub-path/'