[fix] adding fallback for custom bazel version | #BAZEL-648 Done

Merge-request: BAZEL-MR-597
Merged-by: Blazej Kardys <[email protected]>

Author: sellophane

bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelInfo.kt

@@ -1,7 +1,8 @@
 package org.jetbrains.bsp.bazel.bazelrunner
 
-import java.lang.RuntimeException
 import java.nio.file.Path
+import kotlin.io.path.isReadable
+import kotlin.io.path.readText
 
 interface BazelInfo {
   val execRoot: String
@@ -21,12 +22,30 @@ data class BazelRelease(
   }
 
   companion object {
-    fun fromReleaseString(versionString: String): BazelRelease {
-      val major = """(?<=release )\d+(?=[0-9.]*)""".toRegex().find(versionString)?.value?.toInt()!!
-      return BazelRelease(major)
+    fun fromReleaseString(versionString: String): BazelRelease? =
+      VERSION_REGEX.find(versionString)?.toBazelRelease()
+
+    fun fromBazelVersionFile(workspacePath: Path): BazelRelease? {
+      val versionString = workspacePath.resolve(".bazelversion")
+              .takeIf { it.isReadable() }
+              ?.readText()
+              .orEmpty()
+      return BAZEL_VERSION_MAJOR_REGEX.find(versionString)?.toBazelRelease()
     }
+
+    private fun MatchResult.toBazelRelease() =
+            BazelRelease(value.toInt())
+
+    internal val LATEST_SUPPORTED_MAJOR = BazelRelease(6)
+
+    private val BAZEL_VERSION_MAJOR_REGEX = """^\d+""".toRegex()
+
+    private val VERSION_REGEX = """(?<=release )\d+(?=[0-9.]*)""".toRegex()
   }
 }
+
+fun BazelRelease?.orLatestSupported() = this ?: BazelRelease.LATEST_SUPPORTED_MAJOR
+
 data class BasicBazelInfo(
     override val execRoot: String,
     override val outputBase: Path,

bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelInfoResolver.kt

@@ -34,11 +34,14 @@ class BazelInfoResolver(
             ?: error("Failed to resolve $name from bazel info in ${bazelRunner.workspaceRoot}. " +
                 "Bazel Info output: '${bazelProcessResult.meaningfulOutput().escapeNewLines()}'")
 
+    fun obtainBazelReleaseVersion() = BazelRelease.fromReleaseString(extract("release")) ?:
+      bazelRunner.workspaceRoot?.let { BazelRelease.fromBazelVersionFile(it) }.orLatestSupported()
+
     return BasicBazelInfo(
         execRoot = extract("execution_root"),
         outputBase = Paths.get(extract("output_base")),
         workspaceRoot = Paths.get(extract("workspace")),
-        release = BazelRelease.fromReleaseString(extract("release"))
+        release = obtainBazelReleaseVersion()
     )
   }
 

bazelrunner/src/test/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BUILD

@@ -13,6 +13,7 @@ kt_test(
     name = "BazelReleaseTest",
     size = "small",
     src = "BazelReleaseTest.kt",
+    resources = ["//bazelrunner/src/test/resources:workspace"],
     deps = [
         "//bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner",
     ],

bazelrunner/src/test/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelReleaseTest.kt

@@ -1,7 +1,12 @@
 package org.jetbrains.bsp.bazel.bazelrunner
 
+import com.google.common.base.Charsets
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
+import java.nio.file.Path
+import kotlin.io.path.createDirectories
+import kotlin.io.path.createTempDirectory
+import kotlin.io.path.writeText
 
 class BazelReleaseTest {
 
@@ -11,8 +16,8 @@ class BazelReleaseTest {
     val release = BazelRelease.fromReleaseString("release 4.0.0")
 
     // then
-    release.major shouldBe 4
-    release.mainRepositoryReferencePrefix() shouldBe "//"
+    release?.major shouldBe 4
+    release?.mainRepositoryReferencePrefix() shouldBe "//"
   }
 
   @Test
@@ -21,8 +26,8 @@ class BazelReleaseTest {
     val release = BazelRelease.fromReleaseString("release 6.0.0")
 
     // then
-    release.major shouldBe 6
-    release.mainRepositoryReferencePrefix() shouldBe "@//"
+    release?.major shouldBe 6
+    release?.mainRepositoryReferencePrefix() shouldBe "@//"
   }
 
   @Test
@@ -31,7 +36,7 @@ class BazelReleaseTest {
     val release = BazelRelease.fromReleaseString("release 6.0.0-pre20230102")
 
     // then
-    release.major shouldBe 6
+    release?.major shouldBe 6
   }
 
   @Test
@@ -40,6 +45,34 @@ class BazelReleaseTest {
     val release = BazelRelease.fromReleaseString("release 16.0.0")
 
     // then
-    release.major shouldBe 16
+    release?.major shouldBe 16
+  }
+
+  @Test
+  fun `should fall back to last supported version in case of error`() {
+    // given & when
+    val release = BazelRelease.fromReleaseString("debug test").orLatestSupported()
+
+    // then
+    release.major shouldBe 6
+  }
+
+  @Test
+  fun `should correctly parse bazelversion`() {
+    // given & when
+    val path = copyBazelVersionToTmp()
+    val release = BazelRelease.fromBazelVersionFile(path.parent)
+
+    // then
+    release?.major shouldBe 6
+  }
+
+  private fun copyBazelVersionToTmp() : Path {
+    val inputStream = BazelReleaseTest::class.java.getResourceAsStream("/.bazelversion")
+    val content = inputStream?.bufferedReader(Charsets.UTF_8)?.readText()
+    val tempDir = createTempDirectory("workspace").createDirectories()
+    val tempFile = tempDir.resolve(".bazelversion")
+    content?.let { tempFile.writeText(it) }
+    return tempFile
   }
 }

bazelrunner/src/test/resources/.bazelversion

@@ -0,0 +1 @@
+6.3.0

bazelrunner/src/test/resources/BUILD

@@ -0,0 +1,5 @@
+filegroup(
+    name = "workspace",
+    srcs = [".bazelversion"],
+    visibility = ["//bazelrunner/src/test/kotlin/org/jetbrains/bsp/bazel:__subpackages__"],
+)

server/src/test/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/LanguagePluginServiceTest.kt

@@ -4,6 +4,7 @@ import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import org.jetbrains.bsp.bazel.bazelrunner.BasicBazelInfo
 import org.jetbrains.bsp.bazel.bazelrunner.BazelRelease
+import org.jetbrains.bsp.bazel.bazelrunner.orLatestSupported
 import org.jetbrains.bsp.bazel.server.sync.BazelPathsResolver
 import org.jetbrains.bsp.bazel.server.sync.languages.cpp.CppLanguagePlugin
 import org.jetbrains.bsp.bazel.server.sync.languages.java.JavaLanguagePlugin
@@ -31,7 +32,12 @@ class LanguagePluginServiceTest {
 
   @BeforeEach
   fun beforeEach() {
-    val bazelInfo = BasicBazelInfo("", Paths.get(""), Paths.get(""), BazelRelease.fromReleaseString("release 6.0.0"))
+    val bazelInfo = BasicBazelInfo(
+      execRoot = "",
+      outputBase = Paths.get(""),
+      workspaceRoot = Paths.get(""),
+      release = BazelRelease.fromReleaseString("release 6.0.0").orLatestSupported(),
+    )
     val bazelPathsResolver = BazelPathsResolver(bazelInfo)
     val jdkResolver = JdkResolver(bazelPathsResolver, JdkVersionResolver())
     val javaLanguagePlugin = JavaLanguagePlugin(bazelPathsResolver, jdkResolver, bazelInfo)

server/src/test/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/java/IdeClasspathResolverTest.kt

@@ -3,6 +3,7 @@ package org.jetbrains.bsp.bazel.server.sync.languages.java
 import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
 import org.jetbrains.bsp.bazel.bazelrunner.BasicBazelInfo
 import org.jetbrains.bsp.bazel.bazelrunner.BazelRelease
+import org.jetbrains.bsp.bazel.bazelrunner.orLatestSupported
 import org.jetbrains.bsp.bazel.server.sync.BazelPathsResolver
 import org.jetbrains.bsp.bazel.server.sync.model.Label
 import org.junit.jupiter.api.BeforeEach
@@ -23,7 +24,7 @@ class IdeClasspathResolverTest {
         execRoot = execRoot,
         outputBase = Paths.get(outputBase),
         workspaceRoot = Paths.get("/Users/user/workspace/bazel-bsp"),
-        release = BazelRelease.fromReleaseString("release 6.0.0")
+        release = BazelRelease.fromReleaseString("release 6.0.0").orLatestSupported()
     )
 
     bazelPathsResolver = BazelPathsResolver(bazelInfo)