A few arguments construction cleanups

extras/bindata.bzl

@@ -27,7 +27,7 @@ def _bindata_impl(ctx):
     arguments = ctx.actions.args()
     arguments.add_all([
         "-o",
-        out.path,
+        out,
         "-pkg",
         ctx.attr.package,
         "-prefix",

go/private/actions/compile.bzl

@@ -18,6 +18,10 @@ load(
     "LINKMODE_C_SHARED",
     "LINKMODE_PLUGIN",
 )
+load(
+    "@io_bazel_rules_go//go/private:skylib/lib/shell.bzl",
+    "shell",
+)
 
 def _importpath(v):
     return v.data.importpath
@@ -97,7 +101,7 @@ def emit_compile(
     )
 
 def _bootstrap_compile(go, sources, out_lib, gc_goopts):
-    cmd = [go.go.path, "tool", "compile", "-trimpath", "$(pwd)"]
+    cmd = [shell.quote(go.go.path), "tool", "compile", "-trimpath", "\"$(pwd)\""]
     args = go.actions.args()
     args.add_all(["-o", out_lib])
     args.add_all(gc_goopts)
@@ -107,5 +111,8 @@ def _bootstrap_compile(go, sources, out_lib, gc_goopts):
         outputs = [out_lib],
         arguments = [args],
         mnemonic = "GoCompile",
-        command = "export GOROOT=$(pwd)/{} && export GOROOT_FINAL=GOROOT && {} \"$@\"".format(go.root, " ".join(cmd)),
+        command = "export GOROOT=\"$(pwd)\"/{} && {} \"$@\"".format(shell.quote(go.root), " ".join(cmd)),
+        env = {
+            "GOROOT_FINAL": "GOROOT",
+        },
     )

go/private/actions/link.bzl

@@ -23,6 +23,10 @@ load(
     "LINKMODE_NORMAL",
     "LINKMODE_PLUGIN",
 )
+load(
+    "@io_bazel_rules_go//go/private:skylib/lib/shell.bzl",
+    "shell",
+)
 
 def _format_archive(d):
     return "{}={}={}".format(d.label, d.importmap, d.file.path)
@@ -156,16 +160,22 @@ def _bootstrap_link(go, archive, executable, gc_linkopts):
     """See go/toolchains.rst#link for full documentation."""
 
     inputs = [archive.data.file] + go.sdk.libs + go.sdk.tools + [go.go]
-    args = ["tool", "link", "-s", "-linkmode", "internal", "-o", executable.path]
-    args.extend(gc_linkopts)
-    args.append(archive.data.file.path)
+    args = go.actions.args()
+    args.add_all(["tool", "link", "-s", "-linkmode", "internal", "-o", executable])
+    args.add_all(gc_linkopts)
+    args.add(archive.data.file)
     go.actions.run_shell(
         inputs = inputs,
         outputs = [executable],
+        arguments = [args],
         mnemonic = "GoLink",
-         # workaround: go link tool needs some features of gcc to complete the job on Arm platform.
-         # So, PATH for 'gcc' is required here on Arm platform.
-        command = "export GOROOT=$(pwd)/{} && export GOROOT_FINAL=GOROOT && export PATH={} && {} {}".format(go.root, go.cgo_tools.compiler_path, go.go.path, " ".join(args)),
+        command = "export GOROOT=\"$(pwd)\"/{} && {} \"$@\"".format(shell.quote(go.root), shell.quote(go.go.path)),
+        env = {
+            # workaround: go link tool needs some features of gcc to complete the job on Arm platform.
+            # So, PATH for 'gcc' is required here on Arm platform.
+            "PATH": go.cgo_tools.compiler_path,
+            "GOROOT_FINAL": "GOROOT",
+        },
     )
 
 def _extract_extldflags(gc_linkopts, extldflags):

go/private/rules/stdlib.bzl

@@ -65,7 +65,7 @@ def _build_stdlib(go, attr):
         args.add("-shared")
     if go.mode.link == LINKMODE_PLUGIN:
         args.add("-dynlink")
-    args.add_all(["-filter_buildid", filter_buildid.path])
+    args.add_all(["-filter_buildid", filter_buildid])
     go.actions.write(root_file, "")
     env = go.env
     env.update({

go/private/tools/path.bzl

@@ -106,13 +106,13 @@ def _go_path_impl(ctx):
     # Execute the builder
     if ctx.attr.mode == "archive":
         out = ctx.actions.declare_file(ctx.label.name + ".zip")
-        out_path = out.path
+        out_path = out
         out_short_path = out.short_path
         outputs = [out]
         out_file = out
     elif ctx.attr.mode == "copy":
         out = ctx.actions.declare_directory(ctx.label.name)
-        out_path = out.path
+        out_path = out
         out_short_path = out.short_path
         outputs = [out]
         out_file = out
@@ -128,17 +128,18 @@ def _go_path_impl(ctx):
         out_path = tag.dirname
         out_short_path = tag.short_path.rpartition("/")[0]
         out_file = tag
-    args = [
-        "-manifest=" + manifest_file.path,
-        "-out=" + out_path,
-        "-mode=" + ctx.attr.mode,
-    ]
+    args = ctx.actions.args()
+    args.add_all([
+        "-manifest", manifest_file,
+        "-out", out_path,
+        "-mode", ctx.attr.mode,
+    ])
     ctx.actions.run(
         outputs = outputs,
         inputs = inputs,
         mnemonic = "GoPath",
         executable = ctx.executable._go_path,
-        arguments = args,
+        arguments = [args],
     )
 
     return [

tests/bazel_tests.bzl

@@ -283,7 +283,7 @@ def _md5_sum_impl(ctx):
     go = go_context(ctx)
     out = go.declare_file(go, ext = ".md5")
     arguments = ctx.actions.args()
-    arguments.add_all(["-output", out.path])
+    arguments.add_all(["-output", out])
     arguments.add_all(ctx.files.srcs)
     ctx.actions.run(
         inputs = ctx.files.srcs,