cloud-sql-python-connector 1.3.0__tar.gz → 1.4.1__tar.gz

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/PKG-INFO

@@ -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

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/cloud_sql_python_connector.egg-info/PKG-INFO

@@ -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

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/cloud_sql_python_connector.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ google/cloud/sql/connector/connector.py
 google/cloud/sql/connector/exceptions.py
 google/cloud/sql/connector/instance.py
 google/cloud/sql/connector/pg8000.py
+google/cloud/sql/connector/py.typed
 google/cloud/sql/connector/pymysql.py
 google/cloud/sql/connector/pytds.py
 google/cloud/sql/connector/rate_limiter.py

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/cloud_sql_python_connector.egg-info/requires.txt

@@ -7,10 +7,10 @@ google-auth
 asyncpg==0.28.0
 
 [pg8000]
-pg8000==1.29.8
+pg8000==1.30.1
 
 [pymysql]
 PyMySQL==1.1.0
 
 [pytds]
-python-tds==1.12.0
+python-tds==1.13.0

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/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:

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/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

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/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,
     )

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/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"

{cloud-sql-python-connector-1.3.0 → cloud-sql-python-connector-1.4.1}/setup.py

@@ -75,11 +75,12 @@ setup(
     install_requires=core_dependencies,
     extras_require={
         "pymysql": ["PyMySQL==1.1.0"],
-        "pg8000": ["pg8000==1.29.8"],
-        "pytds": ["python-tds==1.12.0"],
+        "pg8000": ["pg8000==1.30.1"],
+        "pytds": ["python-tds==1.13.0"],
         "asyncpg": ["asyncpg==0.28.0"]
     },
     python_requires=">=3.8",
     include_package_data=True,
     zip_safe=False,
+    package_data={"google.cloud.sql.connector": ["py.typed"]},
 )