Roll version of gsutil to 4.15.

third_party/gsutil/gslib/commands/rb.py

 # -*- coding: utf-8 -*-
 # Copyright 2011 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 84 matching lines @@
     some_failed = False
     for url_str in self.args:
       wildcard_url = StorageUrlFromString(url_str)
       if wildcard_url.IsObject():
         raise CommandException('"rb" command requires a provider or '
                                'bucket URL')
       # Wrap WildcardIterator call in try/except so we can avoid printing errors
       # with -f option if a non-existent URL listed, permission denial happens
       # while listing, etc.
       try:
-        # Need to materialize iterator results into a list to catch exceptions.
+        # Materialize iterator results into a list to catch exceptions.
         # Since this is listing buckets this list shouldn't be too large to fit
         # in memory at once.
-        blrs = list(self.WildcardIterator(url_str).IterBuckets())
+        # Also, avoid listing all fields to avoid performing unnecessary bucket
+        # metadata GETs. These would also be problematic when billing is
+        # disabled, as deletes are allowed but GetBucket is not.
+        blrs = list(
+            self.WildcardIterator(url_str).IterBuckets(bucket_fields=['id']))
       except:  # pylint: disable=bare-except
         some_failed = True
         if self.continue_on_error:
           continue
         else:
           raise
       for blr in blrs:
         url = blr.storage_url
         self.logger.info('Removing %s...', url)
         try:
           self.gsutil_api.DeleteBucket(url.bucket_name, provider=url.scheme)
         except NotEmptyException as e:
+          some_failed = True
           if self.continue_on_error:
             continue
           elif 'VersionedBucketNotEmpty' in e.reason:
             raise CommandException('Bucket is not empty. Note: this is a '
                                    'versioned bucket, so to delete all '
                                    'objects\nyou need to use:'
                                    '\n\tgsutil rm -r %s' % url)
           else:
             raise
         except:  # pylint: disable=bare-except
+          some_failed = True
           if not self.continue_on_error:
             raise
         did_some_work = True
     if not did_some_work:
       raise CommandException('No URLs matched')
     return 1 if some_failed else 0