cloud-sql-python-connector 1.3.0__py2.py3-none-any.whl → 1.4.1__py2.py3-none-any.whl

{cloud_sql_python_connector-1.3.0.dist-info → cloud_sql_python_connector-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-sql-python-connector
-Version: 1.3.0
+Version: 1.4.1
 Summary: The Cloud SQL Python Connector is a library that can be used alongside a database driver to allow users with sufficient permissions to connect to a Cloud SQL database without having to manually allowlist IPs or manage SSL certificates.
 Home-page: https://github.com/GoogleCloudPlatform/cloud-sql-python-connector
 Author: Google LLC
@@ -25,11 +25,11 @@ Requires-Dist: google-auth
 Provides-Extra: asyncpg
 Requires-Dist: asyncpg (==0.28.0) ; extra == 'asyncpg'
 Provides-Extra: pg8000
-Requires-Dist: pg8000 (==1.29.8) ; extra == 'pg8000'
+Requires-Dist: pg8000 (==1.30.1) ; extra == 'pg8000'
 Provides-Extra: pymysql
 Requires-Dist: PyMySQL (==1.1.0) ; extra == 'pymysql'
 Provides-Extra: pytds
-Requires-Dist: python-tds (==1.12.0) ; extra == 'pytds'
+Requires-Dist: python-tds (==1.13.0) ; extra == 'pytds'
 
 <p align="center">
     <a href="https://cloud.google.com/blog/topics/developers-practitioners/how-connect-cloud-sql-using-python-easy-way">

{cloud_sql_python_connector-1.3.0.dist-info → cloud_sql_python_connector-1.4.1.dist-info}/RECORD

@@ -1,20 +1,21 @@
-cloud_sql_python_connector-1.3.0-py3.9-nspkg.pth,sha256=b0D5dZk3RUzK54tZ9iZDvLm7u8ltc5EzYrGCmhsuoNw,1698
+cloud_sql_python_connector-1.4.1-py3.9-nspkg.pth,sha256=b0D5dZk3RUzK54tZ9iZDvLm7u8ltc5EzYrGCmhsuoNw,1698
 google/cloud/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 google/cloud/sql/connector/__init__.py,sha256=0PbPT7guIVFjTKy1mIkMge_BdiZDWooWf-Vll08nuIQ,876
 google/cloud/sql/connector/asyncpg.py,sha256=c4lAlvEgGf_eBq0G8MVNPRAJQQvo6DcwybiXDW36qkU,1838
-google/cloud/sql/connector/connector.py,sha256=I0WjRryj_RfRX2LNouiRiOigBCHPdQaMLZAHZppWJQw,14195
+google/cloud/sql/connector/connector.py,sha256=TciqbF7R92eJKXHqhWZvPBRsff7oYF-3yeHCttfTO3w,14201
 google/cloud/sql/connector/exceptions.py,sha256=99sY_6UVuSeSg1jFusXOpPWEsbzDwk-LLo4WZkcsL2A,1649
-google/cloud/sql/connector/instance.py,sha256=NoizVdawvKpy89Gacp5oGUQUc92rk4-x7bJf6HEpuvI,17711
-google/cloud/sql/connector/pg8000.py,sha256=HfY5kHfk_2hb6dMc4Vr5fdyMiQDhwY_uxjbpuyXjYsM,2031
+google/cloud/sql/connector/instance.py,sha256=fgbxXQ6qtJlofhgotxhu4T87ptJls99i_hT2NtsnuGs,17649
+google/cloud/sql/connector/pg8000.py,sha256=EZuO7XgCkG_Y79NQlh3Vv8Ff2w85BFJyFVO237hx1GM,1814
+google/cloud/sql/connector/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 google/cloud/sql/connector/pymysql.py,sha256=wldUgwDPlPa8Nj5F3JaipuP8hJyvzlgOAJbRnOoaB1U,2105
 google/cloud/sql/connector/pytds.py,sha256=vKJoE7E2P0GrhZojg8bGZkqCMLc8dgKAcXE4ee7vEVc,2452
 google/cloud/sql/connector/rate_limiter.py,sha256=Ci3f-94090bj0cWJUu-vGZFc32IWRCyi8TIgChsQvxY,2954
 google/cloud/sql/connector/refresh_utils.py,sha256=m0kPpRDEQgrq5PBLhdeGNSiOWWY8oBA6d0pOoTznKII,9565
 google/cloud/sql/connector/utils.py,sha256=Y5I0kIAiT-Fb1xa50EKIJmyPBccd3lWCZ2OT4SbdxQI,4371
-google/cloud/sql/connector/version.py,sha256=SUVjzYavIesJC6lrq-I9zzQLpoo0hWsl0qAne7yszzQ,597
-cloud_sql_python_connector-1.3.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-cloud_sql_python_connector-1.3.0.dist-info/METADATA,sha256=S7IpBlnZgwErnkE-BiZjRdxF36OiSh0f8-mZUtiDhaY,24144
-cloud_sql_python_connector-1.3.0.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-cloud_sql_python_connector-1.3.0.dist-info/namespace_packages.txt,sha256=v8IaYqRE2a0onAGJIpZeFkkH83wXSWZRR9eOyfMwoTc,20
-cloud_sql_python_connector-1.3.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-cloud_sql_python_connector-1.3.0.dist-info/RECORD,,
+google/cloud/sql/connector/version.py,sha256=eEdgQtHsN2o2YsShYyjrQLZSoyk4nSu7NHvrSWUhnPc,597
+cloud_sql_python_connector-1.4.1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+cloud_sql_python_connector-1.4.1.dist-info/METADATA,sha256=jDNJl8YGthz1pqtRli4HpfJwrTp8x4LeIPfg1wuhlG4,24144
+cloud_sql_python_connector-1.4.1.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+cloud_sql_python_connector-1.4.1.dist-info/namespace_packages.txt,sha256=v8IaYqRE2a0onAGJIpZeFkkH83wXSWZRR9eOyfMwoTc,20
+cloud_sql_python_connector-1.4.1.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+cloud_sql_python_connector-1.4.1.dist-info/RECORD,,

google/cloud/sql/connector/connector.py

@@ -280,7 +280,7 @@ class Connector:
 
         except Exception:
             # with any exception, we attempt a force refresh, then throw the error
-            instance.force_refresh()
+            await instance.force_refresh()
             raise
 
     def __enter__(self) -> Any:

google/cloud/sql/connector/instance.py

@@ -104,10 +104,6 @@ class InstanceMetadata:
                 "Upgrade your OpenSSL version to 1.1.1 for TLSv1.3 support."
             )
             self.context.minimum_version = ssl.TLSVersion.TLSv1_2
