Removing references to cnxn in Pub/Sub _gax module.

Author: dhermes

pubsub/google/cloud/pubsub/_gax.py

@@ -512,48 +512,60 @@ def _received_message_pb_to_mapping(received_message_pb):
     }
 
 
-def make_gax_publisher_api(connection):
+def make_gax_publisher_api(credentials, host=None, secure=True):
     """Create an instance of the GAX Publisher API.
 
-    If the ``connection`` is intended for a local emulator, then
-    an insecure ``channel`` is created pointing at the local
-    Pub / Sub server.
+    If the ``secure=False`` then we create an insecure ``channel``
+    pointing at the local Pub / Sub emulator.
 
-    :type connection: :class:`~google.cloud.pubsub._http.Connection`
-    :param connection: The connection that holds configuration details.
+    :type credentials: :class:`~google.auth.credentials.Credentials`
+    :param credentials: Credentials for getting access tokens.
+
+    :type host: str
+    :param host: (Optional) The host for an insecure channel. Only
+                 used if ``secure=False``.
+
+    :type secure: bool
+    :param secure: (Optional) Indicates if we should create a secure
+                   or insecure channel. Defaults to :data:`True`.
 
     :rtype: :class:`.publisher_client.PublisherClient`
-    :returns: A publisher API instance with the proper connection
-              configuration.
+    :returns: A publisher API instance with the proper channel.
     """
-    if connection.in_emulator:
-        channel = insecure_channel(connection.host)
+    if not secure:
+        channel = insecure_channel(host)
     else:
         channel = make_secure_channel(
-            connection.credentials, DEFAULT_USER_AGENT,
+            credentials, DEFAULT_USER_AGENT,
             PublisherClient.SERVICE_ADDRESS)
     return PublisherClient(channel=channel)
 
 
-def make_gax_subscriber_api(connection):
+def make_gax_subscriber_api(credentials, host=None, secure=True):
     """Create an instance of the GAX Subscriber API.
 
-    If the ``connection`` is intended for a local emulator, then
-    an insecure ``channel`` is created pointing at the local
-    Pub / Sub server.
+    If the ``secure=False`` then we create an insecure ``channel``
+    pointing at the local Pub / Sub emulator.
+
+    :type credentials: :class:`~google.auth.credentials.Credentials`
+    :param credentials: Credentials for getting access tokens.
+
+    :type host: str
+    :param host: (Optional) The host for an insecure channel. Only
+                 used if ``secure=False``.
 
-    :type connection: :class:`~google.cloud.pubsub._http.Connection`
-    :param connection: The connection that holds configuration details.
+    :type secure: bool
+    :param secure: (Optional) Indicates if we should create a secure
+                   or insecure channel. Defaults to :data:`True`.
 
     :rtype: :class:`.subscriber_client.SubscriberClient`
-    :returns: A subscriber API instance with the proper connection
-              configuration.
+    :returns: A subscriber API instance with the proper channel.
     """
-    if connection.in_emulator:
-        channel = insecure_channel(connection.host)
+    if not secure:
+        channel = insecure_channel(host)
     else:
         channel = make_secure_channel(
-            connection.credentials, DEFAULT_USER_AGENT,
+            credentials, DEFAULT_USER_AGENT,
             SubscriberClient.SERVICE_ADDRESS)
     return SubscriberClient(channel=channel)
 

pubsub/google/cloud/pubsub/client.py

@@ -91,7 +91,9 @@ def publisher_api(self):
         """Helper for publisher-related API calls."""
         if self._publisher_api is None:
             if self._use_gax:
-                generated = make_gax_publisher_api(self._connection)
+                generated = make_gax_publisher_api(
+                    self._credentials, host=self._connection.host,
+                    secure=not self._connection.in_emulator)
                 self._publisher_api = GAXPublisherAPI(generated, self)
             else:
                 self._publisher_api = JSONPublisherAPI(self)
@@ -102,7 +104,9 @@ def subscriber_api(self):
         """Helper for subscriber-related API calls."""
         if self._subscriber_api is None:
             if self._use_gax:
-                generated = make_gax_subscriber_api(self._connection)
+                generated = make_gax_subscriber_api(
+                    self._credentials, host=self._connection.host,
+                    secure=not self._connection.in_emulator)
                 self._subscriber_api = GAXSubscriberAPI(generated, self)
             else:
                 self._subscriber_api = JSONSubscriberAPI(self)

pubsub/unit_tests/test__gax.py

@@ -900,9 +900,9 @@ def test_subscription_modify_ack_deadline_error(self):
 @unittest.skipUnless(_HAVE_GAX, 'No gax-python')
 class Test_make_gax_publisher_api(_Base, unittest.TestCase):
 
-    def _call_fut(self, connection):
+    def _call_fut(self, *args, **kwargs):
         from google.cloud.pubsub._gax import make_gax_publisher_api
-        return make_gax_publisher_api(connection)
+        return make_gax_publisher_api(*args, **kwargs)
 
     def test_live_api(self):
         from google.cloud.pubsub._gax import DEFAULT_USER_AGENT
