From 339ca93d9b2425c05c06f724f1bf20a940265fa9 Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Tue, 12 Apr 2022 16:48:38 +0100 Subject: [PATCH] Add support for migrating to Redis on PaaS Similarly to https://github.com/alphagov/notifications-api/pull/3508 --- app/cloudfoundry_config.py | 6 ++++++ tests/app/test_cloudfoundry_config.py | 26 ++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app/cloudfoundry_config.py b/app/cloudfoundry_config.py index ccd0a1fa1..8527127bb 100644 --- a/app/cloudfoundry_config.py +++ b/app/cloudfoundry_config.py @@ -8,6 +8,12 @@ import os def extract_cloudfoundry_config(): + vcap_services = json.loads(os.environ['VCAP_SERVICES']) + + # Redis config + if 'redis' in vcap_services: + os.environ['REDIS_URL'] = vcap_services['redis'][0]['credentials']['uri'] + vcap_application = json.loads(os.environ.get('VCAP_APPLICATION')) os.environ['NOTIFY_ENVIRONMENT'] = vcap_application['space_name'] os.environ['NOTIFY_LOG_PATH'] = '/home/vcap/logs/app.log' diff --git a/tests/app/test_cloudfoundry_config.py b/tests/app/test_cloudfoundry_config.py index d03aa29d4..6a321ec01 100644 --- a/tests/app/test_cloudfoundry_config.py +++ b/tests/app/test_cloudfoundry_config.py @@ -1,3 +1,4 @@ +import json import os import pytest @@ -6,12 +7,33 @@ from app.cloudfoundry_config import extract_cloudfoundry_config @pytest.fixture -def cloudfoundry_environ(os_environ): +def cloudfoundry_config(): + return { + 'redis': [{ + 'credentials': { + 'uri': 'redis uri' + } + }], + } + + +@pytest.fixture +def vcap_application(os_environ): os.environ['VCAP_APPLICATION'] = '{"space_name":"🚀🌌"}' -def test_extract_cloudfoundry_config_populates_other_vars(cloudfoundry_environ): +def test_extract_cloudfoundry_config_populates_other_vars(vcap_application, cloudfoundry_config): + os.environ['VCAP_SERVICES'] = json.dumps(cloudfoundry_config) extract_cloudfoundry_config() + assert os.environ['REDIS_URL'] == 'redis uri' assert os.environ['NOTIFY_ENVIRONMENT'] == '🚀🌌' assert os.environ['NOTIFY_LOG_PATH'] == '/home/vcap/logs/app.log' + + +def test_set_config_env_vars_copes_if_redis_not_set(vcap_application, cloudfoundry_config): + del cloudfoundry_config['redis'] + os.environ['VCAP_SERVICES'] = json.dumps(cloudfoundry_config) + + extract_cloudfoundry_config() + assert 'REDIS_URL' not in os.environ