Skip to content

fix: remove dynamic/query path from system engine url #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2023
Merged

fix: remove dynamic/query path from system engine url #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/firebolt/async_db/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
5 changes: 2 additions & 3 deletions src/firebolt/db/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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(
Expand Down
1 change: 0 additions & 1 deletion src/firebolt/utils/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@
REGIONS_URL = "/compute/v1/regions"

GATEWAY_HOST_BY_ACCOUNT_NAME = "/web/v3/account/{account_name}/engineUrl"
DYNAMIC_QUERY = "/dynamic/query"
4 changes: 2 additions & 2 deletions tests/unit/db_conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down