From 499342211b3b767b06347d8470d36b98c9099f0c Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Wed, 29 May 2024 16:49:21 +0000 Subject: [PATCH] [GCS] Add prefix option to upload_to_gs_f_c R=jojwang@google.com Change-Id: I23e903d3e1baca854ad44fd3c96b9d0591bf2fe4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5582089 Auto-Submit: Josip Sokcevic Commit-Queue: Josip Sokcevic Reviewed-by: Joanna Wang Commit-Queue: Joanna Wang --- upload_to_google_storage_first_class.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/upload_to_google_storage_first_class.py b/upload_to_google_storage_first_class.py index f0d53368c..68ae3f834 100755 --- a/upload_to_google_storage_first_class.py +++ b/upload_to_google_storage_first_class.py @@ -171,6 +171,10 @@ def main(): parser.add_option('-b', '--bucket', help='Google Storage bucket to upload to.') + parser.add_option('-p', + '--prefix', + help='Prefix that goes before object-name (i.e. in ' + 'between bucket and object name).') parser.add_option('-o', '--object-name', help='Optional object name of uploaded tar file. ' @@ -233,6 +237,9 @@ def main(): if not object_name: object_name = get_sha256sum(file) + if options.prefix: + object_name = f'{options.prefix}/{object_name}' + # Make sure we can find a working instance of gsutil. if os.path.exists(GSUTIL_DEFAULT_PATH): gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto) @@ -255,7 +262,9 @@ def main(): gsutil.check_call('version') return gsutil.call('config') - base_url = 'gs://%s' % options.bucket + assert '/' not in options.bucket, "Slashes not allowed in bucket name" + + base_url = f'gs://{options.bucket}' generation = upload_to_google_storage(file, base_url, object_name, gsutil, options.force, options.gzip,