Skip to content

Commit 8fa5146

Browse files
authored
fix: async client always use HTTP_PROXY/HTTPS_PROXY environment variables (influxdata#583)
1 parent aba8ec8 commit 8fa5146

File tree

5 files changed

+74
-83
lines changed

5 files changed

+74
-83
lines changed

Diff for: CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
## 1.37.0 [unreleased]
22

3+
### Breaking Changes
4+
5+
This release disables using of the HTTP proxy environment variables `HTTP_PROXY` and `HTTPS_PROXY` for the asynchronous HTTP client.
6+
The proxy environment variables must be explicitly enabled in the client's configuration:
7+
8+
```python
9+
from influxdb_client.client.influxdb_client_async import InfluxDBClientAsync
10+
11+
async with InfluxDBClientAsync(url="http://localhost:8086", token="my-token", org="my-org",
12+
client_session_kwargs={'trust_env': True}) as client:
13+
pass
14+
```
15+
16+
### Bug Fixes
17+
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]
18+
319
## 1.36.1 [2023-02-23]
420

521
### Bug Fixes

Diff for: influxdb_client/_async/rest.py

-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ def __init__(self, configuration, pools_size=4, maxsize=None, **kwargs):
126126
_client_session_kwargs = kwargs.get('client_session_kwargs', {})
127127
self.pool_manager = _client_session_type(
128128
connector=connector,
129-
trust_env=True,
130129
timeout=timeout,
131130
trace_configs=[trace_config] if configuration.debug else None,
132131
**_client_session_kwargs

Diff for: influxdb_client/client/write_api.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,9 @@ def __del__(self):
434434
# Have we reached the upper limit?
435435
if waited >= max_wait_time:
436436
logger.warning(
437-
"Reached max_close_wait (%s seconds) waiting for batches to finish writing. Force closing",
438-
max_wait_time
439-
)
437+
"Reached max_close_wait (%s seconds) waiting for batches to finish writing. Force closing",
438+
max_wait_time
439+
)
440440
break
441441

442442
if self._disposable:

Diff for: tests/server.pem

