Roll version of gsutil to 4.15.

third_party/gsutil/gslib/commands/defacl.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 12 matching lines @@
 from gslib.cloud_api import ServiceException
 from gslib.command import Command
 from gslib.command import SetAclExceptionHandler
 from gslib.command import SetAclFuncWrapper
 from gslib.command_argument import CommandArgument
 from gslib.cs_api_map import ApiSelector
 from gslib.exception import CommandException
 from gslib.help_provider import CreateHelpText
 from gslib.storage_url import StorageUrlFromString
 from gslib.third_party.storage_apitools import storage_v1_messages as apitools_messages
+from gslib.translation_helper import PRIVATE_DEFAULT_OBJ_ACL
 from gslib.util import NO_MAX
 from gslib.util import Retry
 from gslib.util import UrlsAreForSingleProvider
 
 _SET_SYNOPSIS = """
   gsutil defacl set file-or-canned_acl_name url...
 """
 
 _GET_SYNOPSIS = """
   gsutil defacl get url
@@ skipping 51 matching lines @@
   Add the user john.doe@example.com to the default object ACL on bucket
   example-bucket with READ access:
 
     gsutil defacl ch -u john.doe@example.com:READ gs://example-bucket
 
   Add the group admins@example.com to the default object ACL on bucket
   example-bucket with OWNER access:
 
     gsutil defacl ch -g admins@example.com:O gs://example-bucket
 
-  Grant the owners of project example-project-123 READ access to new objects
-  created in the bucket example-bucket:
+  Remove the group admins@example.com from the default object ACL on bucket
+  example-bucket:
 
-    gsutil acl ch -p owners-example-project-123:R gs://example-bucket
+    gsutil defacl ch -d admins@example.com gs://example-bucket
+
+  Add the owners of project example-project-123 to the default object ACL on
+  bucket example-bucket with READ access:
+
+    gsutil defacl ch -p owners-example-project-123:R gs://example-bucket
 
   NOTE: You can replace 'owners' with 'viewers' or 'editors' to grant access
   to a project's viewers/editors respectively.
 
 <B>CH OPTIONS</B>
   The "ch" sub-command has the following options
 
     -d          Remove all roles associated with the matching entity.
 
     -f          Normally gsutil stops at the first error. The -f option causes
@@ skipping 143 matching lines @@
     current_acl = bucket.defaultObjectAcl
 
     modification_count = 0
     for change in self.changes:
       modification_count += change.Execute(
           url, current_acl, 'defacl', self.logger)
     if modification_count == 0:
       self.logger.info('No changes to %s', url)
       return
 
+    if not current_acl:
+      # Use a sentinel value to indicate a private (no entries) default
+      # object ACL.
+      current_acl.append(PRIVATE_DEFAULT_OBJ_ACL)
+
     try:
       preconditions = Preconditions(meta_gen_match=bucket.metageneration)
       bucket_metadata = apitools_messages.Bucket(defaultObjectAcl=current_acl)
       self.gsutil_api.PatchBucket(url.bucket_name, bucket_metadata,
                                   preconditions=preconditions,
                                   provider=url.scheme, fields=['id'])
     except BadRequestException as e:
       # Don't retry on bad requests, e.g. invalid email address.
       raise CommandException('Received bad request from server: %s' % str(e))
     except AccessDeniedException:
@@ skipping 14 matching lines @@
     elif action_subcommand == 'set':
       func = self._SetDefAcl
     elif action_subcommand in ('ch', 'change'):
       func = self._ChDefAcl
     else:
       raise CommandException(('Invalid subcommand "%s" for the %s command.\n'
                               'See "gsutil help defacl".') %
                              (action_subcommand, self.command_name))
     func()
     return 0