diff --git a/.envs/.local/.django b/.envs/.local/.django index 0978166d..f8a5059c 100644 --- a/.envs/.local/.django +++ b/.envs/.local/.django @@ -47,3 +47,14 @@ LRM_QA_PASSWORD='' #-------------------------------------------------------------------------------- LRM_DEV_TOKEN='' XLI_TOKEN='' + +#Server Base_URLs +#-------------------------------------------------------------------------------- +BASE_URL_DEV=http://sde-renaissance.nasa-impact.net +BASE_URL_TEST=https://sciencediscoveryengine.test.nasa.gov +BASE_URL_PROD=https://sciencediscoveryengine.nasa.gov +BASE_URL_XLI=http://sde-xli.nasa-impact.net +BASE_URL_LRM_DEV=https://sde-lrm.nasa-impact.net +BASE_URL_LRM_QA=https://sde-qa.nasa-impact.net +BASE_URL_TEST_SERVER=http://10.51.14.135 +BASE_URL_REN=http://sde-renaissance.nasa-impact.net diff --git a/config/server_configs.py b/config/server_configs.py new file mode 100644 index 00000000..646b125d --- /dev/null +++ b/config/server_configs.py @@ -0,0 +1,64 @@ +import os + +server_configs = { + "dev": { + "app_name": "nasa-sba-smd", + "query_name": "query-smd-primary", + "base_url": os.getenv("BASE_URL_DEV"), + "index": "sde_index", + }, + "test": { + "app_name": "nasa-sba-smd", + "query_name": "query-smd-primary", + "base_url": os.getenv("BASE_URL_TEST"), + "index": "sde_index", + }, + "production": { + "app_name": "nasa-sba-smd", + "query_name": "query-smd-primary", + "base_url": os.getenv("BASE_URL_PROD"), + "index": "sde_index", + }, + "secret_test": { + "app_name": "nasa-sba-sde", + "query_name": "query-sde-primary", + "base_url": os.getenv("BASE_URL_TEST"), + "index": "sde_index", + }, + "secret_production": { + "app_name": "nasa-sba-sde", + "query_name": "query-sde-primary", + "base_url": os.getenv("BASE_URL_PROD"), + "index": "sde_index", + }, + "xli": { + "app_name": "nasa-sba-smd", + "query_name": "query-smd-primary", + "base_url": os.getenv("BASE_URL_XLI"), + "index": "sde_index", + }, + "lrm_dev": { + "app_name": "sde-init-check", + "query_name": "query-init-check", + "base_url": os.getenv("BASE_URL_LRM_DEV"), + "index": "sde_init_check", + }, + "lrm_qa": { + "app_name": "sde-init-check", + "query_name": "query-init-check", + "base_url": os.getenv("BASE_URL_LRM_QA"), + "index": "sde_init_check", + }, + "ren_server": { + "app_name": "nasa-sba-smd", + "query_name": "query-smd-primary", + "base_url": os.getenv("BASE_URL_REN"), + "index": "sde_index", + }, + "test_server": { + "app_name": "nasa-sba-smd", + "query_name": "query-smd-primary", + "base_url": os.getenv("BASE_URL_TEST_SERVER"), + "index": "sde_index", + }, +} diff --git a/config_generation/api.py b/config_generation/api.py index 7ae4d99b..02705ab3 100644 --- a/config_generation/api.py +++ b/config_generation/api.py @@ -3,19 +3,7 @@ import requests from config import tokens - -server_configs: dict[str, dict[str, str]] = { - "ren_server": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "http://sde-renaissance.nasa-impact.net", - }, - "test_server": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "http://10.51.14.135", - }, -} +from config.server_configs import server_configs class Api: diff --git a/config_generation/minimum_api.py b/config_generation/minimum_api.py index ec3cff1e..f78e821f 100644 --- a/config_generation/minimum_api.py +++ b/config_generation/minimum_api.py @@ -2,18 +2,7 @@ import requests -server_configs: dict[str, dict[str, str]] = { - "test_server": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "https://sciencediscoveryengine.test.nasa.gov", - }, - "production_server": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "https://sciencediscoveryengine.nasa.gov", - }, -} +from config.server_configs import server_configs class Api: diff --git a/functional_tests/check_collection.py b/functional_tests/check_collection.py index 3d227e47..dec57946 100644 --- a/functional_tests/check_collection.py +++ b/functional_tests/check_collection.py @@ -1,4 +1,5 @@ import json +import os import sys import time import urllib.parse @@ -16,8 +17,8 @@ def server_url(config_folder, server="test", secret=True) -> str: URLS = { - "test": "https://sciencediscoveryengine.test.nasa.gov", - "prod": "https://sciencediscoveryengine.nasa.gov", + "test": os.getenv("BASE_URL_TEST"), + "prod": os.getenv("BASE_URL_PROD"), } if secret: query = "query-sde-primary" diff --git a/sde_collections/models/collection.py b/sde_collections/models/collection.py index 0f1162e1..a8ce4e12 100644 --- a/sde_collections/models/collection.py +++ b/sde_collections/models/collection.py @@ -1,4 +1,5 @@ import json +import os import urllib.parse import requests @@ -274,7 +275,7 @@ def tree_root(self) -> str: @property def server_url_secret_prod(self) -> str: - base_url = "https://sciencediscoveryengine.nasa.gov" # noqa: E231 + base_url = os.getenv("BASE_URL_SECRET_TEST") # noqa: E231 payload = { "name": "secret-prod", "scope": "All", @@ -288,7 +289,7 @@ def server_url_secret_prod(self) -> str: @property def server_url_prod(self) -> str: - base_url = "https://sciencediscoveryengine.nasa.gov" # noqa: E231 + base_url = os.getenv("BASE_URL_PROD") # noqa: E231 payload = { "name": "query-smd-primary", "scope": "All", diff --git a/sde_collections/sinequa_api.py b/sde_collections/sinequa_api.py index 8dedbda0..a10d07a1 100644 --- a/sde_collections/sinequa_api.py +++ b/sde_collections/sinequa_api.py @@ -6,56 +6,9 @@ import urllib3 from django.conf import settings -urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) +from config.server_configs import server_configs -server_configs = { - "dev": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "http://sde-renaissance.nasa-impact.net", - }, - "test": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "https://sciencediscoveryengine.test.nasa.gov", - "index": "sde_index", - }, - "production": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "https://sciencediscoveryengine.nasa.gov", - "index": "sde_index", - }, - "secret_test": { - "app_name": "nasa-sba-sde", - "query_name": "query-sde-primary", - "base_url": "https://sciencediscoveryengine.test.nasa.gov", - "index": "sde_index", - }, - "secret_production": { - "app_name": "nasa-sba-sde", - "query_name": "query-sde-primary", - "base_url": "https://sciencediscoveryengine.nasa.gov", - "index": "sde_index", - }, - "xli": { - "app_name": "nasa-sba-smd", - "query_name": "query-smd-primary", - "base_url": "http://sde-xli.nasa-impact.net", - "index": "sde_index", - }, - "lrm_dev": { - "app_name": "sde-init-check", - "query_name": "query-init-check", - "base_url": "https://sde-lrm.nasa-impact.net", - "index": "sde_init_check", - }, - "lrm_qa": { - "app_name": "sde-init-check", - "query_name": "query-init-check", - "base_url": "https://sde-qa.nasa-impact.net", - }, -} +urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) class Api: