Skip to content

Ensure endpoint starts with 'https://' if scheme not given #96

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
chezou merged 1 commit into from
Jul 1, 2020
Merged

Ensure endpoint starts with 'https://' if scheme not given #96

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
14 changes: 9 additions & 5 deletions tdclient/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@
from tdclient.server_status_api import ServerStatusAPI
from tdclient.table_api import TableAPI
from tdclient.user_api import UserAPI
from tdclient.util import normalized_msgpack
from tdclient.util import csv_dict_record_reader
from tdclient.util import csv_text_record_reader
from tdclient.util import read_csv_records
from tdclient.util import validate_record
from tdclient.util import (
csv_dict_record_reader,
csv_text_record_reader,
normalized_msgpack,
read_csv_records,
validate_record,
)

try:
import certifi
Expand Down Expand Up @@ -107,6 +109,8 @@ def __init__(
self._user_agent = "TD-Client-Python/%s" % (version.__version__)

if endpoint is not None:
if not urlparse.urlparse(endpoint).scheme:
endpoint = "https://{}".format(endpoint)
self._endpoint = endpoint
elif os.getenv("TD_API_SERVER"):
self._endpoint = os.getenv("TD_API_SERVER")
Expand Down
7 changes: 7 additions & 0 deletions tdclient/test/api_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ def test_https_endpoint_with_custom_path():
assert "https://api.example.com/v1/" == url


def test_https_endpoint():
td = api.API("apikey", endpoint="api.example.com")
assert isinstance(td.http, urllib3.PoolManager)
url, headers = td.build_request()
assert "https://api.example.com" == url


def test_http_proxy_from_environ():
os.environ["HTTP_PROXY"] = "proxy1.example.com:8080"
td = api.API("apikey")
Expand Down