commit 4c5db1885b21e74272b177146b645ab5f019dcbe
author Li-Yu Yu <aaronyu@google.com> Thu Feb 23 10:03:22 2023 +0800
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 23 19:37:54 2023 +0000
tree 311bf5434ace7f8f1c4965b28b3e491720f22729
parent a29e287c5b79921b60c48ad4c554a4319409e2ec

scripts: Use HTTP to get clang-format binary

It's way faster than gs://.

BUG=b:244479571
TEST=scripts/clang-format --version

Change-Id: Icf6b94be626f09f1d63a24fbb7555494224f8af0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4286017
Tested-by: Li-Yu Yu <aaronyu@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Li-Yu Yu <aaronyu@google.com>

scripts/clang_format.py

diff --git a/scripts/clang_format.py b/scripts/clang_format.py
index cef3d72..c2a0527 100644
--- a/scripts/clang_format.py
+++ b/scripts/clang_format.py
@@ -7,10 +7,10 @@
 import contextlib
 import os
 from typing import ContextManager, Sequence
-import urllib.parse
 
 from chromite.lib import cache
 from chromite.lib import cros_build_lib
+from chromite.lib import gs
 from chromite.lib import path_util
 
 
@@ -28,7 +28,7 @@
     def _Fetch(
         self, url: str, local_path: str
     ):  # pylint: disable=arguments-differ
-        expected_sha1 = urllib.parse.urlparse(url).path.lstrip("/")
+        expected_sha1 = url.rsplit("/", 1)[-1]
         super()._Fetch(url, local_path, hash_sha1=expected_sha1, mode=0o755)
 
 
@@ -42,7 +42,7 @@
 def ClangFormat() -> ContextManager[str]:
     """Context manager returning the clang-format binary."""
     key = (CLANG_FORMAT_SHA1,)
-    url = f"{CLANG_FORMAT_BUCKET}/{CLANG_FORMAT_SHA1}"
+    url = gs.GsUrlToHttp(f"{CLANG_FORMAT_BUCKET}/{CLANG_FORMAT_SHA1}")
     with GetClangFormatCache().Lookup(key) as ref:
         if not ref.Exists(lock=True):
             ref.SetDefault(url, lock=True)