Remove close() from AlloyDBClient because it is a no-op

Author: rhatgadkar-goog

google/cloud/alloydb/connector/async_connector.py

@@ -235,5 +235,3 @@ async def close(self) -> None:
         """Helper function to cancel RefreshAheadCaches' tasks
         and close client."""
         await asyncio.gather(*[cache.close() for cache in self._cache.values()])
-        if self._client:
-            await self._client.close()

google/cloud/alloydb/connector/client.py

@@ -244,7 +244,3 @@ async def get_connection_info(
             ip_addrs,
             expiration,
         )
-
-    async def close(self) -> None:
-        """Close AlloyDBClient gracefully."""
-        logger.debug("Closed AlloyDBClient")

google/cloud/alloydb/connector/connector.py

@@ -392,5 +392,3 @@ async def close_async(self) -> None:
         """Helper function to cancel RefreshAheadCaches' tasks
         and close client."""
         await asyncio.gather(*[cache.close() for cache in self._cache.values()])
-        if self._client:
-            await self._client.close()

tests/unit/mocks.py

@@ -233,7 +233,6 @@ def __init__(
         self, instance: Optional[FakeInstance] = None, driver: str = "pg8000"
     ) -> None:
         self.instance = FakeInstance() if instance is None else instance
-        self.closed = False
         self._user_agent = f"test-user-agent+{driver}"
         self._credentials = FakeCredentials()
 
@@ -318,9 +317,6 @@ async def get_connection_info(
             expiration,
         )
 
-    async def close(self) -> None:
-        self.closed = True
-
 
 def metadata_exchange(sock: ssl.SSLSocket) -> None:
     """
@@ -466,14 +462,12 @@ async def get_connection_info(
         if instance == "test-instance":
             ci.public_ip_address = ""
             ci.psc_dns_name = ""
-            return ci
         elif instance == "public-instance":
             ci.psc_dns_name = ""
-            return ci
         else:
             ci.ip_address = ""
             ci.public_ip_address = ""
-            return ci
+        return ci
 
     async def generate_client_certificate(
         self, request: alloydb_v1beta.GenerateClientCertificateRequest

tests/unit/test_async_connector.py

@@ -163,8 +163,6 @@ async def test_connect_and_close(credentials: FakeCredentials) -> None:
 
         # check connection is returned
         assert connection.result() is True
-        # outside of context manager check close cleaned up
-        assert connector._client.closed is True
 
 
 @pytest.mark.asyncio
@@ -244,8 +242,6 @@ async def test_context_manager_connect_and_close(
 
             # check connection is returned
             assert connection.result() is True
-        # outside of context manager check close cleaned up
-        assert fake_client.closed is True
 
 
 @pytest.mark.asyncio

tests/unit/test_client.py

@@ -96,7 +96,6 @@ async def test__get_metadata_error(
         await client._get_metadata(
             "my-project", "my-region", "my-cluster", "my-instance"
         )
-    await client.close()
 
 
 @pytest.mark.asyncio
@@ -131,7 +130,6 @@ async def test__get_client_certificate_error(
         await client._get_client_certificate(
             "my-project", "my-region", "my-cluster", ""
         )
-    await client.close()
 
 
 @pytest.mark.asyncio
@@ -146,8 +144,6 @@ async def test_AlloyDBClient_init_(credentials: FakeCredentials) -> None:
     # verify proper headers are set
     assert client._user_agent.startswith(f"alloydb-python-connector/{version}")
     assert client._client._client._client_options.quota_project_id == "my-quota-project"
-    # close client
-    await client.close()
 
 
 @pytest.mark.asyncio
@@ -166,7 +162,6 @@ async def test_AlloyDBClient_init_custom_user_agent(
     assert client._user_agent.startswith(
         f"alloydb-python-connector/{version} custom-agent/v1.0.0 other-agent/v2.0.0"
     )
-    await client.close()
 
 
 @pytest.mark.parametrize(
@@ -190,8 +185,6 @@ async def test_AlloyDBClient_user_agent(
         assert client._user_agent.startswith(
             f"alloydb-python-connector/{version}+{driver}"
         )
-    # close client
-    await client.close()
 
 
 @pytest.mark.parametrize(
@@ -210,5 +203,3 @@ async def test_AlloyDBClient_use_metadata(
         "www.test-endpoint.com", "my-quota-project", credentials, driver=driver
     )
     assert client._use_metadata == expected
-    # close client
-    await client.close()