chore: update exception type and exception message

Author: kgala2

google/cloud/sql/connector/connector.py

@@ -44,6 +44,7 @@
 from google.cloud.sql.connector.resolver import DnsResolver
 from google.cloud.sql.connector.utils import format_database_user
 from google.cloud.sql.connector.utils import generate_keys
+from google.cloud.sql.connector.exceptions import ClosedConnectorError
 
 logger = logging.getLogger(name=__name__)
 
@@ -244,8 +245,12 @@ def connect(
         # connect runs sync database connections on background thread.
         # Async database connections should call 'connect_async' directly to
         # avoid hanging indefinitely.
+
+        # Check if the connector is closed before attempting to connect.
         if self._closed:
-            raise RuntimeError("Cannot connect using a closed Connector.")
+            raise ClosedConnectorError(
+                "Connection attempt failed because the connector has already been closed."
+            )
         connect_future = asyncio.run_coroutine_threadsafe(
             self.connect_async(instance_connection_string, driver, **kwargs),
             self._loop,
@@ -287,7 +292,9 @@ async def connect_async(
                 Connector.
         """
         if self._closed:
-            raise RuntimeError("Cannot connect using a closed Connector.")
+            raise ClosedConnectorError(
+                "Connection attempt failed because the connector has already been closed."
+            )
         if self._keys is None:
             self._keys = asyncio.create_task(generate_keys())
         if self._client is None:

google/cloud/sql/connector/exceptions.py

@@ -84,3 +84,10 @@ class CacheClosedError(Exception):
     Exception to be raised when a ConnectionInfoCache can not be accessed after
     it is closed.
     """
+
+
+class ClosedConnectorError(Exception):
+    """
+    Exception to be raised when a Connector is closed and connect method is
+    called on it.
+    """

tests/unit/test_connector.py

@@ -16,7 +16,6 @@
 
 import asyncio
 import os
-import time
 from typing import Union
 
 from aiohttp import ClientResponseError
@@ -31,6 +30,7 @@
 from google.cloud.sql.connector.connection_name import ConnectionName
 from google.cloud.sql.connector.exceptions import CloudSQLIPTypeError
 from google.cloud.sql.connector.exceptions import IncompatibleDriverError
+from google.cloud.sql.connector.exceptions import ClosedConnectionError
 from google.cloud.sql.connector.instance import RefreshAheadCache
 
 
@@ -481,17 +481,18 @@ async def test_connect_async_closed_connector(
     ) as connector:
         connector._client = fake_client
         await connector.close_async()
-        # wait for close to complete
-        # await asyncio.sleep(0.1)
-        with pytest.raises(RuntimeError) as exc_info:
+        with pytest.raises(ClosedConnectionError) as exc_info:
             await connector.connect_async(
                 "test-project:test-region:test-instance",
                 "asyncpg",
                 user="my-user",
                 password="my-pass",
                 db="my-db",
             )
-        assert exc_info.value.args[0] == "Cannot connect using a closed Connector."
+        assert (
+            exc_info.value.args[0]
+            == "Connection attempt failed because the connector has already been closed."
+        )
 
 
 def test_connect_closed_connector(
@@ -501,13 +502,15 @@ def test_connect_closed_connector(
     with Connector(credentials=fake_credentials) as connector:
         connector._client = fake_client
         connector.close()
-        # time.sleep(3.1)
-        with pytest.raises(RuntimeError) as exc_info:
+        with pytest.raises(ClosedConnectionError) as exc_info:
             connector.connect(
                 "test-project:test-region:test-instance",
                 "pg8000",
                 user="my-user",
                 password="my-pass",
                 db="my-db",
             )
-        assert exc_info.value.args[0] == "Cannot connect using a closed Connector."
+        assert (
+            exc_info.value.args[0]
+            == "Connection attempt failed because the connector has already been closed."
+        )