SNOW-93078: remove dependecy on botocore requests. updated with botocore, boto3 and requests to the latest. SNOW-110891: pin stable version of Azure packages

Author: sfc-gh-stakeda

network.py

@@ -17,12 +17,12 @@
 from threading import Lock
 
 import OpenSSL.SSL
-from botocore.vendored import requests
-from botocore.vendored.requests.adapters import HTTPAdapter
-from botocore.vendored.requests.auth import AuthBase
-from botocore.vendored.requests.exceptions import (
+import requests
+from requests.adapters import HTTPAdapter
+from requests.auth import AuthBase
+from requests.exceptions import (
     ConnectionError, ConnectTimeout, ReadTimeout, SSLError)
-from botocore.vendored.requests.packages.urllib3.exceptions import (
+from requests.packages.urllib3.exceptions import (
     ProtocolError, ReadTimeoutError)
 
 from snowflake.connector.time_util import get_time_millis

ocsp_snowflake.py

@@ -1221,7 +1221,7 @@ def _lazy_read_ca_bundle(self):
                     self.read_cert_bundle(ca_bundle)
                 else:
                     import sys
-                    from botocore.vendored.requests import certs
+                    from requests import certs
                     if hasattr(certs, '__file__') and \
                             path.exists(certs.__file__) and \
                             path.exists(path.join(

setup.py

@@ -157,10 +157,12 @@ def _get_pyarrow_lib_pattern(self, lib_name):
     python_requires='>=2.7.9,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
 
     install_requires=[
-        'azure-common',
-        'azure-storage-blob',
-        'boto3>=1.4.4,<1.10.0',
-        'botocore>=1.5.0,<1.13.0',
+        'azure-common<2.0.0',
+        'azure-storage-blob<12.0.0',
+        'boto3>=1.4.4,<1.11.0',
+        'botocore>=1.5.0,<1.14.0',
+        'requests<2.23.0',
+        'urllib3<1.25.0',
         'certifi',
         'future',
         'six',

ssl_wrap_socket.py

@@ -28,14 +28,14 @@
 from socket import (socket, timeout)
 
 import OpenSSL.SSL
-from botocore.vendored.requests.packages.urllib3 import connection \
-    as urllib3_connection
-from botocore.vendored.requests.packages.urllib3 import util \
-    as urllib3_util
+
 from cryptography import x509
 from cryptography.hazmat.backends.openssl import backend as openssl_backend
 from cryptography.hazmat.backends.openssl.x509 import _Certificate
 
+import requests.packages.urllib3.util.ssl_ as ssl_
+import requests.packages.urllib3.connection as connection_
+
 from .compat import PY2
 from .errorcode import (ER_SERVER_CERTIFICATE_REVOKED)
 from .errors import (OperationalError)
@@ -84,7 +84,7 @@ def inject_into_urllib3():
     Monkey-patch urllib3 with PyOpenSSL-backed SSL-support and OCSP.
     """
     log.debug(u'Injecting ssl_wrap_socket_with_ocsp')
-    urllib3_connection.ssl_wrap_socket = ssl_wrap_socket_with_ocsp
+    connection_.ssl_wrap_socket = ssl_wrap_socket_with_ocsp
 
 
 def _dnsname_to_stdlib(name):
@@ -310,7 +310,7 @@ def makefile(self, mode, bufsize=-1):
 
 WrappedSocket.makefile = makefile
 
-DEFAULT_SSL_CIPHER_LIST = urllib3_util.ssl_.DEFAULT_CIPHERS
+DEFAULT_SSL_CIPHER_LIST = ssl_.DEFAULT_CIPHERS
 if isinstance(DEFAULT_SSL_CIPHER_LIST, str):
     DEFAULT_SSL_CIPHER_LIST = DEFAULT_SSL_CIPHER_LIST.encode('utf-8')
 
@@ -368,12 +368,13 @@ def _verify_callback(cnx, x509, err_no, err_depth, return_code):
 
 
 def ssl_wrap_socket_with_ocsp(
-        sock, keyfile=None, certfile=None, cert_reqs=None,
-        ca_certs=None, server_hostname=None, ssl_version=None):
-    ret = ssl_wrap_socket(
-        sock, keyfile=keyfile, certfile=certfile, cert_reqs=cert_reqs,
-        ca_certs=ca_certs, server_hostname=server_hostname,
-        ssl_version=ssl_version)
+        sock, keyfile=None, certfile=None, ca_certs=None,
+        ca_cert_dir=None, server_hostname=None, ssl_context=None):
+
+    ret = ssl_.ssl_wrap_socket(
+        sock, keyfile=keyfile, certfile=certfile,
+        ca_certs=ca_certs, ca_cert_dir=ca_cert_dir,
+        server_hostname=server_hostname)
     global FEATURE_OCSP_MODE
     global FEATURE_OCSP_RESPONSE_CACHE_FILE_NAME
 

test/test_unit_retry_network.py

@@ -13,9 +13,9 @@
 
 import OpenSSL.SSL
 import pytest
-from botocore.vendored.requests.exceptions import (
+from requests.exceptions import (
     ConnectionError, ConnectTimeout, ReadTimeout, SSLError)
-from botocore.vendored.requests.packages.urllib3.exceptions import (
+from requests.packages.urllib3.exceptions import (
     ProtocolError, ReadTimeoutError)
 
 from snowflake.connector.compat import (