Skip to content

fix: properly join url and path when calculating full url #692

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
Aug 4, 2025
Merged

fix: properly join url and path when calculating full url #692

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
8 changes: 7 additions & 1 deletion airbyte_cdk/sources/declarative/requesters/http_requester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,13 @@ def _get_url(
next_page_token=next_page_token,
)

full_url = self._join_url(url_base, path) if url_base else url + path if path else url
full_url = (
self._join_url(url_base, path)
if url_base
else self._join_url(url, path)
if path
else url
)

return full_url

Expand Down
44 changes: 44 additions & 0 deletions unit_tests/sources/declarative/requesters/test_http_requester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,50 @@ def test_join_url(test_name, base_url, path, expected_full_url):
assert sent_request.url == expected_full_url


@pytest.mark.parametrize(
"test_name, url, path, expected_full_url",
[
("test_no_path", "https://airbyte.io/my_endpoint", None, "https://airbyte.io/my_endpoint"),
(
"test_path_does_not_include_url",
"https://airbyte.io/my_endpoint",
"with_path",
"https://airbyte.io/my_endpoint/with_path",
),
(
"test_path_does_include_url",
"https://airbyte.io/my_endpoint",
"https://airbyte.io/my_endpoint/with_path",
"https://airbyte.io/my_endpoint/with_path",
),
(
"test_path_is_different_full_url",
"https://airbyte.io/my_endpoint",
"https://airbyte-paginated.io/my_paginated_endpoint",
"https://airbyte-paginated.io/my_paginated_endpoint",
),
],
)
def test_join_url_with_url_and_path(test_name, url, path, expected_full_url):
requester = HttpRequester(
name="name",
url=url,
path=path,
http_method=HttpMethod.GET,
request_options_provider=None,
config={},
parameters={},
error_handler=DefaultErrorHandler(parameters={}, config={}),
)
requester._http_client._session.send = MagicMock()
response = requests.Response()
response.status_code = 200
requester._http_client._session.send.return_value = response
requester.send_request()
sent_request: PreparedRequest = requester._http_client._session.send.call_args_list[0][0][0]
assert sent_request.url == expected_full_url


@pytest.mark.usefixtures("mock_sleep")
def test_request_attempt_count_is_tracked_across_retries(http_requester_factory):
request_mock = MagicMock(spec=requests.PreparedRequest)
Expand Down
Loading