darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 17:31:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3517 from alphagov/paas-redis

Browse Source 
bind to notify-redis automatically
This commit is contained in:
Leo Hemsted
2022-04-20 11:53:19 +01:00
committed by GitHub
parent f67f5d987d 0457850fc0
commit 072c3b2079
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/cloudfoundry_config.py
View File

@@ -9,5 +9,4 @@ def extract_cloudfoundry_config():
os.environ['SQLALCHEMY_DATABASE_URI'] = vcap_services['postgres'][0]['credentials']['uri'].replace('postgres', os.environ['SQLALCHEMY_DATABASE_URI'] = vcap_services['postgres'][0]['credentials']['uri'].replace('postgres',
'postgresql') 'postgresql')
# Redis config # Redis config
if 'redis' in vcap_services: os.environ['REDIS_URL'] = vcap_services['redis'][0]['credentials']['uri']
os.environ['REDIS_URL'] = vcap_services['redis'][0]['credentials']['uri']

2
manifest.yml.j2
View File

@@ -99,6 +99,7 @@ applications:
services: services:
- notify-db - notify-db
- notify-redis
- logit-ssl-syslog-drain - logit-ssl-syslog-drain
{% if CF_APP == 'notify-api' %} {% if CF_APP == 'notify-api' %}
- notify-prometheus - notify-prometheus
@@ -144,7 +145,6 @@ applications:
FIRETEXT_INBOUND_SMS_AUTH: '{{ FIRETEXT_INBOUND_SMS_AUTH | tojson }}' FIRETEXT_INBOUND_SMS_AUTH: '{{ FIRETEXT_INBOUND_SMS_AUTH | tojson }}'
REDIS_ENABLED: '{{ REDIS_ENABLED }}' REDIS_ENABLED: '{{ REDIS_ENABLED }}'
REDIS_URL: '{{ REDIS_URL }}'
TEMPLATE_PREVIEW_API_HOST: '{{ TEMPLATE_PREVIEW_API_HOST }}' TEMPLATE_PREVIEW_API_HOST: '{{ TEMPLATE_PREVIEW_API_HOST }}'
TEMPLATE_PREVIEW_API_KEY: '{{ TEMPLATE_PREVIEW_API_KEY }}' TEMPLATE_PREVIEW_API_KEY: '{{ TEMPLATE_PREVIEW_API_KEY }}'

8
tests/app/test_cloudfoundry_config.py
View File

@@ -29,11 +29,3 @@ def test_extract_cloudfoundry_config_populates_other_vars(os_environ, vcap_servi
assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgresql uri' assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgresql uri'
assert os.environ['REDIS_URL'] == 'redis uri' assert os.environ['REDIS_URL'] == 'redis uri'
def test_extract_cloudfoundry_config_copes_if_redis_not_set(os_environ, vcap_services):
del vcap_services['redis']
os.environ['VCAP_SERVICES'] = json.dumps(vcap_services)
extract_cloudfoundry_config()
assert 'REDIS_URL' not in os.environ