Passing Client through to low-level logging API objects.

Author: dhermes

packages/google-cloud-logging/google/cloud/logging/_gax.py

@@ -144,9 +144,13 @@ class _SinksAPI(object):
     :type gax_api:
         :class:`google.logging.v2.config_service_v2_api.ConfigServiceV2Api`
     :param gax_api: API object used to make GAX requests.
+
+    :type client: :class:`~google.cloud.logging.client.Client`
+    :param client: The client that owns this API object.
     """
-    def __init__(self, gax_api):
+    def __init__(self, gax_api, client):
         self._gax_api = gax_api
+        self._client = client
 
     def list_sinks(self, project, page_size=0, page_token=None):
         """List sinks for the project associated with this client.
@@ -291,9 +295,13 @@ class _MetricsAPI(object):
     :type gax_api:
         :class:`google.logging.v2.metrics_service_v2_api.MetricsServiceV2Api`
     :param gax_api: API object used to make GAX requests.
+
+    :type client: :class:`~google.cloud.logging.client.Client`
+    :param client: The client that owns this API object.
     """
-    def __init__(self, gax_api):
+    def __init__(self, gax_api, client):
         self._gax_api = gax_api
+        self._client = client
 
     def list_metrics(self, project, page_size=0, page_token=None):
         """List metrics for the project associated with this client.

packages/google-cloud-logging/google/cloud/logging/client.py

@@ -113,9 +113,9 @@ def sinks_api(self):
         if self._sinks_api is None:
             if _USE_GAX:
                 generated = GeneratedSinksAPI()
-                self._sinks_api = GAXSinksAPI(generated)
+                self._sinks_api = GAXSinksAPI(generated, self)
             else:
-                self._sinks_api = JSONSinksAPI(self.connection)
+                self._sinks_api = JSONSinksAPI(self)
         return self._sinks_api
 
     @property
@@ -128,9 +128,9 @@ def metrics_api(self):
         if self._metrics_api is None:
             if _USE_GAX:
                 generated = GeneratedMetricsAPI()
-                self._metrics_api = GAXMetricsAPI(generated)
+                self._metrics_api = GAXMetricsAPI(generated, self)
             else:
-                self._metrics_api = JSONMetricsAPI(self.connection)
+                self._metrics_api = JSONMetricsAPI(self)
         return self._metrics_api
 
     def logger(self, name):

packages/google-cloud-logging/google/cloud/logging/connection.py

@@ -184,11 +184,12 @@ class _SinksAPI(object):
     See:
     https://cloud.google.com/logging/docs/api/reference/rest/v2/projects.sinks
 
-    :type connection: :class:`google.cloud.logging.connection.Connection`
-    :param connection: the connection used to make API requests.
+    :type client: :class:`~google.cloud.logging.client.Client`
+    :param client: The client used to make API requests.
     """
-    def __init__(self, connection):
-        self._connection = connection
+    def __init__(self, client):
+        self._client = client
+        self._connection = client.connection
 
     def list_sinks(self, project, page_size=None, page_token=None):
         """List sinks for the project associated with this client.
@@ -323,11 +324,12 @@ class _MetricsAPI(object):
     See:
     https://cloud.google.com/logging/docs/api/reference/rest/v2/projects.metrics
 
-    :type connection: :class:`google.cloud.logging.connection.Connection`
-    :param connection: the connection used to make API requests.
+    :type client: :class:`~google.cloud.logging.client.Client`
+    :param client: The client used to make API requests.
     """
-    def __init__(self, connection):
-        self._connection = connection
+    def __init__(self, client):
+        self._client = client
+        self._connection = client.connection
 
     def list_metrics(self, project, page_size=None, page_token=None):
         """List metrics for the project associated with this client.