From de41fde0d37e3f52b316bcda74445c07d04eb28b Mon Sep 17 00:00:00 2001 From: Athanasios Voutsadakis Date: Fri, 28 Jul 2017 16:09:49 +0100 Subject: [PATCH] Revert "remove credstash" This reverts commit 7db1bfbb774ca222855cbaf47366477d7134a675. --- aws_run_celery.py | 8 +++++++- db.py | 6 +++++- requirements.txt | 1 + server_commands.py | 5 +++++ wsgi.py | 9 ++++++++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/aws_run_celery.py b/aws_run_celery.py index 8194528db..36a1f480a 100644 --- a/aws_run_celery.py +++ b/aws_run_celery.py @@ -1,5 +1,11 @@ #!/usr/bin/env python -from app import create_app +from app import notify_celery, create_app +from credstash import getAllSecrets +import os + +# On AWS get secrets and export to env, skip this on Cloud Foundry +if os.getenv('VCAP_SERVICES') is None: + os.environ.update(getAllSecrets(region="eu-west-1")) application = create_app("delivery") application.app_context().push() diff --git a/db.py b/db.py index bc558cbd2..3a8da01d4 100644 --- a/db.py +++ b/db.py @@ -1,8 +1,12 @@ from flask.ext.script import Manager, Server from flask_migrate import Migrate, MigrateCommand - from app import create_app, db +from credstash import getAllSecrets +import os +# On AWS get secrets and export to env, skip this on Cloud Foundry +if os.getenv('VCAP_SERVICES') is None: + os.environ.update(getAllSecrets(region="eu-west-1")) application = create_app() diff --git a/requirements.txt b/requirements.txt index 61390b6c4..0c9b3f1e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ marshmallow==2.4.2 marshmallow-sqlalchemy==0.8.0 flask-marshmallow==0.6.2 Flask-Bcrypt==0.6.2 +credstash==1.8.0 boto3==1.4.4 celery==3.1.25 # pyup: <4 monotonic==1.2 diff --git a/server_commands.py b/server_commands.py index af071db47..85bf13137 100644 --- a/server_commands.py +++ b/server_commands.py @@ -1,6 +1,7 @@ from flask.ext.script import Manager, Server from flask_migrate import Migrate, MigrateCommand from app import (create_app, db, commands) +from credstash import getAllSecrets import os default_env_file = '/home/ubuntu/environment' @@ -10,6 +11,10 @@ if os.path.isfile(default_env_file): with open(default_env_file, 'r') as environment_file: environment = environment_file.readline().strip() +# On AWS get secrets and export to env, skip this on Cloud Foundry +if os.getenv('VCAP_SERVICES') is None: + os.environ.update(getAllSecrets(region="eu-west-1")) + from app.config import configs os.environ['NOTIFY_API_ENVIRONMENT'] = configs[environment] diff --git a/wsgi.py b/wsgi.py index 9fbeb28ac..2df2c3976 100644 --- a/wsgi.py +++ b/wsgi.py @@ -1,5 +1,12 @@ -from app import create_app +import os +from app import create_app +from credstash import getAllSecrets + + +# On AWS get secrets and export to env, skip this on Cloud Foundry +if os.getenv('VCAP_SERVICES') is None: + os.environ.update(getAllSecrets(region="eu-west-1")) application = create_app()