Add content addressed uploading helper function for render tests.

build/android/pylib/utils/google_storage_helper.py

 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Helper functions to upload data to Google Storage.
 
 Text data should be streamed to logdog using |logdog_helper| module.
 Due to logdog not having image or HTML viewer, those instead should be uploaded
 to Google Storage directly using this module.
 """
 
+import hashlib
 import logging
 import os
 import sys
 import time
 
 from pylib.constants import host_paths
 from pylib.utils import decorators
 
 if host_paths.DEVIL_PATH not in sys.path:
   sys.path.append(host_paths.DEVIL_PATH)
@@ skipping 16 matching lines @@
     bucket: Bucket to upload file to.
     content_type: Content type to upload as. If not specified, Google storage
         will attempt to infer content type from file extension.
     authenticated_link: Whether to return a link that requires user to
         authenticate with a Google account. Setting this to false will return
         a link that does not require user to be signed into Google account but
         will only work for completely public storage buckets.
   Returns:
     Web link to item uploaded to Google Storage bucket.
   """
-  if bucket.startswith('gs://'):
-    bucket = bucket[len('gs://'):]
-  if bucket.endswith('/'):
-    bucket = bucket[:-1]
+  bucket = _format_bucket_name(bucket)
 
   gs_path = 'gs://%s/%s' % (bucket, name)
   logging.info('Uploading %s to %s', filepath, gs_path)
 
   cmd = [_GSUTIL_PATH, '-q']
   if content_type:
     cmd.extend(['-h', 'Content-Type:%s' % content_type])
   cmd.extend(['cp', filepath, gs_path])
 
   cmd_helper.RunCmd(cmd)
 
-  url_template = _AUTHENTICATED_URL if authenticated_link else _PUBLIC_URL
-  return os.path.join(url_template % bucket, name)
+  return get_url_link(name, bucket, authenticated_link)
+
+
+def upload_content_addressed(
+    filepath, bucket, content_type=None, authenticated_link=True):
+  """Uploads data to Google Storage with filename as sha1 hash.
+
+  If file already exists in bucket with hash name, nothing is uploaded.
+  """
+  sha1 = hashlib.sha1()
+  with open(filepath, 'rb') as f:
+    sha1.update(f.read())
+  sha1_hash = sha1.hexdigest()
+  if not exists(sha1_hash, bucket):
+    upload(sha1_hash, filepath, bucket, content_type, authenticated_link)
+  return get_url_link(sha1_hash, bucket, authenticated_link)
+
+
+@decorators.NoRaiseException(default_return_value=False)
+def exists(name, bucket):
+  bucket = _format_bucket_name(bucket)
+  gs_path = 'gs://%s/%s' % (bucket, name)
+
+  cmd = [_GSUTIL_PATH, '-q', 'stat', gs_path]
+  return_code = cmd_helper.RunCmd(cmd)
+  if return_code == 0:
+    return True
+  else:
+    return False
 
 
 def unique_name(basename, suffix='', timestamp=True, device=None):
   """Helper function for creating a unique name for a file to store in GS.
 
   Args:
     basename: Base of the unique filename.
     suffix: Suffix of filename.
     timestamp: Whether or not to add a timestamp to name.
     device: Device to add device serial of to name.
@@ skipping 12 matching lines @@
   Args:
     name: Name of the file on Google Storage.
     bucket: Bucket to upload file to.
     authenticated_link: Whether to return a link that requires user to
         authenticate with a Google account. Setting this to false will return
         a link that does not require user to be signed into Google account but
         will only work for completely public storage buckets.
   Returns:
     Web link to item to be uploaded to Google Storage bucket
   """
+  bucket = _format_bucket_name(bucket)
+  url_template = _AUTHENTICATED_URL if authenticated_link else _PUBLIC_URL
+  return os.path.join(url_template % bucket, name)
+
+
+def _format_bucket_name(bucket):
   if bucket.startswith('gs://'):
     bucket = bucket[len('gs://'):]
   if bucket.endswith('/'):
     bucket = bucket[:-1]
-  url_template = _AUTHENTICATED_URL if authenticated_link else _PUBLIC_URL
-  return os.path.join(url_template % bucket, name)
+  return bucket