Update settings.py

.secrets.baseline

@@ -136,7 +136,7 @@
         "filename": "bin/settings.py",
         "hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
         "is_verified": false,
-        "line_number": 43
+        "line_number": 54
       }
     ],
     "docs/local_dev_environment.md": [
@@ -354,5 +354,5 @@
       }
     ]
   },
-  "generated_at": "2024-04-22T20:07:28Z"
+  "generated_at": "2024-08-12T21:26:18Z"
 }

bin/confighelper.py

@@ -49,6 +49,6 @@ def load_json(file_name, app_name, search_folders=None):
     """
     actual_files = find_paths(file_name, app_name, search_folders)
     if not actual_files:
-        return None
+        return {}
     with open(actual_files[0], "r") as reader:
         return json.load(reader)

bin/settings.py

@@ -1,6 +1,6 @@
 from sheepdog.api import app, app_init
-from os import environ
-import confighelper
+import os
+from . import confighelper
 
 APP_NAME = "sheepdog"
 
@@ -22,39 +22,52 @@ def load_json(file_name):
 
 # Signpost: deprecated, replaced by index client.
 config["SIGNPOST"] = {
-    "host": environ.get("SIGNPOST_HOST") or "http://indexd-service",
+    "host": os.environ.get("SIGNPOST_HOST", "http://indexd-service"),
     "version": "v0",
     "auth": ("gdcapi", conf_data.get("indexd_password", "{{indexd_password}}")),
 }
 config["INDEX_CLIENT"] = {
-    "host": environ.get("INDEX_CLIENT_HOST") or "http://indexd-service",
+    "host": os.environ.get("INDEX_CLIENT_HOST") or "http://indexd-service",
     "version": "v0",
     "auth": ("gdcapi", conf_data.get("indexd_password", "{{indexd_password}}")),
 }
 config["FAKE_AUTH"] = False
 config["PSQLGRAPH"] = {
-    "host": conf_data["db_host"],
-    "user": conf_data["db_username"],
-    "password": conf_data["db_password"],
-    "database": conf_data["db_database"],
+    "host": conf_data.get("db_host", os.environ.get("PGHOST", "localhost")),
+    "user": conf_data.get("db_username", os.environ.get("PGUSER", "sheepdog")),
+    "password": conf_data.get("db_password", os.environ.get("PGPASSWORD", "sheepdog")),
+    "database": conf_data.get("db_database", os.environ.get("PGDATABASE", "sheepdog")),
 }
 
 config["FLASK_SECRET_KEY"] = conf_data.get("gdcapi_secret_key", "{{gdcapi_secret_key}}")
-config["PSQL_USER_DB_CONNECTION"] = "postgresql://%s:%s@%s:5432/%s" % tuple(
-    [
-        conf_data.get(key, key)
-        for key in ["fence_username", "fence_password", "fence_host", "fence_database"]
-    ]
+
+fence_username = conf_data.get(
+    "fence_username", os.environ.get("FENCE_DB_USERNAME", "fence")
+)
+fence_password = conf_data.get(
+    "fence_password", os.environ.get("FENCE_DB_PASSWORD", "fence")
+)
+fence_host = conf_data.get("fence_host", os.environ.get("FENCE_DB_HOST", "localhost"))
+fence_database = conf_data.get(
+    "fence_database", os.environ.get("FENCE_DB_DATABASE", "fence")
+)
+config["PSQL_USER_DB_CONNECTION"] = "postgresql://%s:%s@%s:5432/%s" % (
+    fence_username,
+    fence_password,
+    fence_host,
+    fence_database,
 )
 
-config["USER_API"] = "https://%s/user" % conf_data["hostname"]  # for use by authutils
+config["USER_API"] = "https://%s/user" % conf_data.get(
+    "hostname", os.environ.get("CONF_HOSTNAME", "localhost")
+)  # for use by authutils
 # use the USER_API URL instead of the public issuer URL to accquire JWT keys
 config["FORCE_ISSUER"] = True
-config["DICTIONARY_URL"] = environ.get(
+config["DICTIONARY_URL"] = os.environ.get(
     "DICTIONARY_URL",
     "https://s3.amazonaws.com/dictionary-artifacts/datadictionary/develop/schema.json",
 )
 
 app_init(app)
 application = app
-application.debug = environ.get("GEN3_DEBUG") == "True"
+application.debug = os.environ.get("GEN3_DEBUG") == "True"

deployment/wsgi/gunicorn.conf.py

@@ -1,4 +1,5 @@
-wsgi_app = "deployment.wsgi.wsgi:application"
+# /sheepdoog/bin/settings.py
+wsgi_app = "bin.settings:application"
 bind = "0.0.0.0:8000"
 workers = 4
 preload_app = True