Copybara import of the project:

--
88f6792 by mateo-berri <277851410+mateo-berri@users.noreply.github.com>:

fix: honor explicitly passed api_endpoint when location is "global"

get_client_options defaulted the endpoint to aiplatform.googleapis.com
whenever the configured location was "global", even when the caller had
explicitly passed an api_endpoint, because the global-location check sat
outside the api_endpoint is None guard. Gate the whole default on the
endpoint being unset so an explicit override is honored for global,
matching the behavior of regional locations.

Fixes #6958

COPYBARA_INTEGRATE_REVIEW=#6959 from mateo-berri:fix-global-location-api-endpoint-override 7d8eac3
PiperOrigin-RevId: 944122444

Author: mateo-berri

google/cloud/aiplatform/initializer.py

@@ -466,12 +466,10 @@ def get_client_options(
 
         api_endpoint = self.api_endpoint
 
-        if (
-            api_endpoint is None
-            and not self._project
-            and not self._location
-            and not location_override
-        ) or (self._location == "global"):
+        if api_endpoint is None and (
+            (not self._project and not self._location and not location_override)
+            or self._location == "global"
+        ):
             # Default endpoint is location invariant if using API key or global
             # location.
             api_endpoint = "aiplatform.googleapis.com"

tests/unit/aiplatform/test_initializer.py

@@ -310,6 +310,19 @@ def test_create_client_with_global_location(self):
         assert isinstance(client, utils.PredictionClientWithOverride)
         assert client._transport._host == f"https://{constants.API_BASE_PATH}"
 
+    def test_create_client_with_global_location_and_api_endpoint(self):
+        initializer.global_config.init(
+            project=_TEST_PROJECT,
+            location="global",
+            api_endpoint="test.aiplatform.googleapis.com",
+        )
+        client = initializer.global_config.create_client(
+            client_class=utils.PredictionClientWithOverride
+        )
+        assert initializer.global_config.location == "global"
+        assert isinstance(client, utils.PredictionClientWithOverride)
+        assert client._transport._host == "https://test.aiplatform.googleapis.com"
+
     def test_create_client_with_global_location_and_grpc_transport(self):
         initializer.global_config.init(
             project=_TEST_PROJECT, location="global", api_transport="grpc"
@@ -437,6 +450,12 @@ def test_not_set_api_endpoint(self):
                 "test.aiplatform.googleapis.com",
                 "test.aiplatform.googleapis.com",
             ),
+            (
+                "global",
+                None,
+                "test.aiplatform.googleapis.com",
+                "test.aiplatform.googleapis.com",
+            ),
         ],
     )
     def test_get_client_options(