address PR comments

Author: rhatgadkar-goog

google/cloud/alloydbconnector/async_connector.py

@@ -52,8 +52,11 @@ class AsyncConnector:
             Admin API.
         db_credentials (google.auth.credentials.Credentials):
             A credentials object created from the google-auth Python library.
+            This is only used when Auto IAM AuthN is enabled.
             If not specified, the credentials used for authenticating with the
             AlloyDB Admin API will also be used to authenticate with the DB.
+            If specified, the credential's scope should be
+            "https://www.googleapis.com/auth/alloydb.login".
         quota_project (str): The Project ID for an existing Google Cloud
             project. The project specified is used for quota and
             billing purposes.
@@ -103,14 +106,12 @@ def __init__(
         else:
             self._credentials, _ = google.auth.default(scopes=scopes)
         # initialize credentials for authenticating with the DB
-        scopes = ["https://www.googleapis.com/auth/alloydb.login"]
         if db_credentials:
-            self._db_credentials = with_scopes_if_required(
-                db_credentials, scopes=scopes
-            )
+            self._db_credentials = db_credentials
         # otherwise use the same credentials as the one for authenticating with
         # AlloyDB Admin API
         else:
+            scopes = ["https://www.googleapis.com/auth/alloydb.login"]
             self._db_credentials = with_scopes_if_required(
                 self._credentials, scopes=scopes
             )

google/cloud/alloydbconnector/connector.py

@@ -68,6 +68,8 @@ class Connector:
             A credentials object created from the google-auth Python library.
             If not specified, the credentials used for authenticating with the
             AlloyDB Admin API will also be used to authenticate with the DB.
+            If specified, the credential's scope should be
+            "https://www.googleapis.com/auth/alloydb.login".
         quota_project (str): The Project ID for an existing Google Cloud
             project. The project specified is used for quota and
             billing purposes.
@@ -128,14 +130,12 @@ def __init__(
         else:
             self._credentials, _ = default(scopes=scopes)
         # initialize credentials for authenticating with the DB
-        scopes = ["https://www.googleapis.com/auth/alloydb.login"]
         if db_credentials:
-            self._db_credentials = with_scopes_if_required(
-                db_credentials, scopes=scopes
-            )
+            self._db_credentials = db_credentials
         # otherwise use the same credentials as the one for authenticating with
         # AlloyDB Admin API
         else:
+            scopes = ["https://www.googleapis.com/auth/alloydb.login"]
             self._db_credentials = with_scopes_if_required(
                 self._credentials, scopes=scopes
             )

tests/unit/test_async_connector.py

@@ -81,23 +81,6 @@ async def test_AsyncConnector_init_scopes() -> None:
     await connector.close()
 
 
-async def test_AsyncConnector_init_db_credentials_scopes(
-    credentials: FakeCredentials,
-) -> None:
-    """
-    Test to check whether the __init__ method of AsyncConnector
-    properly sets the DB credential's scopes when DB credentials
-    are specified.
-    """
-    db_credentials = FakeCredentialsRequiresScopes()
-    connector = AsyncConnector(credentials, db_credentials)
-    assert connector._db_credentials != db_credentials
-    assert connector._db_credentials._scopes == [
-        "https://www.googleapis.com/auth/alloydb.login"
-    ]
-    await connector.close()
-
-
 @pytest.mark.parametrize(
     "ip_type, expected",
     [

tests/unit/test_connector.py

@@ -78,21 +78,6 @@ def test_Connector_init_scopes() -> None:
     connector.close()
 
 
-def test_Connector_init_db_credentials_scopes(credentials: FakeCredentials) -> None:
-    """
-    Test to check whether the __init__ method of Connector
-    properly sets the DB credential's scopes when DB credentials
-    are specified.
-    """
-    db_credentials = FakeCredentialsRequiresScopes()
-    connector = Connector(credentials, db_credentials)
-    assert connector._db_credentials != db_credentials
-    assert connector._db_credentials._scopes == [
-        "https://www.googleapis.com/auth/alloydb.login"
-    ]
-    connector.close()
-
-
 def test_Connector_init_bad_ip_type(credentials: FakeCredentials) -> None:
     """Test that Connector errors due to bad ip_type str."""
     bad_ip_type = "BAD-IP-TYPE"