chore: fix existing tests

Author: jackwotherspoon

tests/conftest.py

@@ -26,6 +26,7 @@
 from unit.mocks import FakeCSQLInstance  # type: ignore
 
 from google.cloud.sql.connector.client import CloudSQLClient
+from google.cloud.sql.connector.connection_name import ConnectionName
 from google.cloud.sql.connector.instance import RefreshAheadCache
 from google.cloud.sql.connector.utils import generate_keys
 
@@ -144,7 +145,7 @@ async def fake_client(
 async def cache(fake_client: CloudSQLClient) -> AsyncGenerator[RefreshAheadCache, None]:
     keys = asyncio.create_task(generate_keys())
     cache = RefreshAheadCache(
-        "test-project:test-region:test-instance",
+        ConnectionName("test-project", "test-region", "test-instance"),
         client=fake_client,
         keys=keys,
     )

tests/unit/test_connector.py

@@ -26,6 +26,7 @@
 from google.cloud.sql.connector import create_async_connector
 from google.cloud.sql.connector import IPTypes
 from google.cloud.sql.connector.client import CloudSQLClient
+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.instance import RefreshAheadCache
@@ -322,18 +323,18 @@ async def test_Connector_remove_cached_bad_instance(
     async with Connector(
         credentials=fake_credentials, loop=asyncio.get_running_loop()
     ) as connector:
-        conn_name = "bad-project:bad-region:bad-inst"
+        conn_name = ConnectionName("bad-project", "bad-region", "bad-inst")
         # populate cache
         cache = RefreshAheadCache(conn_name, fake_client, connector._keys)
-        connector._cache[(conn_name, False)] = cache
+        connector._cache[(str(conn_name), False)] = cache
         # aiohttp client should throw a 404 ClientResponseError
         with pytest.raises(ClientResponseError):
             await connector.connect_async(
-                conn_name,
+                str(conn_name),
                 "pg8000",
             )
         # check that cache has been removed from dict
-        assert (conn_name, False) not in connector._cache
+        assert (str(conn_name), False) not in connector._cache
 
 
 async def test_Connector_remove_cached_no_ip_type(
@@ -348,21 +349,21 @@ async def test_Connector_remove_cached_no_ip_type(
     async with Connector(
         credentials=fake_credentials, loop=asyncio.get_running_loop()
     ) as connector:
-        conn_name = "test-project:test-region:test-instance"
+        conn_name = ConnectionName("test-project", "test-region", "test-instance")
         # populate cache
         cache = RefreshAheadCache(conn_name, fake_client, connector._keys)
-        connector._cache[(conn_name, False)] = cache
+        connector._cache[(str(conn_name), False)] = cache
         # test instance does not have Private IP, thus should invalidate cache
         with pytest.raises(CloudSQLIPTypeError):
             await connector.connect_async(
-                conn_name,
+                str(conn_name),
                 "pg8000",
                 user="my-user",
                 password="my-pass",
                 ip_type="private",
             )
         # check that cache has been removed from dict
-        assert (conn_name, False) not in connector._cache
+        assert (str(conn_name), False) not in connector._cache
 
 
 def test_default_universe_domain(fake_credentials: Credentials) -> None:

tests/unit/test_instance.py

@@ -28,6 +28,7 @@
 from google.cloud.sql.connector import IPTypes
 from google.cloud.sql.connector.client import CloudSQLClient
 from google.cloud.sql.connector.connection_info import ConnectionInfo
+from google.cloud.sql.connector.connection_name import ConnectionName
 from google.cloud.sql.connector.exceptions import AutoIAMAuthNotSupported
 from google.cloud.sql.connector.exceptions import CloudSQLIPTypeError
 from google.cloud.sql.connector.instance import RefreshAheadCache
@@ -300,7 +301,7 @@ async def test_ClientResponseError(
             repeat=True,
         )
         cache = RefreshAheadCache(
-            "my-project:my-region:my-instance",
+            ConnectionName("my-project", "my-region", "my-instance"),
             client,
             keys,
         )
@@ -328,7 +329,7 @@ async def test_AutoIAMAuthNotSupportedError(fake_client: CloudSQLClient) -> None
     # generate client key pair
     keys = asyncio.create_task(generate_keys())
     cache = RefreshAheadCache(
-        "test-project:test-region:sqlserver-instance",
+        ConnectionName("test-project", "test-region", "sqlserver-instance"),
         client=fake_client,
         keys=keys,
         enable_iam_auth=True,

tests/unit/test_lazy.py

@@ -16,6 +16,7 @@
 
 from google.cloud.sql.connector.client import CloudSQLClient
 from google.cloud.sql.connector.connection_info import ConnectionInfo
+from google.cloud.sql.connector.connection_name import ConnectionName
 from google.cloud.sql.connector.lazy import LazyRefreshCache
 from google.cloud.sql.connector.utils import generate_keys
 
@@ -26,7 +27,7 @@ async def test_LazyRefreshCache_connect_info(fake_client: CloudSQLClient) -> Non
     """
     keys = asyncio.create_task(generate_keys())
     cache = LazyRefreshCache(
-        "test-project:test-region:test-instance",
+        ConnectionName("test-project", "test-region", "test-instance"),
         client=fake_client,
         keys=keys,
         enable_iam_auth=False,
@@ -47,7 +48,7 @@ async def test_LazyRefreshCache_force_refresh(fake_client: CloudSQLClient) -> No
     """
     keys = asyncio.create_task(generate_keys())
     cache = LazyRefreshCache(
-        "test-project:test-region:test-instance",
+        ConnectionName("test-project", "test-region", "test-instance"),
         client=fake_client,
         keys=keys,
         enable_iam_auth=False,