cloud-sql-python-connector 1.22.0__tar.gz → 1.23.0__tar.gz

{cloud_sql_python_connector-1.22.0 → cloud_sql_python_connector-1.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-sql-python-connector
-Version: 1.22.0
+Version: 1.23.0
 Summary: Google Cloud SQL Python Connector library
 Author-email: Google LLC <googleapis-packages@google.com>
 License-Expression: Apache-2.0
@@ -12,13 +12,12 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
@@ -26,9 +25,7 @@ Requires-Dist: cryptography>=42.0.0
 Requires-Dist: dnspython>=2.0.0
 Requires-Dist: Requests
 Requires-Dist: google-auth>=2.28.0
-Requires-Dist: grpcio
-Requires-Dist: protobuf
-Requires-Dist: googleapis-common-protos
+Requires-Dist: google-cloud-sql>=0.1.1
 Provides-Extra: pymysql
 Requires-Dist: PyMySQL>=1.1.0; extra == "pymysql"
 Provides-Extra: pg8000
@@ -244,7 +241,7 @@ from google.cloud.sql.connector import Connector
 
 # Note: all parameters below are optional
 connector = Connector(
-    ip_type="public",  # can also be "private" or "psc"
+    ip_type="public",  # can also be "private", "psc", or "sql_data"
     enable_iam_auth=False,
     timeout=30,
     credentials=custom_creds, # google.auth.credentials.Credentials
@@ -322,7 +319,11 @@ with, set the `ip_type` keyword argument when initializing a `Connector()` or wh
 calling `connector.connect()`.
 
 Possible values for `ip_type` are `"public"` (default value),
-`"private"`, and `"psc"`.
+`"private"`, `"psc"`, and `"sql_data"`.
+
+> [!NOTE]
+>
+> Usage of the `asyncpg` driver does not currently support `ip_type="sql_data"` (`IPTypes.SQL_DATA`).
 
 Example:
 

{cloud_sql_python_connector-1.22.0 → cloud_sql_python_connector-1.23.0}/README.md

@@ -201,7 +201,7 @@ from google.cloud.sql.connector import Connector
 
 # Note: all parameters below are optional
 connector = Connector(
-    ip_type="public",  # can also be "private" or "psc"
+    ip_type="public",  # can also be "private", "psc", or "sql_data"
     enable_iam_auth=False,
     timeout=30,
     credentials=custom_creds, # google.auth.credentials.Credentials
@@ -279,7 +279,11 @@ with, set the `ip_type` keyword argument when initializing a `Connector()` or wh
 calling `connector.connect()`.
 
 Possible values for `ip_type` are `"public"` (default value),
-`"private"`, and `"psc"`.
+`"private"`, `"psc"`, and `"sql_data"`.
+
+> [!NOTE]
+>
+> Usage of the `asyncpg` driver does not currently support `ip_type="sql_data"` (`IPTypes.SQL_DATA`).
 
 Example:
 

{cloud_sql_python_connector-1.22.0 → cloud_sql_python_connector-1.23.0}/cloud_sql_python_connector.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-sql-python-connector
-Version: 1.22.0
+Version: 1.23.0
 Summary: Google Cloud SQL Python Connector library
 Author-email: Google LLC <googleapis-packages@google.com>
 License-Expression: Apache-2.0
@@ -12,13 +12,12 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
@@ -26,9 +25,7 @@ Requires-Dist: cryptography>=42.0.0
 Requires-Dist: dnspython>=2.0.0
 Requires-Dist: Requests
 Requires-Dist: google-auth>=2.28.0
-Requires-Dist: grpcio
-Requires-Dist: protobuf
-Requires-Dist: googleapis-common-protos
+Requires-Dist: google-cloud-sql>=0.1.1
 Provides-Extra: pymysql
 Requires-Dist: PyMySQL>=1.1.0; extra == "pymysql"
 Provides-Extra: pg8000
@@ -244,7 +241,7 @@ from google.cloud.sql.connector import Connector
 
 # Note: all parameters below are optional
 connector = Connector(
-    ip_type="public",  # can also be "private" or "psc"
+    ip_type="public",  # can also be "private", "psc", or "sql_data"
     enable_iam_auth=False,
     timeout=30,
     credentials=custom_creds, # google.auth.credentials.Credentials
@@ -322,7 +319,11 @@ with, set the `ip_type` keyword argument when initializing a `Connector()` or wh
 calling `connector.connect()`.
 
 Possible values for `ip_type` are `"public"` (default value),
-`"private"`, and `"psc"`.
+`"private"`, `"psc"`, and `"sql_data"`.
+
+> [!NOTE]
+>
+> Usage of the `asyncpg` driver does not currently support `ip_type="sql_data"` (`IPTypes.SQL_DATA`).
 
 Example:
 

{cloud_sql_python_connector-1.22.0 → cloud_sql_python_connector-1.23.0}/cloud_sql_python_connector.egg-info/SOURCES.txt

@@ -25,5 +25,6 @@ google/cloud/sql/connector/pytds.py
 google/cloud/sql/connector/rate_limiter.py
 google/cloud/sql/connector/refresh_utils.py
 google/cloud/sql/connector/resolver.py
+google/cloud/sql/connector/sqldata_client.py
 google/cloud/sql/connector/utils.py
 google/cloud/sql/connector/version.py

{cloud_sql_python_connector-1.22.0 → cloud_sql_python_connector-1.23.0}/cloud_sql_python_connector.egg-info/requires.txt

@@ -3,9 +3,7 @@ cryptography>=42.0.0
 dnspython>=2.0.0
 Requests
 google-auth>=2.28.0
-grpcio
-protobuf
-googleapis-common-protos
+google-cloud-sql>=0.1.1
 
 [asyncpg]
 asyncpg>=0.30.0

{cloud_sql_python_connector-1.22.0 → cloud_sql_python_connector-1.23.0}/google/cloud/sql/connector/client.py

@@ -173,9 +173,13 @@ class CloudSQLClient:
             if psc_dns_names:
                 ip_addresses["PSC"] = psc_dns_names
 
+        server_ca_cert = None
+        if "serverCaCert" in ret_dict and "cert" in ret_dict["serverCaCert"]:
+            server_ca_cert = ret_dict["serverCaCert"]["cert"]
+
         return {
             "ip_addresses": ip_addresses,
-            "server_ca_cert": ret_dict["serverCaCert"]["cert"],
+            "server_ca_cert": server_ca_cert,
             "database_version": ret_dict["databaseVersion"],
         }
 
@@ -271,7 +275,15 @@ class CloudSQLClient:
         finally:
             resp.raise_for_status()
 
-        ephemeral_cert: str = ret_dict["ephemeralCert"]["cert"]
+        try:
+            ephemeral_cert: str = ret_dict["ephemeralCert"]["cert"]
+        except KeyError as e:
+            logger.error(
+                "KeyError in _get_ephemeral parsing generateEphemeralCert: %s. Response dict: %s",
+                e,
+                ret_dict,
+            )
+            raise
 
         # decode cert to read expiration
         x509 = load_pem_x509_certificate(
@@ -285,7 +297,7 @@ class CloudSQLClient:
             # google.auth library strips timezone info for backwards compatibality
             # reasons with Python 2. Add it back to allow timezone aware datetimes.
             # Ref: https://github.com/googleapis/google-auth-library-python/blob/49a5ff7411a2ae4d32a7d11700f9f961c55406a9/google/auth/_helpers.py#L93-L99
-            token_expiration = token_expiration.replace(tzinfo=datetime.timezone.utc)
+            token_expiration = token_expiration.replace(tzinfo=datetime.UTC)
 
             expiration = min(expiration, token_expiration)
         return ephemeral_cert, expiration

{cloud_sql_python_connector-1.22.0 → cloud_sql_python_connector-1.23.0}/google/cloud/sql/connector/connection_info.py

@@ -21,6 +21,7 @@ import ssl
 from typing import Any, TYPE_CHECKING
 
 from google.cloud.sql.connector.connection_name import ConnectionName
+from google.cloud.sql.connector.exceptions import CloudSQLConnectionError
 from google.cloud.sql.connector.exceptions import CloudSQLIPTypeError
 from google.cloud.sql.connector.exceptions import TLSVersionError
 from google.cloud.sql.connector.utils import AsyncTemporaryDirectory
@@ -62,7 +63,7 @@ class ConnectionInfo:
 
     conn_name: ConnectionName
     client_cert: str
-    server_ca_cert: str
+    server_ca_cert: str | None
     private_key: bytes
     ip_addrs: dict[str, Any]
     database_version: str
@@ -78,6 +79,12 @@ class ConnectionInfo:
         # if SSL context is cached, use it
         if self.context is not None:
             return self.context
+        
+        if self.server_ca_cert is None:
+            raise CloudSQLConnectionError(
+                "Cannot create SSL context: server CA certificate is missing."
+            )
+
         context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
 
         # update ssl.PROTOCOL_TLS_CLIENT default