Strip 'https' prefix from alloydb_api_endpoint

Author: rhatgadkar-goog

google/cloud/alloydb/connector/async_connector.py

@@ -31,6 +31,7 @@
 from google.cloud.alloydb.connector.lazy import LazyRefreshCache
 from google.cloud.alloydb.connector.types import CacheTypes
 from google.cloud.alloydb.connector.utils import generate_keys
+from google.cloud.alloydb.connector.utils import strip_http_prefix
 
 if TYPE_CHECKING:
     from google.auth.credentials import Credentials
@@ -51,7 +52,7 @@ class AsyncConnector:
             billing purposes.
             Defaults to None, picking up project from environment.
         alloydb_api_endpoint (str): Base URL to use when calling
-            the AlloyDB API endpoint. Defaults to "https://alloydb.googleapis.com".
+            the AlloyDB API endpoint. Defaults to "alloydb.googleapis.com".
         enable_iam_auth (bool): Enables automatic IAM database authentication.
         ip_type (str | IPTypes): Default IP type for all AlloyDB connections.
             Defaults to IPTypes.PRIVATE ("PRIVATE") for private IP connections.
@@ -75,7 +76,7 @@ def __init__(
         self._cache: dict[str, CacheTypes] = {}
         # initialize default params
         self._quota_project = quota_project
-        self._alloydb_api_endpoint = alloydb_api_endpoint
+        self._alloydb_api_endpoint = strip_http_prefix(alloydb_api_endpoint)
         self._enable_iam_auth = enable_iam_auth
         # if ip_type is str, convert to IPTypes enum
         if isinstance(ip_type, str):

google/cloud/alloydb/connector/connector.py

@@ -37,6 +37,7 @@
 import google.cloud.alloydb.connector.pg8000 as pg8000
 from google.cloud.alloydb.connector.types import CacheTypes
 from google.cloud.alloydb.connector.utils import generate_keys
+from google.cloud.alloydb.connector.utils import strip_http_prefix
 import google.cloud.alloydb_connectors_v1.proto.resources_pb2 as connectorspb
 
 if TYPE_CHECKING:
@@ -99,7 +100,7 @@ def __init__(
         self._cache: dict[str, CacheTypes] = {}
         # initialize default params
         self._quota_project = quota_project
-        self._alloydb_api_endpoint = alloydb_api_endpoint
+        self._alloydb_api_endpoint = strip_http_prefix(alloydb_api_endpoint)
         self._enable_iam_auth = enable_iam_auth
         # if ip_type is str, convert to IPTypes enum
         if isinstance(ip_type, str):

google/cloud/alloydb/connector/utils.py

@@ -14,6 +14,8 @@
 
 from __future__ import annotations
 
+import re
+
 import aiofiles
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
@@ -58,3 +60,13 @@ async def generate_keys() -> tuple[rsa.RSAPrivateKey, str]:
         .decode("UTF-8")
     )
     return (priv_key, pub_key)
+
+
+def strip_http_prefix(url: str) -> str:
+    """
+    Returns a new URL with 'http://' or 'https://' prefix removed.
+    """
+    if url == "":
+        return ""
+    m = re.search(r"^(https?://)?(.+)", url)
+    return m.group(2)

tests/unit/test_async_connector.py

@@ -109,6 +109,26 @@ async def test_AsyncConnector_init_bad_ip_type(credentials: FakeCredentials) ->
     )
 
 
+def test_AsyncConnector_init_alloydb_api_endpoint_with_http_prefix():
+    """
+    Test to check whether the __init__ method of AsyncConnector properly sets
+    alloydb_api_endpoint when its URL has an 'http://' prefix.
+    """
+    connector = AsyncConnector(alloydb_api_endpoint="http://alloydb.googleapis.com")
+    assert connector._alloydb_api_endpoint == "alloydb.googleapis.com"
+    connector.close()
+
+
+def test_AsyncConnector_init_alloydb_api_endpoint_with_https_prefix():
+    """
+    Test to check whether the __init__ method of AsyncConnector properly sets
+    alloydb_api_endpoint when its URL has an 'https://' prefix.
+    """
+    connector = AsyncConnector(alloydb_api_endpoint="https://alloydb.googleapis.com")
+    assert connector._alloydb_api_endpoint == "alloydb.googleapis.com"
+    connector.close()
+
+
 @pytest.mark.asyncio
 async def test_AsyncConnector_context_manager(
     credentials: FakeCredentials,

tests/unit/test_connector.py

@@ -107,6 +107,26 @@ def test_Connector_init_ip_type(
     connector.close()
 
 
+def test_Connector_init_alloydb_api_endpoint_with_http_prefix():
+    """
+    Test to check whether the __init__ method of Connector properly sets
+    alloydb_api_endpoint when its URL has an 'http://' prefix.
+    """
+    connector = Connector(alloydb_api_endpoint="http://alloydb.googleapis.com")
+    assert connector._alloydb_api_endpoint == "alloydb.googleapis.com"
+    connector.close()
+
+
+def test_Connector_init_alloydb_api_endpoint_with_https_prefix():
+    """
+    Test to check whether the __init__ method of Connector properly sets
+    alloydb_api_endpoint when its URL has an 'https://' prefix.
+    """
+    connector = Connector(alloydb_api_endpoint="https://alloydb.googleapis.com")
+    assert connector._alloydb_api_endpoint == "alloydb.googleapis.com"
+    connector.close()
+
+
 def test_Connector_context_manager(credentials: FakeCredentials) -> None:
     """
     Test to check whether the __init__ method of Connector

tests/unit/test_utils.py

@@ -0,0 +1,27 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.cloud.alloydb.connector.utils import strip_http_prefix
+
+
+def test_strip_http_prefix_with_empty_url():
+    assert strip_http_prefix("") == ""
+
+
+def test_strip_http_prefix_with_url_having_http_prefix():
+    assert strip_http_prefix("http://google.com") == "google.com"
+
+
+def test_strip_http_prefix_with_url_having_https_prefix():
+    assert strip_http_prefix("https://google.com") == "google.com"