Skip to content

Commit 2ac6841

Browse files
committed
fix session.py for proxy
1 parent 8fb01b8 commit 2ac6841

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

nifcloud/session.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from botocore import __version__ as botocore_version
44
from botocore import session
5-
from botocore.httpsession import URLLib3Session
65
from botocore.session import get_session # noqa: F401
76

87
import nifcloud
@@ -16,14 +15,7 @@
1615
ssl_context.set_ciphers(f"{default_cipher_names}:{extra_ciphers}")
1716

1817

19-
class CustomURLLib3Session(URLLib3Session):
20-
def __init__(self, *args, **kwargs):
21-
super().__init__(*args, **kwargs)
22-
self._manager.connection_pool_kw['ssl_context'] = ssl_context
23-
24-
2518
class Session(session.Session):
26-
2719
def __init__(self, session_vars=None, event_hooks=None,
2820
include_builtin_handlers=True, profile=None):
2921
super(Session, self).__init__(session_vars, event_hooks,
@@ -37,11 +29,22 @@ def create_client(self, service_name, region_name=None, api_version=None,
3729
nifcloud_access_key_id=None, nifcloud_secret_access_key=None,
3830
nifcloud_session_token=None, config=None):
3931
client = super(Session, self).create_client(
40-
service_name, region_name=region_name, api_version=api_version, use_ssl=use_ssl,
41-
verify=verify, endpoint_url=endpoint_url, aws_access_key_id=nifcloud_access_key_id,
42-
aws_secret_access_key=nifcloud_secret_access_key, aws_session_token=nifcloud_session_token, config=config
32+
service_name,
33+
region_name=region_name,
34+
api_version=api_version,
35+
use_ssl=use_ssl,
36+
verify=verify,
37+
endpoint_url=endpoint_url,
38+
aws_access_key_id=nifcloud_access_key_id,
39+
aws_secret_access_key=nifcloud_secret_access_key,
40+
aws_session_token=nifcloud_session_token,
41+
config=config
4342
)
44-
client._endpoint.http_session = CustomURLLib3Session()
43+
44+
http_session = client._endpoint.http_session
45+
if hasattr(http_session, '_manager'):
46+
http_session._manager.connection_pool_kw['ssl_context'] = ssl_context
47+
4548
return client
4649

4750

0 commit comments

Comments
 (0)