Changing Pub / Sub Connection to only accept client.

Author: dhermes

pubsub/google/cloud/pubsub/_http.py

@@ -34,12 +34,8 @@
 class Connection(_http.JSONConnection):
     """A connection to Google Cloud Pub/Sub via the JSON REST API.
 
-    :type credentials: :class:`oauth2client.client.OAuth2Credentials`
-    :param credentials: (Optional) The OAuth2 Credentials to use for this
-                        connection.
-
-    :type http: :class:`httplib2.Http` or class that defines ``request()``.
-    :param http: (Optional) HTTP object to make requests.
+    :type client: :class:`~google.cloud.pubsub.client.Client`
+    :param client: The client that owns the current connection.
     """
 
     API_BASE_URL = 'https://' + PUBSUB_API_HOST
@@ -51,12 +47,8 @@ class Connection(_http.JSONConnection):
     API_URL_TEMPLATE = '{api_base_url}/{api_version}{path}'
     """A template for the URL of a particular API call."""
 
-    SCOPE = ('https://www.googleapis.com/auth/pubsub',
-             'https://www.googleapis.com/auth/cloud-platform')
-    """The scopes required for authenticating as a Cloud Pub/Sub consumer."""
-
-    def __init__(self, credentials=None, http=None):
-        super(Connection, self).__init__(credentials=credentials, http=http)
+    def __init__(self, client):
+        super(Connection, self).__init__(client)
         emulator_host = os.getenv(PUBSUB_EMULATOR)
         if emulator_host is None:
             self.host = self.__class__.API_BASE_URL

pubsub/google/cloud/pubsub/client.py

@@ -75,12 +75,15 @@ class Client(ClientWithProject):
     _subscriber_api = None
     _iam_policy_api = None
 
+    SCOPE = ('https://www.googleapis.com/auth/pubsub',
+             'https://www.googleapis.com/auth/cloud-platform')
+    """The scopes required for authenticating as a Cloud Pub/Sub consumer."""
+
     def __init__(self, project=None, credentials=None,
                  http=None, use_gax=None):
         super(Client, self).__init__(
             project=project, credentials=credentials, http=http)
-        self._connection = Connection(
-            credentials=self._credentials, http=self._http)
+        self._connection = Connection(self)
         if use_gax is None:
             self._use_gax = _USE_GAX
         else:
@@ -96,7 +99,7 @@ def publisher_api(self):
                         host=self._connection.host)
                 else:
                     generated = make_gax_publisher_api(
-                        credentials=self._connection._credentials)
+                        credentials=self._credentials)
                 self._publisher_api = GAXPublisherAPI(generated, self)
             else:
                 self._publisher_api = JSONPublisherAPI(self)
@@ -112,7 +115,7 @@ def subscriber_api(self):
                         host=self._connection.host)
                 else:
                     generated = make_gax_subscriber_api(
-                        credentials=self._connection._credentials)
+                        credentials=self._credentials)
                 self._subscriber_api = GAXSubscriberAPI(generated, self)
             else:
                 self._subscriber_api = JSONSubscriberAPI(self)

pubsub/unit_tests/test__http.py

@@ -46,7 +46,7 @@ def _get_target_class():
         return Connection
 
     def test_default_url(self):
-        conn = self._make_one()
+        conn = self._make_one(object())
         klass = self._get_target_class()
         self.assertEqual(conn.api_base_url, klass.API_BASE_URL)
 
@@ -57,14 +57,14 @@ def test_custom_url_from_env(self):
         fake_environ = {PUBSUB_EMULATOR: HOST}
 
         with mock.patch('os.environ', new=fake_environ):
-            conn = self._make_one()
+            conn = self._make_one(object())
 
         klass = self._get_target_class()
         self.assertNotEqual(conn.api_base_url, klass.API_BASE_URL)
         self.assertEqual(conn.api_base_url, 'http://' + HOST)
 
     def test_build_api_url_no_extra_query_params(self):
-        conn = self._make_one()
+        conn = self._make_one(object())
         URI = '/'.join([
             conn.API_BASE_URL,
             conn.API_VERSION,
@@ -76,7 +76,7 @@ def test_build_api_url_w_extra_query_params(self):
         from six.moves.urllib.parse import parse_qsl
         from six.moves.urllib.parse import urlsplit
 
-        conn = self._make_one()
+        conn = self._make_one(object())
         uri = conn.build_api_url('/foo', {'bar': 'baz'})
         scheme, netloc, path, qs, _ = urlsplit(uri)
         self.assertEqual('%s://%s' % (scheme, netloc), conn.API_BASE_URL)
@@ -88,7 +88,7 @@ def test_build_api_url_w_extra_query_params(self):
     def test_build_api_url_w_base_url_override(self):
         base_url1 = 'api-base-url1'
         base_url2 = 'api-base-url2'
-        conn = self._make_one()
+        conn = self._make_one(object())
         conn.api_base_url = base_url1
         URI = '/'.join([
             base_url2,