Properly set database connection string in cloud.gov

app/cloudfoundry_config.py

@@ -14,6 +14,10 @@ class CloudfoundryConfig:
             'region': ''
         }
 
+    @property
+    def database_url(self):
+        return os.environ.get('DATABASE_URL', '').replace('postgres://', 'postgresql://')
+
     @property
     def redis_url(self):
         try:

app/config.py

@@ -87,7 +87,7 @@ class Config(object):
     ROUTE_SECRET_KEY_2 = os.environ.get('ROUTE_SECRET_KEY_2', 'dev-route-secret-key-2')
 
     # DB settings
-    SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI')
+    SQLALCHEMY_DATABASE_URI = cloud_config.database_url
     SQLALCHEMY_RECORD_QUERIES = False
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     SQLALCHEMY_POOL_SIZE = int(os.environ.get('SQLALCHEMY_POOL_SIZE', 5))

sample.env

@@ -28,14 +28,14 @@ AWS_US_TOLL_FREE_NUMBER=+18446120782
 ADMIN_BASE_URL=http://admin:6012
 API_HOST_NAME=http://dev:6011
 REDIS_URL=redis://redis:6380
-SQLALCHEMY_DATABASE_URI=postgresql://postgres:chummy@db:5432/notification_api
+DATABASE_URL=postgresql://postgres:chummy@db:5432/notification_api
 SQLALCHEMY_DATABASE_TEST_URI=postgresql://postgres:chummy@db:5432/test_notification_api
 
 # Local direct setup, all overwritten in cloud.gov
 # ADMIN_BASE_URL=http://localhost:6012
 # API_HOST_NAME=http://localhost:6011
 # REDIS_URL=redis://localhost:6379
-# SQLALCHEMY_DATABASE_URI=postgresql://localhost:5432/notification_api
+# DATABASE_URL=postgresql://localhost:5432/notification_api
 # SQLALCHEMY_DATABASE_TEST_URI=postgresql://localhost:5432/test_notification_api
 
 #############################################################

tests/app/test_cloudfoundry_config.py

@@ -5,12 +5,13 @@ import pytest
 
 from app.cloudfoundry_config import CloudfoundryConfig
 
-bucket_credentials = {
+_bucket_credentials = {
     'access_key_id': 'csv-access',
     'bucket': 'csv-upload-bucket',
     'region': 'us-gov-west-1',
     'secret_access_key': 'csv-secret'
 }
+_postgres_url = 'postgres://postgres:password@localhost:5432/db_name'
 
 
 @pytest.fixture
@@ -18,7 +19,7 @@ def vcap_services():
     return {
         'aws-rds': [{
             'credentials': {
-                'uri': 'postgres uri'
+                'uri': _postgres_url
             }
         }],
         'aws-elasticache-redis': [{
@@ -29,7 +30,7 @@ def vcap_services():
         's3': [
             {
                 'name': 'notifications-api-csv-upload-bucket-test',
-                'credentials': bucket_credentials
+                'credentials': _bucket_credentials
             },
             {
                 'name': 'notifications-api-contact-list-bucket-test',
@@ -45,6 +46,12 @@ def vcap_services():
     }
 
 
+def test_database_url(vcap_services):
+    os.environ['DATABASE_URL'] = _postgres_url
+
+    assert CloudfoundryConfig().database_url == 'postgresql://postgres:password@localhost:5432/db_name'
+
+
 def test_redis_url(vcap_services):
     os.environ['VCAP_SERVICES'] = json.dumps(vcap_services)
 
@@ -62,7 +69,7 @@ def test_redis_url_falls_back_to_REDIS_URL():
 def test_s3_bucket_credentials(vcap_services):
     os.environ['VCAP_SERVICES'] = json.dumps(vcap_services)
 
-    assert CloudfoundryConfig().s3_credentials('notifications-api-csv-upload-bucket-test') == bucket_credentials
+    assert CloudfoundryConfig().s3_credentials('notifications-api-csv-upload-bucket-test') == _bucket_credentials
 
 
 def test_s3_bucket_credentials_falls_back_to_empty_creds():