@@ -924,14 +924,12 @@ def make_channel(*args):
         mock_publisher_api.SERVICE_ADDRESS = host
 
         creds = _make_credentials()
-        connection = _Connection(in_emulator=False,
-                                 credentials=creds)
         patch = mock.patch.multiple(
             'google.cloud.pubsub._gax',
             PublisherClient=mock_publisher_api,
             make_secure_channel=make_channel)
         with patch:
-            result = self._call_fut(connection)
+            result = self._call_fut(creds)
 
         self.assertIs(result, mock_result)
         self.assertEqual(channels, [channel_obj])
@@ -953,13 +951,12 @@ def mock_insecure_channel(host):
             return mock_channel
 
         host = 'CURR_HOST:1234'
-        connection = _Connection(in_emulator=True, host=host)
         patch = mock.patch.multiple(
             'google.cloud.pubsub._gax',
             PublisherClient=mock_publisher_api,
             insecure_channel=mock_insecure_channel)
         with patch:
-            result = self._call_fut(connection)
+            result = self._call_fut(None, host=host, secure=False)
 
         self.assertIs(result, mock_result)
         self.assertEqual(channels, [mock_channel])
@@ -969,9 +966,9 @@ def mock_insecure_channel(host):
 @unittest.skipUnless(_HAVE_GAX, 'No gax-python')
 class Test_make_gax_subscriber_api(_Base, unittest.TestCase):
 
-    def _call_fut(self, connection):
+    def _call_fut(self, *args, **kwargs):
         from google.cloud.pubsub._gax import make_gax_subscriber_api
-        return make_gax_subscriber_api(connection)
+        return make_gax_subscriber_api(*args, **kwargs)
 
     def test_live_api(self):
         from google.cloud.pubsub._gax import DEFAULT_USER_AGENT
@@ -993,14 +990,12 @@ def make_channel(*args):
         mock_subscriber_api.SERVICE_ADDRESS = host
 
         creds = _make_credentials()
-        connection = _Connection(in_emulator=False,
-                                 credentials=creds)
         patch = mock.patch.multiple(
             'google.cloud.pubsub._gax',
             SubscriberClient=mock_subscriber_api,
             make_secure_channel=make_channel)
         with patch:
-            result = self._call_fut(connection)
+            result = self._call_fut(creds)
 
         self.assertIs(result, mock_result)
         self.assertEqual(channels, [channel_obj])
@@ -1022,13 +1017,12 @@ def mock_insecure_channel(host):
             return mock_channel
 
         host = 'CURR_HOST:1234'
-        connection = _Connection(in_emulator=True, host=host)
         patch = mock.patch.multiple(
             'google.cloud.pubsub._gax',
             SubscriberClient=mock_subscriber_api,
             insecure_channel=mock_insecure_channel)
         with patch:
-            result = self._call_fut(connection)
+            result = self._call_fut(None, host=host, secure=False)
 
         self.assertIs(result, mock_result)
         self.assertEqual(channels, [mock_channel])
@@ -1207,15 +1201,6 @@ def __init__(self, received_messages):
         self.received_messages = received_messages
 
 
-class _Connection(object):
-
-    def __init__(self, in_emulator=False, host=None,
-                 credentials=None):
-        self.in_emulator = in_emulator
-        self.host = host
-        self.credentials = credentials
-
-
 class _Client(object):
 
     def __init__(self, project):

pubsub/unit_tests/test_client.py

@@ -69,6 +69,8 @@ def test_no_gax_ctor(self):
         self.assertIsInstance(api, _PublisherAPI)
 
     def test_publisher_api_w_gax(self):
+        from google.cloud.pubsub import _http
+
         wrapped = object()
         _called_with = []
 
@@ -100,8 +102,9 @@ def __init__(self, _wrapped, client):
         # API instance is cached
         again = client.publisher_api
         self.assertIs(again, api)
-        args = (client._connection,)
-        self.assertEqual(_called_with, [(args, {})])
+        args = (creds,)
+        kwargs = {'host': _http.Connection.API_BASE_URL, 'secure': True}
+        self.assertEqual(_called_with, [(args, kwargs)])
 
     def test_subscriber_api_wo_gax(self):
         from google.cloud.pubsub._http import _SubscriberAPI
@@ -121,6 +124,8 @@ def test_subscriber_api_wo_gax(self):
         self.assertIs(again, api)
 
     def test_subscriber_api_w_gax(self):
+        from google.cloud.pubsub import _http
+
         wrapped = object()
         _called_with = []
 
@@ -152,8 +157,9 @@ def __init__(self, _wrapped, client):
         # API instance is cached
         again = client.subscriber_api
         self.assertIs(again, api)
-        args = (client._connection,)
-        self.assertEqual(_called_with, [(args, {})])
+        args = (creds,)
+        kwargs = {'host': _http.Connection.API_BASE_URL, 'secure': True}
+        self.assertEqual(_called_with, [(args, kwargs)])
 
     def test_iam_policy_api(self):
         from google.cloud.pubsub._http import _IAMPolicyAPI