Merge pull request #720 from dhermes/use-fields-in-bucket-exists

Using 'fields' in Bucket.exists().
googleapis · Mar 13, 2015 · ab642a3 · ab642a3
2 parents d9e2156 + 6186059
commit ab642a3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/gcloud/storage/bucket.py b/gcloud/storage/bucket.py
@@ -132,7 +132,11 @@ def exists(self):
         :returns: True if the bucket exists in Cloud Storage.
         """
         try:
-            self.connection.get_bucket(self.name)
+            # We only need the status code (200 or not) so we seek to
+            # minimize the returned payload.
+            query_params = {'fields': 'name'}
+            self.connection.api_request(method='GET', path=self.path,
+                                        query_params=query_params)
             return True
         except NotFound:
             return False

diff --git a/gcloud/storage/test_bucket.py b/gcloud/storage/test_bucket.py
@@ -159,30 +159,46 @@ class _FakeConnection(object):
             _called_with = []
 
             @classmethod
-            def get_bucket(cls, bucket_name):
-                cls._called_with.append(bucket_name)
-                raise NotFound(bucket_name)
+            def api_request(cls, *args, **kwargs):
+                cls._called_with.append((args, kwargs))
+                raise NotFound(args)
 
-        NAME = 'name'
-        bucket = self._makeOne(connection=_FakeConnection, name=NAME)
+        BUCKET_NAME = 'bucket-name'
+        bucket = self._makeOne(connection=_FakeConnection, name=BUCKET_NAME)
         self.assertFalse(bucket.exists())
-        self.assertEqual(_FakeConnection._called_with, [NAME])
+        expected_called_kwargs = {
+            'method': 'GET',
+            'path': bucket.path,
+            'query_params': {
+                'fields': 'name',
+            },
+        }
+        expected_cw = [((), expected_called_kwargs)]
+        self.assertEqual(_FakeConnection._called_with, expected_cw)
 
     def test_exists_hit(self):
         class _FakeConnection(object):
 
             _called_with = []
 
             @classmethod
-            def get_bucket(cls, bucket_name):
-                cls._called_with.append(bucket_name)
+            def api_request(cls, *args, **kwargs):
+                cls._called_with.append((args, kwargs))
                 # exists() does not use the return value
                 return object()
 
-        NAME = 'name'
-        bucket = self._makeOne(connection=_FakeConnection, name=NAME)
+        BUCKET_NAME = 'bucket-name'
+        bucket = self._makeOne(connection=_FakeConnection, name=BUCKET_NAME)
         self.assertTrue(bucket.exists())
-        self.assertEqual(_FakeConnection._called_with, [NAME])
+        expected_called_kwargs = {
+            'method': 'GET',
+            'path': bucket.path,
+            'query_params': {
+                'fields': 'name',
+            },
+        }
+        expected_cw = [((), expected_called_kwargs)]
+        self.assertEqual(_FakeConnection._called_with, expected_cw)
 
     def test_acl_property(self):
         from gcloud.storage.acl import BucketACL