Automated: Migrate gerrit/git-repo from gsutil to gcloud storage Bug: 486536908 Change-Id: I248b093e189a3784b8959e837a5d66857f1ce0fc Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/577201 Reviewed-by: Gavin Mak <gavinmak@google.com> Tested-by: Guru sai rama subbarao Voleti (xWF) <gvoleti@google.com> Commit-Queue: Guru sai rama subbarao Voleti (xWF) <gvoleti@google.com>
diff --git a/fetch.py b/fetch.py index 55845af..509a0fc 100644 --- a/fetch.py +++ b/fetch.py
@@ -34,7 +34,7 @@ """ scheme = urlparse(url).scheme if scheme == "gs": - cmd = ["gsutil", "cat", url] + cmd = ["gcloud", "storage", "cat", url] errors = [] try: result = subprocess.run( @@ -42,7 +42,7 @@ ) if result.stderr and verbose: print( - 'warning: non-fatal error running "gsutil": %s' + 'warning: non-fatal error running "gcloud storage": %s' % result.stderr, file=sys.stderr, ) @@ -50,7 +50,8 @@ except subprocess.CalledProcessError as e: errors.append(e) print( - 'fatal: error running "gsutil": %s' % e.stderr, file=sys.stderr + 'fatal: error running "gcloud storage": %s' % e.stderr, + file=sys.stderr, ) raise FetchFileError(aggregate_errors=errors) with urlopen(url) as f:
diff --git a/release/sign-launcher.py b/release/sign-launcher.py index e19a6fc..274b06f 100755 --- a/release/sign-launcher.py +++ b/release/sign-launcher.py
@@ -85,18 +85,18 @@ gs://git-repo-downloads/ You should first upload it with a specific version: - gsutil cp -a public-read {opts.launcher} gs://git-repo-downloads/repo-{version} - gsutil cp -a public-read {opts.launcher}.asc gs://git-repo-downloads/repo-{version}.asc + gcloud storage cp --predefined-acl=publicRead {opts.launcher} gs://git-repo-downloads/repo-{version} + gcloud storage cp --predefined-acl=publicRead {opts.launcher}.asc gs://git-repo-downloads/repo-{version}.asc Then to make it the public default: - gsutil cp -a public-read gs://git-repo-downloads/repo-{version} gs://git-repo-downloads/repo - gsutil cp -a public-read gs://git-repo-downloads/repo-{version}.asc gs://git-repo-downloads/repo.asc + gcloud storage cp --predefined-acl=publicRead gs://git-repo-downloads/repo-{version} gs://git-repo-downloads/repo + gcloud storage cp --predefined-acl=publicRead gs://git-repo-downloads/repo-{version}.asc gs://git-repo-downloads/repo.asc NB: If a rollback is necessary, the GS bucket archives old versions, and may be accessed by specifying their unique id number. - gsutil ls -la gs://git-repo-downloads/repo gs://git-repo-downloads/repo.asc - gsutil cp -a public-read gs://git-repo-downloads/repo#<unique id> gs://git-repo-downloads/repo - gsutil cp -a public-read gs://git-repo-downloads/repo.asc#<unique id> gs://git-repo-downloads/repo.asc + gcloud storage ls --long --all-versions gs://git-repo-downloads/repo gs://git-repo-downloads/repo.asc + gcloud storage cp --predefined-acl=publicRead gs://git-repo-downloads/repo#<unique id> gs://git-repo-downloads/repo + gcloud storage cp --predefined-acl=publicRead gs://git-repo-downloads/repo.asc#<unique id> gs://git-repo-downloads/repo.asc """ # noqa: E501 )