[fix] remove build_flags from non-build calls | #BAZEL-647 Done

Merge-request: BAZEL-MR-573 Merged-by: Blazej Kardys <Blazej.Kardys@jetbrains.com>
JetBrains · Oct 20, 2023 · 242995b · 242995b
1 parent 9b9985c
commit 242995b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelInfoResolver.kt b/bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelInfoResolver.kt
@@ -14,7 +14,9 @@ class BazelInfoResolver(
   }
 
   private fun bazelInfoFromBazel(cancelChecker: CancelChecker): BazelInfo {
-    val processResult = bazelRunner.commandBuilder().info().executeBazelCommand().waitAndGetResult(cancelChecker,true)
+    val processResult = bazelRunner.commandBuilder()
+        .info().executeBazelCommand(useBuildFlags = false)
+        .waitAndGetResult(cancelChecker,true)
     return parseBazelInfo(processResult).also { storage.store(it) }
   }
 
@@ -25,10 +27,12 @@ class BazelInfoResolver(
           InfoLinePattern.matchEntire(line)?.let { it.groupValues[1] to it.groupValues[2] }
         }.toMap()
 
+    fun BazelProcessResult.meaningfulOutput() = if (isNotSuccess) stderr else stdout
+
     fun extract(name: String): String =
         outputMap[name]
             ?: error("Failed to resolve $name from bazel info in ${bazelRunner.workspaceRoot}. " +
-                "Bazel Info output: '${bazelProcessResult.stdout.escapeNewLines()}'")
+                "Bazel Info output: '${bazelProcessResult.meaningfulOutput().escapeNewLines()}'")
 
     return BasicBazelInfo(
         execRoot = extract("execution_root"),

diff --git a/bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt b/bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelRunner.kt
@@ -50,10 +50,12 @@ class BazelRunner private constructor(
         arguments: List<String>,
         originId: String?,
         parseProcessOutput: Boolean,
+        useBuildFlags: Boolean = true,
     ): BazelProcess {
         val workspaceContext = workspaceContextProvider.currentWorkspaceContext()
+        val usedBuildFlags = if (useBuildFlags) buildFlags(workspaceContext) else emptyList()
         val processArgs =
-            listOf(bazel(workspaceContext), command) + buildFlags(workspaceContext) + flags + arguments
+            listOf(bazel(workspaceContext), command) + usedBuildFlags + flags + arguments
         logInvocation(processArgs, originId)
         val processBuilder = ProcessBuilder(processArgs)
         val outputLogger = bspClientLogger.takeIf { parseProcessOutput }

diff --git a/bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelRunnerBuilder.kt b/bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelRunnerBuilder.kt
@@ -83,8 +83,12 @@ open class BazelRunnerBuilder internal constructor(
         return this
     }
 
-    fun executeBazelCommand(originId: String? = null, parseProcessOutput: Boolean = true): BazelProcess {
-        return bazelRunner.runBazelCommand(bazelCommand, flags, arguments, originId, parseProcessOutput)
+    fun executeBazelCommand(
+        originId: String? = null,
+        parseProcessOutput: Boolean = true,
+        useBuildFlags: Boolean = true,
+    ): BazelProcess {
+        return bazelRunner.runBazelCommand(bazelCommand, flags, arguments, originId, parseProcessOutput, useBuildFlags)
     }
 
     fun executeBazelBesCommand(originId: String? = null, buildEventFile: Path): BazelProcess {

diff --git a/...er/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelExternalRulesQuery.kt b/...er/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelExternalRulesQuery.kt
@@ -2,6 +2,7 @@ package org.jetbrains.bsp.bazel.server.bsp.managers
 
 import org.eclipse.lsp4j.jsonrpc.CancelChecker
 import org.jetbrains.bsp.bazel.bazelrunner.BazelRunner
+import org.jetbrains.bsp.bazel.commons.escapeNewLines
 import org.w3c.dom.Document
 import org.w3c.dom.NodeList
 import org.xml.sax.InputSource
@@ -20,12 +21,13 @@ class BazelExternalRulesQueryImpl(private val bazelRunner: BazelRunner) : BazelE
         bazelRunner.commandBuilder().query()
             .withArgument("//external:*")
             .withFlags(listOf("--output=xml", "--order_output=no"))
-            .executeBazelCommand(parseProcessOutput = false)
-            .waitAndGetResult(cancelChecker, ensureAllOutputRead = true)
-            .stdout
-            .readXML()
-            ?.calculateEligibleRules()
-            ?: listOf()
+            .executeBazelCommand(parseProcessOutput = false, useBuildFlags = false)
+            .waitAndGetResult(cancelChecker, ensureAllOutputRead = true).let { result ->
+                if (result.isNotSuccess)
+                    error("Bazel query failed with output: '${result.stderr.escapeNewLines()}'")
+                else
+                    result.stdout.readXML()?.calculateEligibleRules()
+            } ?: listOf()
 
     private fun String.readXML(): Document? =
         DocumentBuilderFactory