Roll version of gsutil to 4.15.

third_party/gsutil/gslib/translation_helper.py

 # -*- coding: utf-8 -*-
 # Copyright 2014 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 18 matching lines @@
 from boto.gs.acl import ALL_USERS
 from boto.gs.acl import Entries
 from boto.gs.acl import Entry
 from boto.gs.acl import GROUP_BY_DOMAIN
 from boto.gs.acl import GROUP_BY_EMAIL
 from boto.gs.acl import GROUP_BY_ID
 from boto.gs.acl import USER_BY_EMAIL
 from boto.gs.acl import USER_BY_ID
 
 from gslib.cloud_api import ArgumentException
+from gslib.cloud_api import BucketNotFoundException
 from gslib.cloud_api import NotFoundException
 from gslib.cloud_api import Preconditions
 from gslib.exception import CommandException
 from gslib.third_party.storage_apitools import storage_v1_messages as apitools_messages
 
 # In Python 2.6, ElementTree raises ExpatError instead of ParseError.
 # pylint: disable=g-import-not-at-top
 try:
   from xml.etree.ElementTree import ParseError as XmlParseError
 except ImportError:
@@ skipping 18 matching lines @@
 S3_ACL_MARKER_GUID = '3b89a6b5-b55a-4900-8c44-0b0a2f5eab43-s3-AclMarker'
 S3_DELETE_MARKER_GUID = 'eadeeee8-fa8c-49bb-8a7d-0362215932d8-s3-DeleteMarker'
 S3_MARKER_GUIDS = [S3_ACL_MARKER_GUID, S3_DELETE_MARKER_GUID]
 # This distinguishes S3 custom headers from S3 metadata on objects.
 S3_HEADER_PREFIX = 'custom-amz-header'
 
 DEFAULT_CONTENT_TYPE = 'application/octet-stream'
 
 # Because CORS is just a list in apitools, we need special handling or blank
 # CORS lists will get sent with other configuration commands such as lifecycle,
-# commands, which would cause CORS configuration to be unintentionally removed.
+# which would cause CORS configuration to be unintentionally removed.
 # Protorpc defaults list values to an empty list, and won't allow us to set the
 # value to None like other configuration fields, so there is no way to
 # distinguish the default value from when we actually want to remove the CORS
 # configuration.  To work around this, we create a dummy CORS entry that
 # signifies that we should nullify the CORS configuration.
 # A value of [] means don't modify the CORS configuration.
 # A value of REMOVE_CORS_CONFIG means remove the CORS configuration.
 REMOVE_CORS_CONFIG = [apitools_messages.Bucket.CorsValueListEntry(
     maxAgeSeconds=-1, method=['REMOVE_CORS_CONFIG'])]
 
+# Similar to CORS above, we need a sentinel value allowing us to specify
+# when a default object ACL should be private (containing no entries).
+# A defaultObjectAcl value of [] means don't modify the default object ACL.
+# A value of [PRIVATE_DEFAULT_OBJ_ACL] means create an empty/private default
+# object ACL.
+PRIVATE_DEFAULT_OBJ_ACL = apitools_messages.ObjectAccessControl(
+    id='PRIVATE_DEFAULT_OBJ_ACL')
+
 
 def ObjectMetadataFromHeaders(headers):
   """Creates object metadata according to the provided headers.
 
   gsutil -h allows specifiying various headers (originally intended
   to be passed to boto in gsutil v3).  For the JSON API to be compatible with
   this option, we need to parse these headers into gsutil_api Object fields.
 
   Args:
     headers: Dict of headers passed via gsutil -h
@@ skipping 207 matching lines @@
       if GOOG_METAGENERATION_MATCH_REGEX.match(header):
         return_preconditions.meta_gen_match = long(value)
   except ValueError, _:
     raise ArgumentException('Invalid precondition header specified. '
                             'x-goog-if-generation-match and '
                             'x-goog-if-metageneration match must be specified '
                             'with a positive integer value.')
   return return_preconditions
 
 
+def CreateNotFoundExceptionForObjectWrite(
+    dst_provider, dst_bucket_name, src_provider=None,
+    src_bucket_name=None, src_object_name=None, src_generation=None):
+  """Creates a NotFoundException for an object upload or copy.
+
+  This is necessary because 404s don't necessarily specify which resource
+  does not exist.
+
+  Args:
+    dst_provider: String abbreviation of destination provider, e.g., 'gs'.
+    dst_bucket_name: Destination bucket name for the write operation.
+    src_provider: String abbreviation of source provider, i.e. 'gs', if any.
+    src_bucket_name: Source bucket name, if any (for the copy case).
+    src_object_name: Source object name, if any (for the copy case).
+    src_generation: Source object generation, if any (for the copy case).
+
+  Returns:
+    NotFoundException with appropriate message.
+  """
+  dst_url_string = '%s://%s' % (dst_provider, dst_bucket_name)
+  if src_bucket_name and src_object_name:
+    src_url_string = '%s://%s/%s' % (src_provider, src_bucket_name,
+                                     src_object_name)
+    if src_generation:
+      src_url_string += '#%s' % str(src_generation)
+    return NotFoundException(
+        'The source object %s or the destination bucket %s does not exist.' %
+        (src_url_string, dst_url_string))
+
+  return NotFoundException(
+      'The destination bucket %s does not exist or the write to the '
+      'destination must be restarted' % dst_url_string)
+
+
 def CreateBucketNotFoundException(code, provider, bucket_name):
-  return NotFoundException('%s://%s bucket does not exist.' %
-                           (provider, bucket_name), status=code)
+  return BucketNotFoundException('%s://%s bucket does not exist.' %
+                                 (provider, bucket_name), bucket_name,
+                                 status=code)
 
 
 def CreateObjectNotFoundException(code, provider, bucket_name, object_name,
                                   generation=None):
   uri_string = '%s://%s/%s' % (provider, bucket_name, object_name)
   if generation:
     uri_string += '#%s' % str(generation)
   return NotFoundException('%s does not exist.' % uri_string, status=code)
 
 
@@ skipping 303 matching lines @@
     acl = ACL()
     acl.parent = None
     acl.entries = cls.BotoEntriesFromJson(acl_json, acl)
     return acl
 
   @classmethod
   # acl_message is a list of messages, either object or bucketaccesscontrol
   def BotoAclFromMessage(cls, acl_message):
     acl_dicts = []
     for message in acl_message:
+      if message == PRIVATE_DEFAULT_OBJ_ACL:
+        # Sentinel value indicating acl_dicts should be an empty list to create
+        # a private (no entries) default object ACL.
+        break
       acl_dicts.append(encoding.MessageToDict(message))
     return cls.BotoAclFromJson(acl_dicts)
 
   @classmethod
   def BotoAclToJson(cls, acl):
     if hasattr(acl, 'entries'):
       return cls.BotoEntriesToJson(acl.entries)
     return []
 
   @classmethod
@@ skipping 131 matching lines @@
           acl_entry.object = None
           acl_entry.generation = None
         acl_entry.kind = None
         acl_entry.bucket = None
         acl_entry.id = None
         acl_entry.selfLink = None
         acl_entry.etag = None
         serializable_acl.append(encoding.MessageToDict(acl_entry))
     return json.dumps(serializable_acl, sort_keys=True,
                       indent=2, separators=(',', ': '))