fix lint errors

Author: rhatgadkar-goog

google/cloud/alloydb/connector/client.py

@@ -23,11 +23,11 @@
 from google.api_core.gapic_v1.client_info import ClientInfo
 from google.auth.credentials import TokenState
 from google.auth.transport import requests
+import google.cloud.alloydb_v1beta as v1beta
+from google.protobuf import duration_pb2
 
-from google.cloud import alloydb_v1beta
 from google.cloud.alloydb.connector.connection_info import ConnectionInfo
 from google.cloud.alloydb.connector.version import __version__ as version
-from google.protobuf import duration_pb2
 
 if TYPE_CHECKING:
     from google.auth.credentials import Credentials
@@ -58,7 +58,7 @@ def __init__(
         alloydb_api_endpoint: str,
         quota_project: Optional[str],
         credentials: Credentials,
-        client: Optional[alloydb_v1beta.AlloyDBAdminAsyncClient] = None,
+        client: Optional[v1beta.AlloyDBAdminAsyncClient] = None,
         driver: Optional[str] = None,
         user_agent: Optional[str] = None,
     ) -> None:
@@ -75,22 +75,26 @@ def __init__(
                 A credentials object created from the google-auth Python library.
                 Must have the AlloyDB Admin scopes. For more info check out
                 https://google-auth.readthedocs.io/en/latest/.
-            client (alloydb_v1beta.AlloyDBAdminAsyncClient): Async client used to
-                make requests to AlloyDB APIs.
+            client (v1beta.AlloyDBAdminAsyncClient): Async client used to make
+                requests to AlloyDB APIs.
                 Optional, defaults to None and creates new client.
             driver (str): Database driver to be used by the client.
         """
         user_agent = _format_user_agent(driver, user_agent)
 
-        self._client = client if client else alloydb_v1beta.AlloyDBAdminAsyncClient(
-            credentials=credentials,
-            client_options=ClientOptions(
-                api_endpoint=alloydb_api_endpoint,
-                quota_project_id=quota_project,
-            ),
-            client_info=ClientInfo(
-                user_agent=user_agent,
-            ),
+        self._client = (
+            client
+            if client
+            else v1beta.AlloyDBAdminAsyncClient(
+                credentials=credentials,
+                client_options=ClientOptions(
+                    api_endpoint=alloydb_api_endpoint,
+                    quota_project_id=quota_project,
+                ),
+                client_info=ClientInfo(
+                    user_agent=user_agent,
+                ),
+            )
         )
         self._credentials = credentials
         # asyncpg does not currently support using metadata exchange
@@ -122,9 +126,11 @@ async def _get_metadata(
         Returns:
             dict: IP addresses of the AlloyDB instance.
         """
-        parent = f"projects/{project}/locations/{region}/clusters/{cluster}/instances/{name}"
+        parent = (
+            f"projects/{project}/locations/{region}/clusters/{cluster}/instances/{name}"
+        )
 
-        req = alloydb_v1beta.GetConnectionInfoRequest(parent=parent)
+        req = v1beta.GetConnectionInfoRequest(parent=parent)
         resp = await self._client.get_connection_info(request=req)
 
         # Remove trailing period from PSC DNS name.
@@ -166,7 +172,7 @@ async def _get_client_certificate(
         parent = f"projects/{project}/locations/{region}/clusters/{cluster}"
         dur = duration_pb2.Duration()
         dur.seconds = 3600
-        req = alloydb_v1beta.GenerateClientCertificateRequest(
+        req = v1beta.GenerateClientCertificateRequest(
             parent=parent,
             cert_duration=dur,
             public_key=pub_key,

mypy.ini

@@ -11,3 +11,9 @@ ignore_missing_imports = True
 
 [mypy-asyncpg]
 ignore_missing_imports = True
+
+[mypy-google.cloud.alloydb_v1beta]
+ignore_missing_imports = True
+
+[mypy-google.api_core.*]
+ignore_missing_imports = True

tests/unit/mocks.py

@@ -452,7 +452,9 @@ def write_static_info(i: FakeInstance) -> io.StringIO:
 
 
 class FakeAlloyDBAdminAsyncClient:
-    async def get_connection_info(self, request: alloydb_v1beta.GetConnectionInfoRequest) -> alloydb_v1beta.types.resources.ConnectionInfo:
+    async def get_connection_info(
+        self, request: alloydb_v1beta.GetConnectionInfoRequest
+    ) -> alloydb_v1beta.types.resources.ConnectionInfo:
         ci = alloydb_v1beta.types.resources.ConnectionInfo()
         ci.ip_address = "10.0.0.1"
         ci.public_ip_address = "127.0.0.1"
@@ -473,7 +475,9 @@ async def get_connection_info(self, request: alloydb_v1beta.GetConnectionInfoReq
             ci.public_ip_address = ""
             return ci
 
-    async def generate_client_certificate(self, request: alloydb_v1beta.GenerateClientCertificateRequest) -> alloydb_v1beta.types.service.GenerateClientCertificateResponse:
+    async def generate_client_certificate(
+        self, request: alloydb_v1beta.GenerateClientCertificateRequest
+    ) -> alloydb_v1beta.types.service.GenerateClientCertificateResponse:
         ccr = alloydb_v1beta.types.service.GenerateClientCertificateResponse()
         ccr.ca_cert = "This is the CA cert"
         ccr.pem_certificate_chain.append("This is the client cert")

tests/unit/test_async_connector.py

@@ -15,13 +15,13 @@
 import asyncio
 from typing import Union
 
+from google.api_core.exceptions import RetryError
 from mock import patch
 from mocks import FakeAlloyDBClient
 from mocks import FakeConnectionInfo
 from mocks import FakeCredentials
 import pytest
 
-from google.api_core.exceptions import RetryError
 from google.cloud.alloydb.connector import AsyncConnector
 from google.cloud.alloydb.connector import IPTypes
 from google.cloud.alloydb.connector.exceptions import IPTypeNotFoundError

tests/unit/test_client.py

@@ -12,15 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Optional
+from typing import Optional
 
-from aiohttp import ClientResponseError
-from aioresponses import aioresponses
-from mocks import FakeAlloyDBAdminAsyncClient, FakeCredentials
+from google.api_core.exceptions import RetryError
+from mocks import FakeAlloyDBAdminAsyncClient
+from mocks import FakeCredentials
 import pytest
 
-from google.api_core.exceptions import RetryError
-from google.cloud import alloydb_v1beta
 from google.cloud.alloydb.connector.client import AlloyDBClient
 from google.cloud.alloydb.connector.utils import generate_keys
 from google.cloud.alloydb.connector.version import __version__ as version
@@ -46,9 +44,7 @@ async def test__get_metadata(credentials: FakeCredentials) -> None:
 
 
 @pytest.mark.asyncio
-async def test__get_metadata_with_public_ip(
-    credentials: FakeCredentials
-) -> None:
+async def test__get_metadata_with_public_ip(credentials: FakeCredentials) -> None:
     """
     Test _get_metadata returns successfully with Public IP.
     """
@@ -67,9 +63,7 @@ async def test__get_metadata_with_public_ip(
 
 
 @pytest.mark.asyncio
-async def test__get_metadata_with_psc(
-    credentials: FakeCredentials
-) -> None:
+async def test__get_metadata_with_psc(credentials: FakeCredentials) -> None:
     """
     Test _get_metadata returns successfully with PSC DNS name.
     """
@@ -106,9 +100,7 @@ async def test__get_metadata_error(
 
 
 @pytest.mark.asyncio
-async def test__get_client_certificate(
-    credentials: FakeCredentials
-) -> None:
+async def test__get_client_certificate(credentials: FakeCredentials) -> None:
     """
     Test _get_client_certificate returns successfully.
     """
@@ -171,7 +163,9 @@ async def test_AlloyDBClient_init_custom_user_agent(
         credentials,
         user_agent="custom-agent/v1.0.0 other-agent/v2.0.0",
     )
-    assert client._user_agent.startswith(f"alloydb-python-connector/{version} custom-agent/v1.0.0 other-agent/v2.0.0")
+    assert client._user_agent.startswith(
+        f"alloydb-python-connector/{version} custom-agent/v1.0.0 other-agent/v2.0.0"
+    )
     await client.close()
 
 
@@ -193,7 +187,9 @@ async def test_AlloyDBClient_user_agent(
     if driver is None:
         assert client._user_agent.startswith(f"alloydb-python-connector/{version}")
     else:
-        assert client._user_agent.startswith(f"alloydb-python-connector/{version}+{driver}")
+        assert client._user_agent.startswith(
+            f"alloydb-python-connector/{version}+{driver}"
+        )
     # close client
     await client.close()
 

tests/unit/test_connector.py

@@ -16,13 +16,13 @@
 from threading import Thread
 from typing import Union
 
+from google.api_core.exceptions import RetryError
 from mock import patch
 from mocks import FakeAlloyDBClient
 from mocks import FakeCredentials
 from mocks import write_static_info
 import pytest
 
-from google.api_core.exceptions import RetryError
 from google.cloud.alloydb.connector import Connector
 from google.cloud.alloydb.connector import IPTypes
 from google.cloud.alloydb.connector.exceptions import IPTypeNotFoundError