settings clean up + spectacular settings server fix

Author: davidlougheed

chord_metadata_service/metadata/settings.py

@@ -18,7 +18,7 @@
 from bento_lib.logging.structured import configure_structlog, configure_structlog_uvicorn
 from bento_lib.service_info.types import GA4GHServiceType
 from structlog.stdlib import get_logger
-from urllib.parse import quote, urlparse
+from urllib.parse import urlparse
 from dotenv import load_dotenv
 
 from .. import __version__
@@ -109,10 +109,6 @@ def str_to_bool(value: str | None) -> bool:
 
 SERVICE_TEMP = os.environ.get("KATSU_TEMP", os.environ.get("SERVICE_TEMP"))
 
-#  - DRS URL - by default in Bento Singularity context, use internal NGINX DRS (to avoid auth hassles)
-NGINX_INTERNAL_SOCKET = quote(os.environ.get("NGINX_INTERNAL_SOCKET", "/chord/tmp/nginx_internal.sock"), safe="")
-DRS_URL = os.environ.get("DRS_URL", f"http+unix://{NGINX_INTERNAL_SOCKET}/api/drs").strip().rstrip("/")
-
 # Application definition
 
 INSTALLED_APPS = (["daphne"] if os.environ.get("BENTO_CONTAINER_LOCAL") else []) + [
@@ -374,8 +370,8 @@ def get_secret(path):
 
 # SPECTACULAR_SETTINGS['SERVERS'] defines the url to which calls are made when
 # testing a request within the swagger UI
-if CHORD_URL:
-    SPECTACULAR_SETTINGS["SERVERS"] = [{"url": CHORD_URL + FORCE_SCRIPT_NAME}]
+if SERVICE_URL_BASE_PATH:
+    SPECTACULAR_SETTINGS["SERVERS"] = [{"url": SERVICE_URL_BASE_PATH}]
 
 # ----------------------------------------------------------------------------------------------------------------------