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

Revert "Specify sslmode in Cloud Foundry environment variables"

Browse Source
This commit is contained in:
Toby Lorne
2020-11-09 12:04:40 +00:00
committed by GitHub
parent eb072ce5ba
commit 31f845bbff
2 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/cloudfoundry_config.py
View File

@@ -14,12 +14,7 @@ def extract_cloudfoundry_config():
def set_config_env_vars(vcap_services): def set_config_env_vars(vcap_services):
# Postgres config # Postgres config
db_uri = vcap_services['postgres'][0]['credentials']['uri'] os.environ['SQLALCHEMY_DATABASE_URI'] = vcap_services['postgres'][0]['credentials']['uri']
sep = "&" if "?" in db_uri else "?"
db_uri += sep + "sslmode=verify-full"
os.environ['SQLALCHEMY_DATABASE_URI'] = db_uri
vcap_application = json.loads(os.environ['VCAP_APPLICATION']) vcap_application = json.loads(os.environ['VCAP_APPLICATION'])
os.environ['NOTIFY_ENVIRONMENT'] = vcap_application['space_name'] os.environ['NOTIFY_ENVIRONMENT'] = vcap_application['space_name']

33
tests/app/test_cloudfoundry_config.py
View File

@@ -31,35 +31,10 @@ def cloudfoundry_environ(os_environ, cloudfoundry_config):
os.environ['VCAP_APPLICATION'] = '{"space_name": "🚀🌌"}' os.environ['VCAP_APPLICATION'] = '{"space_name": "🚀🌌"}'
@pytest.fixture
def postgres_config_with_setting():
return [
{
'credentials': {
'uri': 'postgres uri?setting=true'
}
}
]
@pytest.fixture
def cloudfoundry_config_with_setting(postgres_config_with_setting):
return {
'postgres': postgres_config_with_setting,
'user-provided': []
}
@pytest.fixture
def cloudfoundry_environ_with_setting(os_environ, cloudfoundry_config_with_setting):
os.environ['VCAP_SERVICES'] = json.dumps(cloudfoundry_config_with_setting)
os.environ['VCAP_APPLICATION'] = '{"space_name": "🚀🌌"}'
def test_extract_cloudfoundry_config_populates_other_vars(cloudfoundry_environ): def test_extract_cloudfoundry_config_populates_other_vars(cloudfoundry_environ):
extract_cloudfoundry_config() extract_cloudfoundry_config()
assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgres uri?sslmode=verify-full' assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgres uri'
assert os.environ['NOTIFY_ENVIRONMENT'] == '🚀🌌' assert os.environ['NOTIFY_ENVIRONMENT'] == '🚀🌌'
assert os.environ['NOTIFY_LOG_PATH'] == '/home/vcap/logs/app.log' assert os.environ['NOTIFY_LOG_PATH'] == '/home/vcap/logs/app.log'
@@ -74,9 +49,3 @@ def test_set_config_env_vars_ignores_unknown_configs(cloudfoundry_config, cloudf
assert 'foo' not in os.environ assert 'foo' not in os.environ
assert 'bar' not in os.environ assert 'bar' not in os.environ
def test_extract_cloudfoundry_config_populates_postgres_with_setting(cloudfoundry_environ_with_setting):
extract_cloudfoundry_config()
assert os.environ['SQLALCHEMY_DATABASE_URI'] == 'postgres uri?setting=true&sslmode=verify-full'