From 11a4a08ccb2c9c2b125c3c971dbb2baaaa7272f2 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Tue, 27 Feb 2018 15:32:13 +0000 Subject: [PATCH] hardcode some development values this'll ensure that you won't get your dev secret keys out of sync between api and admin --- README.md | 6 ------ app/config.py | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 15975b530..d30f85751 100644 --- a/README.md +++ b/README.md @@ -63,12 +63,6 @@ in a separate terminal from the app ``` echo " export NOTIFY_ENVIRONMENT='development' -export ADMIN_CLIENT_SECRET='notify-secret-key' -export API_HOST_NAME='http://localhost:6011' -export DANGEROUS_SALT='dev-notify-salt' -export SECRET_KEY='notify-secret-key' -export DESKPRO_API_HOST="some-host" -export DESKPRO_API_KEY="some-key" export FLASK_APP=application.py export FLASK_DEBUG=1 export WERKZEUG_DEBUG_PIN=off diff --git a/app/config.py b/app/config.py index b9f9e4822..4f863b6c5 100644 --- a/app/config.py +++ b/app/config.py @@ -9,12 +9,12 @@ if os.environ.get('VCAP_APPLICATION'): class Config(object): - ADMIN_CLIENT_SECRET = os.environ['ADMIN_CLIENT_SECRET'] - API_HOST_NAME = os.environ['API_HOST_NAME'] - SECRET_KEY = os.environ['SECRET_KEY'] - DANGEROUS_SALT = os.environ['DANGEROUS_SALT'] - DESKPRO_API_HOST = os.environ['DESKPRO_API_HOST'] - DESKPRO_API_KEY = os.environ['DESKPRO_API_KEY'] + ADMIN_CLIENT_SECRET = os.environ.get('ADMIN_CLIENT_SECRET') + API_HOST_NAME = os.environ.get('API_HOST_NAME') + SECRET_KEY = os.environ.get('SECRET_KEY') + DANGEROUS_SALT = os.environ.get('DANGEROUS_SALT') + DESKPRO_API_HOST = os.environ.get('DESKPRO_API_HOST') + DESKPRO_API_KEY = os.environ.get('DESKPRO_API_KEY') # if we're not on cloudfoundry, we can get to this app from localhost. but on cloudfoundry its different ADMIN_BASE_URL = os.environ.get('ADMIN_BASE_URL', 'http://localhost:6012') @@ -84,6 +84,13 @@ class Development(Config): CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-tools' + ADMIN_CLIENT_SECRET = 'dev-notify-secret-key' + API_HOST_NAME = 'http://localhost:6011' + DANGEROUS_SALT = 'dev-notify-salt' + SECRET_KEY = 'dev-notify-secret-key' + DESKPRO_API_HOST = "some-host" + DESKPRO_API_KEY = "some-key" + class Test(Development): DEBUG = True