chore(bazel): Simplify obtaining the Bazel version

Using the default `bazel --version` is simpler and more resilient in case of mis-configuration, such as the disk cache pointing to a non-existing directory. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Jun 28, 2024 · fd6b3fb · fd6b3fb
1 parent 767475e
commit fd6b3fb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 30 deletions.
diff --git a/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt b/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt
@@ -82,9 +82,7 @@ class Bazel(
 
     override fun command(workingDir: File?) = "bazel"
 
-    override fun getVersionArguments() = "version"
-
-    override fun transformVersion(output: String) = transformBazelVersion(output)
+    override fun transformVersion(output: String) = output.removePrefix("bazel ")
 
     // Bazel 6.0 already supports bzlmod but it is not enabled by default.
     // Supporting it would require adding the flag "--enable_bzlmod=true" at the correct position of all bazel
@@ -204,14 +202,6 @@ class Bazel(
         )
 }
 
-internal fun transformBazelVersion(output: String) =
-    output.lineSequence()
-        .find { it.startsWith("Build label") }
-        .orEmpty()
-        .split(':')
-        .getOrElse(1) { "" }
-        .trim()
-
 private fun ModuleMetadata.vcsInfo(): VcsInfo {
     val repo = repository?.firstOrNull().orEmpty()
 

diff --git a/plugins/package-managers/bazel/src/test/kotlin/BazelTest.kt b/plugins/package-managers/bazel/src/test/kotlin/BazelTest.kt
@@ -22,32 +22,13 @@ package org.ossreviewtoolkit.plugins.packagemanagers.bazel
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.engine.spec.tempdir
 import io.kotest.matchers.collections.beEmpty
-import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNot
 
 import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
 import org.ossreviewtoolkit.model.config.RepositoryConfiguration
 import org.ossreviewtoolkit.utils.test.getAssetFile
 
 class BazelTest : WordSpec({
-    "transformBazelVersion()" should {
-        "remove everything except for the version number" {
-            val bazelVersionOutput = """
-                Bazelisk version: development
-                WARNING: Invoking Bazel in batch mode since it is not invoked from within a workspace (below a directory having a WORKSPACE file).
-                OpenJDK 64-Bit Server VM warning: Options -Xverify:none and -noverify were deprecated in JDK 13 and will likely be removed in a future release.
-                Build label: 7.0.1
-                Build target: @@//src/main/java/com/google/devtools/build/lib/bazel:BazelServer
-                Build time: Thu Jan 18 18:05:58 2024 (1705601158)
-                Build timestamp: 1705601158
-                Build timestamp as int: 1705601158
-            """.trimIndent()
-
-            val result = transformBazelVersion(bazelVersionOutput)
-            result shouldBe "7.0.1"
-        }
-    }
-
     "Bazel package manager" should {
         "support local registry" {
             val projectAssets = getAssetFile("projects/synthetic/bazel-local-registry/")