Use endswith for finding JavaToolchainInfo

This adapts to breaking changes in Bazel 7 while maintaining backwards compatibility to Bazel 6.x. See bazelbuild/bazel#20473 for details.
salesforce · Dec 9, 2023 · b017921 · b017921
1 parent f7ffd06
commit b017921
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/....core/src/com/salesforce/bazel/eclipse/core/model/discovery/BaseProvisioningStrategy.java b/....core/src/com/salesforce/bazel/eclipse/core/model/discovery/BaseProvisioningStrategy.java
@@ -875,7 +875,19 @@ protected void detectDefaultJavaToolchain(BazelWorkspace workspace) throws CoreE
         var command = new BazelCQueryWithStarlarkExpressionCommand(
                 workspace.getLocation().toPath(),
                 "@bazel_tools//tools/jdk:current_java_toolchain",
-                "providers(target)['JavaToolchainInfo'].source_version + '::' + providers(target)['JavaToolchainInfo'].target_version + '::' + providers(target)['JavaToolchainInfo'].java_runtime.java_home",
+                """
+                        def format(target):
+                            toolchain_infos = {k: v for k, v in providers(target).items() if k.endswith('JavaToolchainInfo')}
+
+                            if len(toolchain_infos) < 1:
+                                fail("Unable to obtain JavaToolchainInfo. No providers available.")
+                            elif len(toolchain_infos) > 1:
+                                fail("Unable to obtain JavaToolchainInfo. Multiple providers found.")
+
+                            java_toolchain_info = toolchain_infos.values()[0]
+
+                            return java_toolchain_info.source_version + '::' + java_toolchain_info.target_version + '::' + java_toolchain_info.java_runtime.java_home
+                            """,
                 false,
                 "Querying for Java toolchain information");
         var result = workspace.getCommandExecutor().runQueryWithoutLock(command).trim();

diff --git a/...el.sdk/src/com/salesforce/bazel/sdk/command/BazelCQueryWithStarlarkExpressionCommand.java b/...el.sdk/src/com/salesforce/bazel/sdk/command/BazelCQueryWithStarlarkExpressionCommand.java
@@ -2,6 +2,8 @@
 
 import static java.nio.file.Files.createTempFile;
 import static java.nio.file.Files.readString;
+import static java.nio.file.Files.writeString;
+import static java.util.Objects.requireNonNull;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -17,10 +19,12 @@
  */
 public class BazelCQueryWithStarlarkExpressionCommand extends BazelCQueryCommand<String> {
 
+    private final String starlarkExpression;
+
     public BazelCQueryWithStarlarkExpressionCommand(Path workspaceRoot, String query, String starlarkExpression,
             boolean keepGoing, String purpose) {
         super(workspaceRoot, query, keepGoing, purpose);
-        setCommandArgs("--output", "starlark", "--starlark:expr", starlarkExpression);
+        this.starlarkExpression = requireNonNull(starlarkExpression, "missing Starlark expression");
     }
 
     @Override
@@ -34,6 +38,13 @@ public List<String> prepareCommandLine(BazelVersion bazelVersion) throws IOExcep
         var stdoutFile = createTempFile("bazel_cquery_stdout_", ".starlark.txt");
         setRedirectStdOutToFile(stdoutFile);
 
+        // save expression into file
+        var starlarkFile = createTempFile("bazel_cquery_starlark_file_", ".starlark.txt");
+        writeString(starlarkFile, starlarkExpression);
+
+        // addjust command args
+        setCommandArgs("--output", "starlark", "--starlark:file", starlarkFile.toString());
+
         // prepare regular query command line
         return super.prepareCommandLine(bazelVersion);
     }