Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/flareio/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def __init__(
tenant_id: t.Optional[int] = None,
session: t.Optional[requests.Session] = None,
api_domain: t.Optional[str] = None,
proxies: t.Optional[t.Dict[str, str]] = None,
_auth: AuthBase | None = None,
_enable_beta_features: bool = False,
) -> None:
Expand All @@ -59,6 +60,8 @@ def __init__(
self._api_token: t.Optional[str] = None
self._api_token_exp: t.Optional[datetime] = None
self._session = session or self._create_session()
if proxies is not None:
self._session.proxies.update(proxies)

@classmethod
def from_env(cls) -> "FlareApiClient":
Expand Down
29 changes: 29 additions & 0 deletions tests/test_api_client_creation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from datetime import datetime

import pytest
import requests
import requests_mock

from packaging.version import Version
Expand Down Expand Up @@ -86,3 +87,31 @@ def test_backoff_max() -> None:
retry = FlareApiClient._create_retry()
assert hasattr(retry, "backoff_max")
assert retry.backoff_max == 15


def test_proxies_applied_to_session() -> None:
client = FlareApiClient(
api_key="test",
proxies={"https": "http://proxy.corp.local:8080"},
)
assert client._session.proxies["https"] == "http://proxy.corp.local:8080"


def test_proxies_default_no_proxy() -> None:
client = FlareApiClient(api_key="test")
assert client._session.proxies == {}


def test_proxies_merge_with_user_session() -> None:
session = requests.Session()
session.proxies["http"] = "http://existing-proxy:3128"

client = FlareApiClient(
api_key="test",
session=session,
proxies={"https": "http://new-proxy:8080"},
)

assert client._session is session
assert client._session.proxies["http"] == "http://existing-proxy:3128"
assert client._session.proxies["https"] == "http://new-proxy:8080"
Loading