Skip to content
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.

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

fix: async client always use HTTP_PROXY/HTTPS_PROXY environment variables #583

Merged
merged 4 commits into from
Jun 21, 2023
Merged
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
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
## 1.37.0 [unreleased]

### Breaking Changes

This release disables using of the HTTP proxy environment variables `HTTP_PROXY` and `HTTPS_PROXY` for the asynchronous HTTP client.
The proxy environment variables must be explicitly enabled in the client's configuration:

```python
from influxdb_client.client.influxdb_client_async import InfluxDBClientAsync

async with InfluxDBClientAsync(url="http://localhost:8086", token="my-token", org="my-org",
client_session_kwargs={'trust_env': True}) as client:
pass
```

### Bug Fixes
1. [#583](https://github.com/influxdata/influxdb-client-python/pull/583): Async HTTP client doesn't always use `HTTP_PROXY`/`HTTPS_PROXY` environment variables. [async/await]

## 1.36.1 [2023-02-23]

### Bug Fixes
Expand Down
1 change: 0 additions & 1 deletion influxdb_client/_async/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ def __init__(self, configuration, pools_size=4, maxsize=None, **kwargs):
_client_session_kwargs = kwargs.get('client_session_kwargs', {})
self.pool_manager = _client_session_type(
connector=connector,
trust_env=True,
timeout=timeout,
trace_configs=[trace_config] if configuration.debug else None,
**_client_session_kwargs
Expand Down
6 changes: 3 additions & 3 deletions influxdb_client/client/write_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,9 @@ def __del__(self):
# Have we reached the upper limit?
if waited >= max_wait_time:
logger.warning(
"Reached max_close_wait (%s seconds) waiting for batches to finish writing. Force closing",
max_wait_time
)
"Reached max_close_wait (%s seconds) waiting for batches to finish writing. Force closing",
max_wait_time
)
break

if self._disposable:
Expand Down
125 changes: 46 additions & 79 deletions tests/server.pem
Original file line number Diff line number Diff line change
@@ -1,83 +1,50 @@
-----BEGIN CERTIFICATE-----
MIIFZjCCA04CCQCMEn5e+4xmLTANBgkqhkiG9w0BAQsFADB1MQswCQYDVQQGEwJV
UzEQMA4GA1UECAwHTmV3WW9yazEQMA4GA1UEBwwHTmV3WW9yazEdMBsGA1UECgwU
SW5mbHV4REJQeXRob25DbGllbnQxDzANBgNVBAsMBkNsaWVudDESMBAGA1UEAwwJ
bG9jYWxob3N0MB4XDTIwMDcyMDA2MzA0OVoXDTQ3MTIwNjA2MzA0OVowdTELMAkG
A1UEBhMCVVMxEDAOBgNVBAgMB05ld1lvcmsxEDAOBgNVBAcMB05ld1lvcmsxHTAb
BgNVBAoMFEluZmx1eERCUHl0aG9uQ2xpZW50MQ8wDQYDVQQLDAZDbGllbnQxEjAQ
BgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
AMoqURng8JwLYe4IHyIAGlI80utBLq6XbDETY93Pr6ZdHePr2jM+UIfFtdkpqdJw
56ZxnJPtM1kDQJTsGfkf0/ePKZpnunNk+lkz9l5uQPVcujydplhJgJeHEj49s3Yy
mWYetcR1Oejnqxgh+9Ev79r1Napu3s80SACPgvTP45CLp1hOGFySRaW7jcG3i+V4
ljQWVAEse9Vy3e7E1EY2p6z/Zvj2UVOMqdHsivR1XLy5hts5ubIqOqvOCPocJ+0/
m0AjwCXO4QPy7pLAAa7DA9rWDpzx8jpdfe54NOHuj4SVP45+PPsWvvkN2ZOkC/vb
zz4DcYVwIqtqej8mvO2kkPIFLdRSKUc5N3xmdvF5awBGfHhb4l/KIDlhRle+L9kF
LxRgkmBb2FFfL0/GtQlpH0bHHwPij4jPcOY+ueLKmAMgwWdqYae0HS01F7nYeZuP
StDG+YuCjglOH8xugcV9GBXrRTijyjuml4st3Wl4tPpQClmdoZ2LXp5h/6Zq1aoc
QlraKjwuTuzQBBHIFh9KXLZANLtMLpGGepFSMqE6YIWl17gi/2NruP8MGXNk+7GM
ylczKu/Ny67qQ8JCnRLSNUXPg18LjU2voLuzgXWtuTUgRnQBdir6ZB5Bwc2zi0vx
DNl0yzDhGNFdR5Rng5lAcmclA4QWi7Oc4h/OLN0ma0UzAgMBAAEwDQYJKoZIhvcN
AQELBQADggIBADsWOWIMvynE2Iwtpv471kROYdqrj6Zj5P8Ye5/0lqedRxIYWDsc
XDii+ePem+cMhnty8tAqCeHIdBUN86ibP+oqlwySbvdvW121RfedsWpa+TPC+Rnj
8n5w0urVNpnYuep2f8SOpQ1WdXFMLIsKqcnV5KK3/rxOAUY9cNVumA55/terQMOZ
RSGfjtoKVkMSOxNlaj4frLNy+I7nyWYrZ9UmUirvGLce5LJ1nrmo2I46FA0XDwu8
xJqe4mB3GT/t9kFujd3Q/MtgD4J/MjWBfSYV0vlzI+VuoRctikw2SWQckQWNlIhs
LPafo6D+lOxJtH58WksCxdb8C8sBbRl+irv/ZAlvIiOkmcpHcOQ7AbLTtosZs6nX
p0ptWENlTM3lkt/Xma8txWXfe29tlf/9oheqXKdYunRyvFPL/gBjjR/VWzIS5sT5
T6z0Vdk7uW9/wzv45vzjES8a8AAFvEkaRS4JBoTCW69mc8RFR89Vp9axRHY/3ohQ
8pS9K00FLMTObb8qlW31LfKpCUSxHmU00BhGPduMYQF28Xj02zQ5UaeGOnSO5EjU
pG0N7yqaVwGv9jYQfmnnD7M5LYVweEZ3OzCbfZuNJ4+EHNdZKcJiu2TaOsyxK25q
AJvDAFTSr5A9GSjJ3OyIeKoI8Q6xuaQBitpZR90P/Ah/Ymg490rpXavk
MIIDsDCCApigAwIBAgIJAJUMvag5FRxuMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV
BAYTAlVTMRAwDgYDVQQIDAdOZXdZb3JrMRAwDgYDVQQHDAdOZXdZb3JrMR0wGwYD
VQQKDBRJbmZsdXhEQlB5dGhvbkNsaWVudDEPMA0GA1UECwwGQ2xpZW50MRIwEAYD
VQQDDAlsb2NhbGhvc3QwHhcNMjMwNjIwMDYzOTAzWhcNMzMwNjE3MDYzOTAzWjB1
MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTmV3WW9yazEQMA4GA1UEBwwHTmV3WW9y
azEdMBsGA1UECgwUSW5mbHV4REJQeXRob25DbGllbnQxDzANBgNVBAsMBkNsaWVu
dDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
CgKCAQEAp4ajJzE8RsHF9M7xO0CtuUD2Wm+h3jYpybfjgLpg0ZfEiAQxXul293f7
2EUuxUHYgvTNfxpLK9OIqhUzmhdGaDsnldC2p90CJ71iDnmd9W3eGkT6WZ+zDMva
Cm93s73P4AAjbahD6509kh6DKx5L/iAve0giqYmCA00lJRX+y3QgkwK7mQ+0WGX8
guJqec+o/UV05HAyCRBQrHOzYwTvLUo8KHnXQ2fHyKe0qzzcFDbBJ9rLC8EJZbjg
fv4EoaUd1HaVAO49NoHZyretcWQh3Ec2rIAp946aE8+ihlvE/iyotSNnnil7o+Ki
NM9zytpWJHwy+zcm/G/0Zl1bssl9vQIDAQABo0MwQTAOBgNVHQ8BAf8EBAMCA4gw
EwYDVR0lBAwwCgYIKwYBBQUHAwEwGgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAAB
MA0GCSqGSIb3DQEBCwUAA4IBAQA5V+maIkFDI8IRELl8v0TxiGyYLopNVHabbI/+
o52dB8jt08b3T0T0RpPdoIM3B0bKq8nELUyFdH3sJwaOWx3N39iSfU+LRitUq+Co
/Ii02kewgoWhh4ZD6E7Esme+GXeJYK2j40d+zs1r40o02LW04YP6tUucW27JaYTX
CAQRPwQJGi+b7S1T/BG2chuFwixKnjfuQWXJQXxma24UxLCTzD7PkEsGppUIrqh6
e/H6vazFAshdcOwB+hkmmVdTS4swJ5PKhlqIzHZll3Pe61uog2amA2rTvQ8bjXne
0iuWMZMOWX4h88y/4sf3fsvjUJiJn1DL3CmIYE2S+cquy2Su
-----END CERTIFICATE-----
-----BEGIN PRIVATE KEY-----
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
EyqjJVOYUopmtejzqNMx6o2AA2jSc/oI
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnhqMnMTxGwcX0
zvE7QK25QPZab6HeNinJt+OAumDRl8SIBDFe6Xb3d/vYRS7FQdiC9M1/Gksr04iq
FTOaF0ZoOyeV0Lan3QInvWIOeZ31bd4aRPpZn7MMy9oKb3ezvc/gACNtqEPrnT2S
HoMrHkv+IC97SCKpiYIDTSUlFf7LdCCTAruZD7RYZfyC4mp5z6j9RXTkcDIJEFCs
c7NjBO8tSjwoeddDZ8fIp7SrPNwUNsEn2ssLwQlluOB+/gShpR3UdpUA7j02gdnK
t61xZCHcRzasgCn3jpoTz6KGW8T+LKi1I2eeKXuj4qI0z3PK2lYkfDL7Nyb8b/Rm
XVuyyX29AgMBAAECggEAdisOYtLkBbUhgXGHz5fr8sTUAS7FKw1hpJxFqcPOD4nS
Y28xtBVSiXTk/MSwHQw5QQaU/Zb6d0ubFv4ljAfm7hbr8U1ryjSnFIkN5c/7j+eT
x0vom9d+YQRaJQpDkVHOk98FHpCWeFhN2ggT1hJk4DirxXY4nQYV42ZDUUmWlMOM
ZT96mRpN6iTYbNt97DjVQHiY6Yg2Mgb3Pp0GpryLtxcp7ant/xCERkqxchJnJZrU
DUWybVpoZA6qnviegc5CNej0Usp5FfvjDRdZcxsL83cinp8gTCBM6yDwxo5yp07h
1ELBjqDlL/4cmzl9Cr5dGrQC0ogumQFed07He9hggQKBgQDeMA/TQ5d96WNn64cp
x/keWYARdmPkuy8mLeEBCCldUqeyEKH+MEKebrkJp++e2UZ9yHHULU0wZsjup09E
iprV2GwC5sJFDFJC9sN7UhRGTENSG3ROmxxsRQ85AuxQ8r2Kkcus/Gln7NkQIew9
PTYChszRYhgmvd8dbQnWJR5nyQKBgQDBBRLC++K4b5Ia7ZdPoEd1p8rUdHzgEJpu
OULEw4amrZX5YCUii14G6bh86Yp1QBEPS4I33Y/WQfMTSBTWI5h4B39+bvkFyQD0
lomt6T0I01Czg6325ifsOLCedRBJGyzKhcG2PP5d6orioT2tNx+CdabjkQqdnwiu
FEyjr7zIVQKBgEIJ+PorEeDruI8PsznY5RN/OJB4JtK6TBZF9qWO3nSNd6h2Rx+9
Cl/6uubC0nbdT5VdOW/+Ev463qgIdIgDxmefDuOB4OYS9nRO0eVajQoj6rKB1Hz0
n2sSz6Z7Vu/sZifEk8wTreSkwhOIcaX2BpKTrFbjmBgTwTgGy7CpkbL5AoGAJ/dm
9Ry2yz2+4PiFNiWX5lLB+s/L85E8iMouexOJVAXpYeN4jPiSlZfbbXHmC3Uikyot
YmfsGo85R6rLNbPVJDVZPtK3mW0PV5W8GFiNHMC0mxcO9GqfpZfvakAPCTQpSB3+
CEAE42lnLJn6bV1WlurJjaFAs3Z0k6b8X4BJ9KkCgYEA0cKrgKB3GidtKBeyuGKg
Wdemq9T4c7R5swn/87Ud6UE0zALA8wBx7ZacQm9IOHiCSVdBGAEAzNd14Kri8DaK
/5EHjZ2yI5cO108IbkTZ2TXevgjAHCvrhEtcgG0SrNNFJ6JoGiSqJ8Ue5xbj3P2y
KYSFK5vRSIQ5GpR4zTXN7S4=
-----END PRIVATE KEY-----
9 changes: 9 additions & 0 deletions tests/test_InfluxDBClientAsync.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,15 @@ async def test_management_apis(self):
self.assertIsInstance(results, Organizations)
self.assertIn("my-org", list(map(lambda org: org.name, results.orgs)))

@async_test
async def test_trust_env_default(self):
self.assertFalse(self.client.api_client.rest_client.pool_manager.trust_env)

await self.client.close()
self.client = InfluxDBClientAsync(url="http://localhost:8086", token="wrong", org="my-org",
client_session_kwargs={'trust_env': True})
self.assertTrue(self.client.api_client.rest_client.pool_manager.trust_env)

async def _prepare_data(self, measurement: str):
_point1 = Point(measurement).tag("location", "Prague").field("temperature", 25.3)
_point2 = Point(measurement).tag("location", "New York").field("temperature", 24.3)
Expand Down