-
-        # add request_ssl attribute to ssl.SSLContext, required for pg8000 driver
-        self.context.request_ssl = False  # type: ignore
-
         self.expiration = expiration
 
         # tmpdir and its contents are automatically deleted after the CA cert
@@ -259,7 +255,7 @@ class Instance:
         self._current = self._schedule_refresh(0)
         self._next = self._current
 
-    def force_refresh(self) -> None:
+    async def force_refresh(self) -> None:
         """
         Forces a new refresh attempt immediately to be used for future connection attempts.
         """
@@ -267,8 +263,9 @@ class Instance:
         if not self._refresh_in_progress.is_set():
             self._next.cancel()
             self._next = self._schedule_refresh(0)
-        # block all sequential connection attempts on the next refresh result
-        self._current = self._next
+        # block all sequential connection attempts on the next refresh result if current is invalid
+        if not await _is_valid(self._current):
+            self._current = self._next
 
     async def _perform_refresh(self) -> InstanceMetadata:
         """Retrieves instance metadata and ephemeral certificate from the

google/cloud/sql/connector/pg8000.py

@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+import socket
 import ssl
 from typing import Any, TYPE_CHECKING
 
@@ -39,26 +40,26 @@ def connect(
     :rtype: pg8000.dbapi.Connection
     :returns: A pg8000 Connection object for the Cloud SQL instance.
     """
-    # Connecting through pg8000 is done by passing in an SSL Context and setting the
-    # "request_ssl" attr to false. This works because when "request_ssl" is false,
-    # the driver skips the database level SSL/TLS exchange, but still uses the
-    # ssl_context (if it is not None) to create the connection.
     try:
         import pg8000
     except ImportError:
         raise ImportError(
             'Unable to import module "pg8000." Please install and try again.'
         )
+
+    # Create socket and wrap with context.
+    sock = ctx.wrap_socket(
+        socket.create_connection((ip_address, SERVER_PROXY_PORT)),
+        server_hostname=ip_address,
+    )
+
     user = kwargs.pop("user")
     db = kwargs.pop("db")
     passwd = kwargs.pop("password", None)
-    setattr(ctx, "request_ssl", False)
     return pg8000.dbapi.connect(
         user,
         database=db,
         password=passwd,
-        host=ip_address,
-        port=SERVER_PROXY_PORT,
-        ssl_context=ctx,
+        sock=sock,
         **kwargs,
     )

google/cloud/sql/connector/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.3.0"
+__version__ = "1.4.1"