Skip to content

Commit 2c94675

Browse files
committed
Merge pull request #1597 from tseaver/logging-sink_exists
Add 'Sink.exists' API wrapper.
2 parents 6f3d1a7 + 47cf5ab commit 2c94675

File tree

2 files changed

+48
-0
lines changed

2 files changed

+48
-0
lines changed

gcloud/logging/sink.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
"""Define Logging API Sinks."""
1616

17+
from gcloud.exceptions import NotFound
18+
1719

1820
class Sink(object):
1921
"""Sinks represent filtered exports for log entries.
@@ -90,3 +92,22 @@ def create(self, client=None):
9092
'destination': self.destination,
9193
}
9294
client.connection.api_request(method='PUT', path=self.path, data=data)
95+
96+
def exists(self, client=None):
97+
"""API call: test for the existence of the sink via a GET request
98+
99+
See
100+
https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.sinks/get
101+
102+
:type client: :class:`gcloud.logging.client.Client` or ``NoneType``
103+
:param client: the client to use. If not passed, falls back to the
104+
``client`` stored on the current sink.
105+
"""
106+
client = self._require_client(client)
107+
108+
try:
109+
client.connection.api_request(method='GET', path=self.path)
110+
except NotFound:
111+
return False
112+
else:
113+
return True

gcloud/logging/test_sink.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,33 @@ def test_create_w_alternate_client(self):
8282
self.assertEqual(req['path'], '/%s' % FULL)
8383
self.assertEqual(req['data'], RESOURCE)
8484

85+
def test_exists_miss_w_bound_client(self):
86+
FULL = 'projects/%s/sinks/%s' % (self.PROJECT, self.SINK_NAME)
87+
conn = _Connection()
88+
CLIENT = _Client(project=self.PROJECT, connection=conn)
89+
sink = self._makeOne(self.SINK_NAME, self.FILTER, self.DESTINATION_URI,
90+
client=CLIENT)
91+
self.assertFalse(sink.exists())
92+
self.assertEqual(len(conn._requested), 1)
93+
req = conn._requested[0]
94+
self.assertEqual(req['method'], 'GET')
95+
self.assertEqual(req['path'], '/%s' % FULL)
96+
97+
def test_exists_hit_w_alternate_client(self):
98+
FULL = 'projects/%s/sinks/%s' % (self.PROJECT, self.SINK_NAME)
99+
conn1 = _Connection({'name': FULL})
100+
CLIENT1 = _Client(project=self.PROJECT, connection=conn1)
101+
conn2 = _Connection({'name': FULL})
102+
CLIENT2 = _Client(project=self.PROJECT, connection=conn2)
103+
sink = self._makeOne(self.SINK_NAME, self.FILTER, self.DESTINATION_URI,
104+
client=CLIENT1)
105+
self.assertTrue(sink.exists(client=CLIENT2))
106+
self.assertEqual(len(conn1._requested), 0)
107+
self.assertEqual(len(conn2._requested), 1)
108+
req = conn2._requested[0]
109+
self.assertEqual(req['method'], 'GET')
110+
self.assertEqual(req['path'], '/%s' % FULL)
111+
85112

86113
class _Connection(object):
87114

0 commit comments

Comments
 (0)