🐘 Change to use postgres

.circleci/config.yml

@@ -9,6 +9,10 @@ jobs:
       # specify the version you desire here
       # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
       - image: circleci/python:3.6.1
+      - image: postgres:9.5
+        environment:
+        - POSTGRES_USER=postgres
+        - POSTGRES_DB=test
 
     working_directory: ~/repo
 

Dockerfile

@@ -8,7 +8,7 @@ ADD         . /app
 EXPOSE      80
 ENV         FLASK_APP "manage.py"
 ENV         FLASK_CONFIG "production"
-RUN         ["flask", "db", "init"]
-RUN         ["flask", "db", "migrate"]
+#RUN         ["flask", "db", "init"]
 RUN         ["flask", "db", "upgrade"]
+RUN         ["flask", "db", "migrate"]
 CMD         ["gunicorn", "-b", ":80", "--access-logfile", "-",  "manage:app", "--threads", "4"]

README.md

@@ -21,12 +21,18 @@ pip install -r requirements.txt
 # Configure the flask application
 export FLASK_APP=manage
 # Setup the database
-flask db init
+docker run --name dataservice-pg -p 5432:5432 -d postgres:9.5
+docker exec dataservice-pg psql -U postgres -c "CREATE DATABASE dev;"
 flask db upgrade
 # Run the flask web application
 flask run 
 ```
 
+### Database
+
+The example environment above uses docker to run a Postgres instance,
+however, a local install of Postgres may be used just as easily.
+
 The API should now be available at `localhost:5000/`.
 
 ## Documentation
@@ -58,6 +64,9 @@ Unit tests and pep8 linting is run via `flask test`
 ```
 # Install test dependencies
 pip install -r dev-requirements.txt
+# Setup test database
+docker run --name dataservice-pg -p 5432:5432 -d postgres
+docker exec dataservice-pg psql -U postgres -c "CREATE DATABASE dev;"
 # Run tests
 flask test
 ```

config.py

@@ -17,34 +17,43 @@ def init_app(app):
 class DevelopmentConfig(Config):
     DEBUG = True
     SSL_DISABLE = True
-    SQLALCHEMY_DATABASE_URI = os.environ.get("DEV_DATABASE_URL") or \
-            "sqlite:///" + os.path.join(basedir, "data-dev.sqlite")
     SQLALCHEMY_TRACK_MODIFICATIONS = True
 
 
 class TestingConfig(Config):
     SERVER_NAME = "localhost"
     TESTING = True
     WTF_CSRF_ENABLED = False
-    SQLALCHEMY_DATABASE_URI = os.environ.get("TEST_DATABASE_URL") or \
-            "sqlite:///" + os.path.join(basedir, "data-test.sqlite")
+    SQLALCHEMY_DATABASE_URI = 'postgres://postgres@localhost:5432/test'
     SQLALCHEMY_TRACK_MODIFICATIONS = True
 
 
 class ProductionConfig(Config):
-    # Should use postgres
-    SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URL") or \
-            "sqlite:///" + os.path.join(basedir, "data.sqlite")
+    @staticmethod
+    def init_app(app):
+        import hvac
 
-    @classmethod
-    def init_app(cls, app):
-        Config.init_app(app)
+        vault_url = os.environ.get('VAULT_URL', 'https//vault/')
+        # Role to authenticate with
+        iam_role = os.environ.get('IAM_ROLE', 'PostgresRole')
+        # Path for the postgres secret in vault
+        pg_secret = os.environ.get('DB_SECRET', 'secret/postgres')
 
-        # email errors to the administrators
-        import logging
-        from logging.handlers import SMTPHandler
-        credentials = None
-        secure = None
+        # Retrieve postgres secrets
+        client = hvac.Client(url=vault_url)
+        client.auth_iam(iam_role)
+        secrets = client.read(pg_secret)
+        client.logout()
+
+        pg_host = os.environ.get('PG_HOST', 'localhost')
+        pg_name = os.environ.get('PG_NAME', 'prod')
+        pg_user = secrets['data']['username']
+        pg_pass = secrets['data']['password']
+
+        connection_str = 'postgres://{}:{}@{}:{}/{}'.format(
+                            pg_user, pg_pass, pg_host, pg_port, pg_name)
+
+        app.config['SQLALCHEMY_DATABASE_URI'] = connection_str
 
 
 class UnixConfig(ProductionConfig):

dataservice/__init__.py

@@ -15,6 +15,7 @@ def create_app(config_name):
     app = Flask(__name__)
     app.url_map.strict_slashes = False
     app.config.from_object(config[config_name])
+    config[config_name].init_app(app)
 
     # Register Flask extensions
     register_extensions(app)

requirements.txt

@@ -18,3 +18,5 @@ gunicorn==19.7.1
 flask-marshmallow==0.8.0
 marshmallow==2.15.0
 marshmallow-sqlalchemy==0.13.2
+psycopg2==2.7.3.2
+-e git+git@github.com:dankolbman/hvac.git#egg=hvac

tests/conftest.py

@@ -3,12 +3,16 @@
 from dataservice import create_app
 from dataservice.extensions import db
 
+@pytest.yield_fixture
+def app():
+    return create_app('testing')
 
-@pytest.fixture
-def client():
-    app = create_app('testing')
+@pytest.yield_fixture
+def client(app):
     app_context = app.app_context()
     app_context.push()
     db.create_all()
     yield app.test_client()
+    # Need to make sure we close all connections so pg won't lock tables
+    db.session.close()
     db.drop_all()