Changing logging Connection to only accept client.

Author: dhermes

logging/google/cloud/logging/_http.py

@@ -26,16 +26,8 @@
 class Connection(_http.JSONConnection):
     """A connection to Google Stackdriver Logging 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 api_base_url: str
-    :param api_base_url: The base of the API call URL. Defaults to the value
-                         :attr:`Connection.API_BASE_URL`.
+    :type client: :class:`~google.cloud.logging.client.Client`
+    :param client: The client that owns the current connection.
     """
 
     API_BASE_URL = 'https://logging.googleapis.com'
@@ -47,12 +39,6 @@ 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/logging.read',
-             'https://www.googleapis.com/auth/logging.write',
-             'https://www.googleapis.com/auth/logging.admin',
-             'https://www.googleapis.com/auth/cloud-platform')
-    """The scopes required for authenticating as a Logging consumer."""
-
 
 class _LoggingAPI(object):
     """Helper mapping logging-related APIs.

logging/google/cloud/logging/client.py

@@ -91,12 +91,17 @@ class Client(ClientWithProject):
     _sinks_api = None
     _metrics_api = None
 
+    SCOPE = ('https://www.googleapis.com/auth/logging.read',
+             'https://www.googleapis.com/auth/logging.write',
+             'https://www.googleapis.com/auth/logging.admin',
+             'https://www.googleapis.com/auth/cloud-platform')
+    """The scopes required for authenticating as a Logging 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:

logging/unit_tests/test__http.py

@@ -38,9 +38,9 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_default_url(self):
-        creds = _make_credentials()
-        conn = self._make_one(creds)
-        self.assertEqual(conn.credentials, creds)
+        client = object()
+        conn = self._make_one(client)
+        self.assertIs(conn._client, client)
 
 
 class Test_LoggingAPI(unittest.TestCase):