Changing monitoring Connection to only accept client.

dhermes · dhermes · commit ad9417f518b2 · 2017-01-26T16:35:26.000-08:00
diff --git a/monitoring/google/cloud/monitoring/__init__.py b/monitoring/google/cloud/monitoring/__init__.py
@@ -44,4 +44,4 @@
 )
 
 
-SCOPE = Connection.SCOPE
+SCOPE = Client.SCOPE
diff --git a/monitoring/google/cloud/monitoring/client.py b/monitoring/google/cloud/monitoring/client.py
@@ -68,11 +68,15 @@ class Client(ClientWithProject):
                  ``credentials`` for the current object.
     """
 
+    SCOPE = ('https://www.googleapis.com/auth/monitoring.read',
+             'https://www.googleapis.com/auth/monitoring',
+             'https://www.googleapis.com/auth/cloud-platform')
+    """The scopes required for authenticating as a Monitoring consumer."""
+
     def __init__(self, project=None, credentials=None, http=None):
         super(Client, self).__init__(
             project=project, credentials=credentials, http=http)
-        self._connection = Connection(
-            credentials=self._credentials, http=self._http)
+        self._connection = Connection(self)
 
     def query(self,
               metric_type=Query.DEFAULT_METRIC_TYPE,
diff --git a/monitoring/google/cloud/monitoring/connection.py b/monitoring/google/cloud/monitoring/connection.py
@@ -40,8 +40,3 @@ 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/monitoring.read',
-             'https://www.googleapis.com/auth/monitoring',
-             'https://www.googleapis.com/auth/cloud-platform')
-    """The scopes required for authenticating as a Monitoring consumer."""
diff --git a/monitoring/unit_tests/test_connection.py b/monitoring/unit_tests/test_connection.py
@@ -27,6 +27,6 @@ def _make_one(self, *args, **kwargs):
         return self._get_target_class()(*args, **kwargs)
 
     def test_constructor(self):
-        credentials = object()
-        connection = self._make_one(credentials)
-        self.assertEqual(connection.credentials, credentials)
+        client = object()
+        connection = self._make_one(client)
+        self.assertIs(connection._client, client)

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@`
`44`	`44`	`)`
`45`	`45`
`46`	`46`
`47`		`-SCOPE = Connection.SCOPE`
	`47`	`+SCOPE = Client.SCOPE`