Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ed87a2f

Browse files
dhermesdhermes
committed
Removing HTTP requests from Bucket logging methods.
1 parent 522987a commit ed87a2f

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

‎gcloud/storage/bucket.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,6 @@ def get_logging(self):
541541
:returns: a dict w/ keys, ``logBucket`` and ``logObjectPrefix``
542542
(if logging is enabled), or None (if not).
543543
"""
544-
self.reload()
545544
info = self._properties.get('logging')
546545
if info is not None:
547546
return info.copy()
@@ -559,15 +558,13 @@ def enable_logging(self, bucket_name, object_prefix=''):
559558
"""
560559
info = {'logBucket': bucket_name, 'logObjectPrefix': object_prefix}
561560
self._patch_properties({'logging': info})
562-
self.patch()
563561

564562
def disable_logging(self):
565563
"""Disable access logging for this bucket.
566564
567565
See: https://cloud.google.com/storage/docs/accesslogs#disabling
568566
"""
569567
self._patch_properties({'logging': None})
570-
self.patch()
571568

572569
@property
573570
def metageneration(self):

‎gcloud/storage/test_bucket.py‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ def test_get_logging_w_prefix(self):
687687
resp_to_reload = before
688688
connection = _Connection(resp_to_reload)
689689
bucket = self._makeOne(NAME, connection)
690+
bucket.reload()
690691
info = bucket.get_logging()
691692
self.assertEqual(info['logBucket'], LOG_BUCKET)
692693
self.assertEqual(info['logObjectPrefix'], LOG_PREFIX)
@@ -707,23 +708,22 @@ def test_enable_logging_defaults(self):
707708
connection = _Connection(resp_to_reload, resp_to_enable_logging,
708709
resp_to_enable_logging)
709710
bucket = self._makeOne(NAME, connection, properties=before)
711+
bucket.reload()
710712
self.assertTrue(bucket.get_logging() is None)
711713
bucket.enable_logging(LOG_BUCKET)
712714
info = bucket.get_logging()
715+
bucket.patch()
713716
self.assertEqual(info['logBucket'], LOG_BUCKET)
714717
self.assertEqual(info['logObjectPrefix'], '')
715718
kw = connection._requested
716-
self.assertEqual(len(kw), 3)
719+
self.assertEqual(len(kw), 2)
717720
self.assertEqual(kw[0]['method'], 'GET')
718721
self.assertEqual(kw[0]['path'], '/b/%s' % NAME)
719722
self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'})
720723
self.assertEqual(kw[1]['method'], 'PATCH')
721724
self.assertEqual(kw[1]['path'], '/b/%s' % NAME)
722725
self.assertEqual(kw[1]['data'], resp_to_enable_logging)
723726
self.assertEqual(kw[1]['query_params'], {'projection': 'full'})
724-
self.assertEqual(kw[2]['method'], 'GET')
725-
self.assertEqual(kw[2]['path'], '/b/%s' % NAME)
726-
self.assertEqual(kw[2]['query_params'], {'projection': 'noAcl'})
727727

728728
def test_enable_logging_explicit(self):
729729
NAME = 'name'
@@ -738,23 +738,22 @@ def test_enable_logging_explicit(self):
738738
resp_to_enable_logging,
739739
resp_to_enable_logging)
740740
bucket = self._makeOne(NAME, connection, properties=before)
741+
bucket.reload()
741742
self.assertTrue(bucket.get_logging() is None)
742743
bucket.enable_logging(LOG_BUCKET, LOG_PFX)
744+
bucket.patch()
743745
info = bucket.get_logging()
744746
self.assertEqual(info['logBucket'], LOG_BUCKET)
745747
self.assertEqual(info['logObjectPrefix'], LOG_PFX)
746748
kw = connection._requested
747-
self.assertEqual(len(kw), 3)
749+
self.assertEqual(len(kw), 2)
748750
self.assertEqual(kw[0]['method'], 'GET')
749751
self.assertEqual(kw[0]['path'], '/b/%s' % NAME)
750752
self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'})
751753
self.assertEqual(kw[1]['method'], 'PATCH')
752754
self.assertEqual(kw[1]['path'], '/b/%s' % NAME)
753755
self.assertEqual(kw[1]['data'], resp_to_enable_logging)
754756
self.assertEqual(kw[1]['query_params'], {'projection': 'full'})
755-
self.assertEqual(kw[2]['method'], 'GET')
756-
self.assertEqual(kw[2]['path'], '/b/%s' % NAME)
757-
self.assertEqual(kw[2]['query_params'], {'projection': 'noAcl'})
758757

759758
def test_disable_logging(self):
760759
NAME = 'name'
@@ -764,21 +763,20 @@ def test_disable_logging(self):
764763
connection = _Connection(resp_to_reload, resp_to_disable_logging,
765764
resp_to_disable_logging)
766765
bucket = self._makeOne(NAME, connection, properties=before)
766+
bucket.reload()
767767
self.assertTrue(bucket.get_logging() is not None)
768768
bucket.disable_logging()
769+
bucket.patch()
769770
self.assertTrue(bucket.get_logging() is None)
770771
kw = connection._requested
771-
self.assertEqual(len(kw), 3)
772+
self.assertEqual(len(kw), 2)
772773
self.assertEqual(kw[0]['method'], 'GET')
773774
self.assertEqual(kw[0]['path'], '/b/%s' % NAME)
774775
self.assertEqual(kw[0]['query_params'], {'projection': 'noAcl'})
775776
self.assertEqual(kw[1]['method'], 'PATCH')
776777
self.assertEqual(kw[1]['path'], '/b/%s' % NAME)
777778
self.assertEqual(kw[1]['data'], {'logging': None})
778779
self.assertEqual(kw[1]['query_params'], {'projection': 'full'})
779-
self.assertEqual(kw[2]['method'], 'GET')
780-
self.assertEqual(kw[2]['path'], '/b/%s' % NAME)
781-
self.assertEqual(kw[2]['query_params'], {'projection': 'noAcl'})
782780

783781
def test_metageneration(self):
784782
METAGENERATION = 42

0 commit comments

Comments
 (0)