+46-79
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,50 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIFZjCCA04CCQCMEn5e+4xmLTANBgkqhkiG9w0BAQsFADB1MQswCQYDVQQGEwJV
3-
UzEQMA4GA1UECAwHTmV3WW9yazEQMA4GA1UEBwwHTmV3WW9yazEdMBsGA1UECgwU
4-
SW5mbHV4REJQeXRob25DbGllbnQxDzANBgNVBAsMBkNsaWVudDESMBAGA1UEAwwJ
5-
bG9jYWxob3N0MB4XDTIwMDcyMDA2MzA0OVoXDTQ3MTIwNjA2MzA0OVowdTELMAkG
6-
A1UEBhMCVVMxEDAOBgNVBAgMB05ld1lvcmsxEDAOBgNVBAcMB05ld1lvcmsxHTAb
7-
BgNVBAoMFEluZmx1eERCUHl0aG9uQ2xpZW50MQ8wDQYDVQQLDAZDbGllbnQxEjAQ
8-
BgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
9-
AMoqURng8JwLYe4IHyIAGlI80utBLq6XbDETY93Pr6ZdHePr2jM+UIfFtdkpqdJw
10-
56ZxnJPtM1kDQJTsGfkf0/ePKZpnunNk+lkz9l5uQPVcujydplhJgJeHEj49s3Yy
11-
mWYetcR1Oejnqxgh+9Ev79r1Napu3s80SACPgvTP45CLp1hOGFySRaW7jcG3i+V4
12-
ljQWVAEse9Vy3e7E1EY2p6z/Zvj2UVOMqdHsivR1XLy5hts5ubIqOqvOCPocJ+0/
13-
m0AjwCXO4QPy7pLAAa7DA9rWDpzx8jpdfe54NOHuj4SVP45+PPsWvvkN2ZOkC/vb
14-
zz4DcYVwIqtqej8mvO2kkPIFLdRSKUc5N3xmdvF5awBGfHhb4l/KIDlhRle+L9kF
15-
LxRgkmBb2FFfL0/GtQlpH0bHHwPij4jPcOY+ueLKmAMgwWdqYae0HS01F7nYeZuP
16-
StDG+YuCjglOH8xugcV9GBXrRTijyjuml4st3Wl4tPpQClmdoZ2LXp5h/6Zq1aoc
17-
QlraKjwuTuzQBBHIFh9KXLZANLtMLpGGepFSMqE6YIWl17gi/2NruP8MGXNk+7GM
18-
ylczKu/Ny67qQ8JCnRLSNUXPg18LjU2voLuzgXWtuTUgRnQBdir6ZB5Bwc2zi0vx
19-
DNl0yzDhGNFdR5Rng5lAcmclA4QWi7Oc4h/OLN0ma0UzAgMBAAEwDQYJKoZIhvcN
20-
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
3122
-----END CERTIFICATE-----
3223
-----BEGIN PRIVATE KEY-----
33-
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
82-
EyqjJVOYUopmtejzqNMx6o2AA2jSc/oI
24+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnhqMnMTxGwcX0
25+
zvE7QK25QPZab6HeNinJt+OAumDRl8SIBDFe6Xb3d/vYRS7FQdiC9M1/Gksr04iq
26+
FTOaF0ZoOyeV0Lan3QInvWIOeZ31bd4aRPpZn7MMy9oKb3ezvc/gACNtqEPrnT2S
27+
HoMrHkv+IC97SCKpiYIDTSUlFf7LdCCTAruZD7RYZfyC4mp5z6j9RXTkcDIJEFCs
28+
c7NjBO8tSjwoeddDZ8fIp7SrPNwUNsEn2ssLwQlluOB+/gShpR3UdpUA7j02gdnK
29+
t61xZCHcRzasgCn3jpoTz6KGW8T+LKi1I2eeKXuj4qI0z3PK2lYkfDL7Nyb8b/Rm
30+
XVuyyX29AgMBAAECggEAdisOYtLkBbUhgXGHz5fr8sTUAS7FKw1hpJxFqcPOD4nS
31+
Y28xtBVSiXTk/MSwHQw5QQaU/Zb6d0ubFv4ljAfm7hbr8U1ryjSnFIkN5c/7j+eT
32+
x0vom9d+YQRaJQpDkVHOk98FHpCWeFhN2ggT1hJk4DirxXY4nQYV42ZDUUmWlMOM
33+
ZT96mRpN6iTYbNt97DjVQHiY6Yg2Mgb3Pp0GpryLtxcp7ant/xCERkqxchJnJZrU
34+
DUWybVpoZA6qnviegc5CNej0Usp5FfvjDRdZcxsL83cinp8gTCBM6yDwxo5yp07h
35+
1ELBjqDlL/4cmzl9Cr5dGrQC0ogumQFed07He9hggQKBgQDeMA/TQ5d96WNn64cp
36+
x/keWYARdmPkuy8mLeEBCCldUqeyEKH+MEKebrkJp++e2UZ9yHHULU0wZsjup09E
37+
iprV2GwC5sJFDFJC9sN7UhRGTENSG3ROmxxsRQ85AuxQ8r2Kkcus/Gln7NkQIew9
38+
PTYChszRYhgmvd8dbQnWJR5nyQKBgQDBBRLC++K4b5Ia7ZdPoEd1p8rUdHzgEJpu
39+
OULEw4amrZX5YCUii14G6bh86Yp1QBEPS4I33Y/WQfMTSBTWI5h4B39+bvkFyQD0
40+
lomt6T0I01Czg6325ifsOLCedRBJGyzKhcG2PP5d6orioT2tNx+CdabjkQqdnwiu
41+
FEyjr7zIVQKBgEIJ+PorEeDruI8PsznY5RN/OJB4JtK6TBZF9qWO3nSNd6h2Rx+9
42+
Cl/6uubC0nbdT5VdOW/+Ev463qgIdIgDxmefDuOB4OYS9nRO0eVajQoj6rKB1Hz0
43+
n2sSz6Z7Vu/sZifEk8wTreSkwhOIcaX2BpKTrFbjmBgTwTgGy7CpkbL5AoGAJ/dm
44+
9Ry2yz2+4PiFNiWX5lLB+s/L85E8iMouexOJVAXpYeN4jPiSlZfbbXHmC3Uikyot
45+
YmfsGo85R6rLNbPVJDVZPtK3mW0PV5W8GFiNHMC0mxcO9GqfpZfvakAPCTQpSB3+
46+
CEAE42lnLJn6bV1WlurJjaFAs3Z0k6b8X4BJ9KkCgYEA0cKrgKB3GidtKBeyuGKg
47+
Wdemq9T4c7R5swn/87Ud6UE0zALA8wBx7ZacQm9IOHiCSVdBGAEAzNd14Kri8DaK
48+
/5EHjZ2yI5cO108IbkTZ2TXevgjAHCvrhEtcgG0SrNNFJ6JoGiSqJ8Ue5xbj3P2y
49+
KYSFK5vRSIQ5GpR4zTXN7S4=
8350
-----END PRIVATE KEY-----

Diff for: tests/test_InfluxDBClientAsync.py

+9
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,15 @@ async def test_management_apis(self):
414414
self.assertIsInstance(results, Organizations)
415415
self.assertIn("my-org", list(map(lambda org: org.name, results.orgs)))
416416

417+
@async_test
418+
async def test_trust_env_default(self):
419+
self.assertFalse(self.client.api_client.rest_client.pool_manager.trust_env)
420+
421+
await self.client.close()
422+
self.client = InfluxDBClientAsync(url="http://localhost:8086", token="wrong", org="my-org",
423+
client_session_kwargs={'trust_env': True})
424+
self.assertTrue(self.client.api_client.rest_client.pool_manager.trust_env)
425+
417426
async def _prepare_data(self, measurement: str):
418427
_point1 = Point(measurement).tag("location", "Prague").field("temperature", 25.3)
419428
_point2 = Point(measurement).tag("location", "New York").field("temperature", 24.3)

0 commit comments

Comments
 (0)