fix(native_image): clean up construction of inputs

[fmeum]

depset structures should be kept as flat as possible. C++ toolchain files are also already depsets and thus shouldn't be passed into tools.

[fmeum]

Stacked on #71

[sgammon]

#71 merged, rebased (and signed-off and signed)

will examine expected build failure and hopefully solve so i can hand off to you

[sgammon]

@fmeum adjusted to avoid breakages with legacy rules (from a0c767a):

diff --git a/internal/native_image/rules.bzl b/internal/native_image/rules.bzl
index c667cf1..03fa527 100644
--- a/internal/native_image/rules.bzl
+++ b/internal/native_image/rules.bzl
@@ -107,28 +107,39 @@ def _graal_binary_implementation(ctx):
     direct_inputs = []
     transitive_inputs = [classpath_depset]
 
-    if graal_attr == None:
+    # if we aren't handed a specific `native-image` tool binary, or we are running
+    # under the modern `native_image` rule, then attempt to resolve via toolchains...
+    if graal_attr == None and not (ctx.attr._legacy_rule):
         # resolve via toolchains
         info = ctx.toolchains[_GVM_TOOLCHAIN_TYPE].graalvm
-        graal_attr = info.native_image_bin
+
+        # but fall back to explicitly-provided tool, which should override, with the
+        # remainder of the resolved toolchain present
+        resolved_graal = graal_attr or info.native_image_bin
         gvm_toolchain = info
         extra_tool_deps.append(info.gvm_files)
 
         graal_inputs, _ = ctx.resolve_tools(tools = [
-            graal_attr,
+            resolved_graal,
         ] + extra_tool_deps)
 
         graal = graal_inputs.to_list()[0]
+
+        # if we're using an explicit tool, add it to the direct inputs
+        if graal_attr:
+            direct_inputs.append(graal_inputs)
+
+        # add toolchain files to transitive inputs
         transitive_inputs.append(gvm_toolchain.gvm_files[DefaultInfo].files)
-    else:
-        # otherwise, use the legacy code path
+    elif graal_attr != None:
+        # otherwise, use the legacy code path. the `graal` value is used in the run
+        # `executable` so it isn't listed in deps for earlier Bazel versions.
         graal_inputs, _, _ = ctx.resolve_command(tools = [
             graal_attr,
         ])
         graal = graal_inputs[0]
-        direct_inputs.append(graal_inputs)
-
-    if graal_attr == None:
+        direct_inputs.append(graal)
+    else:
         # still failed to resolve: cannot resolve via either toolchains or attributes.
         fail("""
             No `native-image` tool found. Please either define a `native_image_tool` in your target,
@@ -263,6 +274,7 @@ def _graal_binary_implementation(ctx):
         args.add("-H:+JNI")
 
     inputs = depset(direct_inputs, transitive = transitive_inputs)
+
     run_params = {
         "outputs": [binary],
         "arguments": [args],

it was

direct_inputs.append(graal_inputs)

that was causing the classic rules to fail with

ERROR: /home/runner/work/rules_graalvm/rules_graalvm/example/integration_tests/legacy-rules/sample/BUILD.bazel:19:13: in _native_image rule //sample:main-native: 
Traceback (most recent call last):
	File "/home/runner/.cache/bazel/_bazel_runner/69fba1e10e2cd[32](https://github.com/sgammon/rules_graalvm/actions/runs/6044192459/job/16402423305#step:9:33)bab37c75b69f47e2f/external/rules_graalvm/internal/native_image/rules.bzl", line 270, column 20, in _graal_binary_implementation
		inputs = depset(direct_inputs, transitive = transitive_inputs)
Error in depset: depset elements must not be mutable values

it seems to fix it to append only the file, like

direct_inputs.append(graal)  # graal is `graal_inputs[0]`

and it shouldn't affect your use in bazelbuild/bazel#19361, since that code path is only used by the legacy rules.

[sonarqubecloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information