Revert "Fix: shim tools requiring go to use rules_go's hermetic SDK (#54887)"

This reverts commit c00e3f6.

Author: aiuto

BUILD.bazel

@@ -12,7 +12,6 @@ load("@dd_release_json//:release_json.bzl", "release_json")
 load("@gazelle//:def.bzl", "DEFAULT_LANGUAGES", "gazelle", "gazelle_binary")
 load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
 load("@rules_license//rules:license.bzl", "license")
-load("//bazel/rules/go_shim:defs.bzl", "go_shim")
 load("//compliance/rules:purl.bzl", "purl_for_generic")
 load("//tasks:build_tags.bzl", "GAZELLE_BUILD_TAGS")
 
@@ -124,9 +123,9 @@ alias(
 )
 
 # bazel run //:go_mod_tidy_all -- -x
-go_shim(
+alias(
     name = "go_mod_tidy_all",
-    tool = "//bazel/rules/go_mod_tidy_all",
+    actual = "//bazel/tools:go_mod_tidy_all",
 )
 
 run_binary(

bazel/rules/go_mod_tidy_all/BUILD.bazel

@@ -1,6 +1,15 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 
+py_binary(
+    name = "go_mod_tidy_all",
+    srcs = ["go_mod_tidy_all.py"],
+    args = ["$(rlocationpath @rules_go//go)"],
+    data = ["@rules_go//go"],
+    visibility = ["//:__pkg__"],
+    deps = ["@rules_python//python/runfiles"],
+)
+
 py_binary(
     name = "generate_module_bazel",
     srcs = ["generate_module_bazel.py"],

bazel/rules/go_shim/BUILD.bazel

@@ -12,9 +12,11 @@
 from subprocess import PIPE, CalledProcessError
 from traceback import format_exception_only
 
+from python.runfiles import runfiles
 
-async def _exec(*args, **kwargs):
-    proc = await asyncio.create_subprocess_exec(*args, **kwargs)
+
+async def _exec(go, *args, **kwargs):
+    proc = await asyncio.create_subprocess_exec(go, *args, **kwargs)
     try:
         stdout, _ = await proc.communicate()
     except BaseException:  # reap the process on any CancelledError, KeyboardInterrupt, SystemExit, TimeoutError, etc.
@@ -28,26 +30,26 @@ async def _exec(*args, **kwargs):
         raise
     if proc.returncode == 0:
         return stdout
-    raise CalledProcessError(proc.returncode, " ".join(args), output=stdout)
+    raise CalledProcessError(proc.returncode, " ".join((os.path.basename(go), *args)), output=stdout)
 
 
-async def _tidy(max_workers, mod_path, args):
+async def _tidy(max_workers, go, mod_path, args):
     async with max_workers:
-        await _exec("go", "mod", "tidy", "-C", mod_path, *args)
+        await _exec(go, "mod", "tidy", "-C", mod_path, *args)
 
 
-async def main(args):
-    mod_paths = await _exec("go", "list", "-f", "{{.Dir}}", "-m", stdout=PIPE)
+async def main(go, args):
+    mod_paths = await _exec(go, "list", "-f", "{{.Dir}}", "-m", stdout=PIPE)
     max_workers = asyncio.Semaphore((os.cpu_count() or 1) + 4)  # TODO(regis): cpu_count -> Py 3.13's process_cpu_count
     # global timeout: on cold cache, per-task timeouts were unfairly hit because early tasks download most modules
     async with asyncio.timeout(timedelta(minutes=15).total_seconds()), asyncio.TaskGroup() as tg:
         for mod_path in mod_paths.decode().splitlines():
-            tg.create_task(_tidy(max_workers, mod_path, args))
+            tg.create_task(_tidy(max_workers, go, mod_path, args))
 
 
 if __name__ == "__main__":
     logging.getLogger("asyncio").setLevel(logging.ERROR)  # no `Unknown child process pid N, will report returncode 255`
     try:
-        asyncio.run(main(sys.argv[1:]))
+        asyncio.run(main(runfiles.Create().Rlocation(sys.argv[1]), sys.argv[2:]))
     except* BaseException as eg:
         sys.exit("\n".join(line.rstrip() for e in eg.exceptions for line in format_exception_only(e)))

bazel/rules/go_shim/defs.bzl

@@ -1,9 +1,9 @@
 load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
+load("@rules_multitool//multitool:cwd.bzl", "cwd")
 load("@rules_pkg//pkg:install.bzl", "pkg_install")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files")
-load("//bazel/rules/go_shim:defs.bzl", "go_shim")
 
-go_shim(
+cwd(
     name = "gotestsum",
     tool = "@tools_gotest_gotestsum//:gotestsum",
 )