fix: use client_options.api_endpoint parameter instead of ignoring it

google/cloud/pubsub_v1/publisher/client.py

@@ -134,7 +134,11 @@ def __init__(self, batch_settings=(), publisher_options=(), **kwargs):
             )
 
         client_options = kwargs.pop("client_options", None)
-        if client_options and type(client_options["api_endpoint"]) is str:
+        if (
+            client_options
+            and "api_endpoint" in client_options
+            and isinstance(client_options["api_endpoint"], six.string_types)
+        ):
             self._target = client_options["api_endpoint"]
         else:
             self._target = publisher_client.PublisherClient.SERVICE_ADDRESS

google/cloud/pubsub_v1/subscriber/client.py

@@ -16,6 +16,7 @@
 
 import os
 import pkg_resources
+import six
 
 import grpc
 
@@ -81,7 +82,11 @@ def __init__(self, **kwargs):
 
         # api_endpoint wont be applied if 'transport' is passed in.
         client_options = kwargs.pop("client_options", None)
-        if client_options and type(client_options["api_endpoint"]) is str:
+        if (
+            client_options
+            and "api_endpoint" in client_options
+            and isinstance(client_options["api_endpoint"], six.string_types)
+        ):
             self._target = client_options["api_endpoint"]
         else:
             self._target = subscriber_client.SubscriberClient.SERVICE_ADDRESS

tests/unit/pubsub_v1/publisher/test_publisher_client.py

@@ -63,6 +63,25 @@ def test_init_w_api_endpoint():
     ) == "testendpoint.google.com"
 
 
+def test_init_w_unicode_api_endpoint():
+    client_options = {"api_endpoint": u"testendpoint.google.com"}
+    client = publisher.Client(client_options=client_options)
+
+    assert isinstance(client.api, publisher_client.PublisherClient)
+    assert (client.api.transport._channel._channel.target()).decode(
+        "utf-8"
+    ) == "testendpoint.google.com"
+
+
+def test_init_w_empty_client_options():
+    client = publisher.Client(client_options={})
+
+    assert isinstance(client.api, publisher_client.PublisherClient)
+    assert (client.api.transport._channel._channel.target()).decode(
+        "utf-8"
+    ) == publisher_client.PublisherClient.SERVICE_ADDRESS
+
+
 def test_init_emulator(monkeypatch):
     monkeypatch.setenv("PUBSUB_EMULATOR_HOST", "/foo/bar/")
     # NOTE: When the emulator host is set, a custom channel will be used, so

tests/unit/pubsub_v1/subscriber/test_subscriber_client.py

@@ -44,6 +44,25 @@ def test_init_w_api_endpoint():
     ) == "testendpoint.google.com"
 
 
+def test_init_w_unicode_api_endpoint():
+    client_options = {"api_endpoint": u"testendpoint.google.com"}
+    client = subscriber.Client(client_options=client_options)
+
+    assert isinstance(client.api, subscriber_client.SubscriberClient)
+    assert (client.api.transport._channel._channel.target()).decode(
+        "utf-8"
+    ) == "testendpoint.google.com"
+
+
+def test_init_w_empty_client_options():
+    client = subscriber.Client(client_options={})
+
+    assert isinstance(client.api, subscriber_client.SubscriberClient)
+    assert (client.api.transport._channel._channel.target()).decode(
+        "utf-8"
+    ) == subscriber_client.SubscriberClient.SERVICE_ADDRESS
+
+
 def test_init_emulator(monkeypatch):
     monkeypatch.setenv("PUBSUB_EMULATOR_HOST", "/baz/bacon/")
     # NOTE: When the emulator host is set, a custom channel will be used, so