diff --git a/src/firebolt/async_db/util.py b/src/firebolt/async_db/util.py index 180c3efa6a6..7aec777da7d 100644 --- a/src/firebolt/async_db/util.py +++ b/src/firebolt/async_db/util.py @@ -12,7 +12,7 @@ FireboltEngineError, InterfaceError, ) -from firebolt.utils.urls import DYNAMIC_QUERY, GATEWAY_HOST_BY_ACCOUNT_NAME +from firebolt.utils.urls import GATEWAY_HOST_BY_ACCOUNT_NAME if TYPE_CHECKING: from firebolt.async_db.connection import Connection @@ -83,7 +83,7 @@ async def _get_system_engine_url( f"Unable to retrieve system engine endpoint {url}: " f"{response.status_code} {response.content}" ) - return response.json()["engineUrl"] + DYNAMIC_QUERY + return response.json()["engineUrl"] async def _get_engine_url_status_db( diff --git a/src/firebolt/db/util.py b/src/firebolt/db/util.py index 44a3a71de47..37b3468012c 100644 --- a/src/firebolt/db/util.py +++ b/src/firebolt/db/util.py @@ -12,7 +12,7 @@ FireboltEngineError, InterfaceError, ) -from firebolt.utils.urls import DYNAMIC_QUERY, GATEWAY_HOST_BY_ACCOUNT_NAME +from firebolt.utils.urls import GATEWAY_HOST_BY_ACCOUNT_NAME if TYPE_CHECKING: from firebolt.db.connection import Connection @@ -74,7 +74,6 @@ def _get_system_engine_url( api_endpoint=api_endpoint, timeout=Timeout(DEFAULT_TIMEOUT_SECONDS), ) as client: - # return "https://api.us-east-1.dev.firebolt.io/dynamic" url = GATEWAY_HOST_BY_ACCOUNT_NAME.format(account_name=account_name) response = client.get(url=url) if response.status_code == codes.NOT_FOUND: @@ -84,7 +83,7 @@ def _get_system_engine_url( f"Unable to retrieve system engine endpoint {url}: " f"{response.status_code} {response.content}" ) - return response.json()["engineUrl"] + DYNAMIC_QUERY + return response.json()["engineUrl"] def _get_engine_url_status_db( diff --git a/src/firebolt/utils/urls.py b/src/firebolt/utils/urls.py index 238722053d6..19784ec013f 100644 --- a/src/firebolt/utils/urls.py +++ b/src/firebolt/utils/urls.py @@ -28,4 +28,3 @@ REGIONS_URL = "/compute/v1/regions" GATEWAY_HOST_BY_ACCOUNT_NAME = "/web/v3/account/{account_name}/engineUrl" -DYNAMIC_QUERY = "/dynamic/query" diff --git a/tests/unit/db_conftest.py b/tests/unit/db_conftest.py index b538a400ad3..70f6d9c9f97 100644 --- a/tests/unit/db_conftest.py +++ b/tests/unit/db_conftest.py @@ -438,12 +438,12 @@ def system_engine_url() -> str: def system_engine_query_url( system_engine_url: str, db_name: str, account_id: str ) -> str: - return f"{system_engine_url}/dynamic/query?output_format=JSON_Compact&database={db_name}&account_id={account_id}" + return f"{system_engine_url}/?output_format=JSON_Compact&database={db_name}&account_id={account_id}" @fixture def system_engine_no_db_query_url(system_engine_url: str, account_id: str) -> str: - return f"{system_engine_url}/dynamic/query?output_format=JSON_Compact&account_id={account_id}" + return f"{system_engine_url}/?output_format=JSON_Compact&account_id={account_id}" @fixture