fix(arborist-url): get env var in app_init instead of config

uc-cdis · Oct 4, 2019 · eccb4dc · eccb4dc
1 parent 601312f
commit eccb4dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/sheepdog/api.py b/sheepdog/api.py
@@ -149,8 +149,9 @@ def app_init(app):
     except KeyError:
         app.logger.error("Secret key not set in config! Authentication will not work")
 
-    if app.config.get("ARBORIST_URL"):
-        app.auth = ArboristClient(arborist_base_url=app.config["ARBORIST_URL"])
+    arborist_url = os.environ.get("ARBORIST_URL", "http://arborist-service/")
+    if arborist_url:
+        app.auth = ArboristClient(arborist_base_url=arborist_url)
     else:
         app.logger.info("Using default Arborist base URL")
         app.auth = ArboristClient()

diff --git a/sheepdog/dev_settings.py b/sheepdog/dev_settings.py
@@ -21,8 +21,6 @@
     "user_domain_name": env.get("KEYSTONE_DOMAIN"),
 }
 
-ARBORIST_URL = env.get("ARBORIST_URL", "http://arborist-service/")
-
 # Storage
 CLEVERSAFE_HOST = env.get("CLEVERSAFE_HOST", "cleversafe.service.consul")
 

diff --git a/sheepdog/test_settings.py b/sheepdog/test_settings.py
@@ -1,6 +1,5 @@
 from collections import OrderedDict
 from .config import LEGACY_MODE
-import os
 
 INDEX_CLIENT = {
     "host": "http://localhost:8000",
@@ -17,8 +16,6 @@
     "user_domain_name": "some_domain",
 }
 
-ARBORIST_URL = os.environ.get("ARBORIST_URL", "http://arborist-service/")
-
 SUBMISSION = {"bucket": "test_submission", "host": "host"}