remove settings.py from API and persistence containers

Author: chreman

server/workers/api/src/app.py

@@ -12,12 +12,11 @@
 from apis.openaire import openaire_ns
 from apis.create_vis import vis_ns
 
-import settings
 from utils.monkeypatches import ReverseProxied, __schema__, specs_url, _register_apidoc
 import logging
 
 
-def api_patches(app, settings):
+def api_patches(app):
     Api._register_apidoc = _register_apidoc
     Api.__schema__ = __schema__
     Api.specs_url = specs_url
@@ -29,20 +28,19 @@ def api_patches(app, settings):
         version="0.1",
         prefix='/api',
         doc="/docs")
-    if settings.BEHIND_PROXY:
+    if os.getenv("BEHIND_PROXY") == "True":
         api_fixed.behind_proxy = True
     return api_fixed
 
 
 app = Flask('v1', instance_relative_config=True)
-app.config.from_object('settings')
 handler = logging.StreamHandler(sys.stdout)
 handler.setLevel(app.logger.level)
 app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1, x_port=1, x_for=1, x_host=1, x_prefix=1)
 app.wsgi_app = ReverseProxied(app.wsgi_app)
 CORS(app, expose_headers=["Content-Disposition", "Access-Control-Allow-Origin"])
 
-api = api_patches(app, settings)
+api = api_patches(app)
 api.add_namespace(triple_ns, path='/triple')
 api.add_namespace(gsheets_ns, path='/gsheets')
 api.add_namespace(base_ns, path='/base')

server/workers/persistence/src/apis/persistence.py

@@ -8,7 +8,6 @@
 
 from models import Revisions, Visualizations
 from database import sessions
-import settings
 
 
 persistence_ns = Namespace("persistence", description="OKMAps persistence operations")
@@ -20,7 +19,7 @@ def select_session(Session=None):
     if Session is not None:
         return Session()
     else:
-        return sessions.get(settings.DEFAULT_DATABASE)()
+        return sessions.get(os.getenv("DEFAULT_DATABASE"))()
 
 
 def create_vis_id(params, param_types):

server/workers/persistence/src/app.py

@@ -6,7 +6,6 @@
 from werkzeug.middleware.proxy_fix import ProxyFix
 
 from apis.persistence import persistence_ns
-import settings
 import logging
 
 class ReverseProxied(object):
@@ -42,28 +41,27 @@ def __call__(self, environ, start_response):
         return self.app(environ, start_response)
 
 
-def api_patches(app, settings):
+def api_patches(app):
     api_fixed = Api(
         app,
         title="Head Start API",
         description="Head Start API demo",
         version="0.1",
         prefix='/api',
         doc="/docs")
-    if settings.BEHIND_PROXY:
+    if os.getenv("BEHIND_PROXY") == "True":
         api_fixed.behind_proxy = True
     return api_fixed
 
 
 app = Flask('v1', instance_relative_config=True)
-app.config.from_object('settings')
 handler = logging.StreamHandler(sys.stdout)
 handler.setLevel(app.logger.level)
 app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1, x_port=1, x_for=1, x_host=1, x_prefix=1)
 app.wsgi_app = ReverseProxied(app.wsgi_app)
 CORS(app, expose_headers=["Content-Disposition", "Access-Control-Allow-Origin"])
 
-api = api_patches(app, settings)
+api = api_patches(app)
 api.add_namespace(persistence_ns, path='/persistence')
 app.logger.debug(app.config)
 app.logger.debug(app.url_map)

server/workers/persistence/src/database.py

@@ -2,24 +2,23 @@
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
-import settings
 
 
 bind_params = {
     "user": os.getenv("POSTGRES_USER"),
     "pw": os.getenv("POSTGRES_PASSWORD"),
     "host": os.getenv("POSTGRES_HOST"),
     "port": os.getenv("POSTGRES_PORT"),
-    "db": settings.DEFAULT_DATABASE
+    "db": os.getenv("DEFAULT_DATABASE")
 }
 
 sessions = {}
-sessions[settings.DEFAULT_DATABASE] = sessionmaker(bind=create_engine('postgresql://%(user)s:%(pw)s@%(host)s:%(port)s/%(db)s' % bind_params,
+sessions[os.getenv("DEFAULT_DATABASE")] = sessionmaker(bind=create_engine('postgresql://%(user)s:%(pw)s@%(host)s:%(port)s/%(db)s' % bind_params,
                                                                  max_overflow=15,
                                                                  pool_pre_ping=True,
                                                                  pool_recycle=3600,
                                                                  pool_size=30))
-for database in settings.DATABASES:
+for database in os.getenv("DATABASES").split(","):
     bind_params["db"] = database
     sessions[database] = sessionmaker(bind=create_engine('postgresql://%(user)s:%(pw)s@%(host)s:%(port)s/%(db)s' % bind_params,
                                                                  max_overflow=15,