[fix] allow aspects to be injected normally when users enable bzlmod. | #BAZEL-698 Done

Merge-request: BAZEL-MR-574
Merged-by: Xuan Son Trinh <[email protected]>

Author: xuansontrinh

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/utils/BUILD

@@ -8,6 +8,7 @@ kt_jvm_library(
     ]),
     visibility = ["//server:__subpackages__"],
     deps = [
+        "//bazelrunner",
         "//commons",
         "//server/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/info",
     ],

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/utils/InternalAspectsResolver.kt

@@ -1,15 +1,18 @@
 package org.jetbrains.bsp.bazel.server.bsp.utils
 
+import org.jetbrains.bsp.bazel.bazelrunner.BazelRelease
 import org.jetbrains.bsp.bazel.commons.Constants
 import org.jetbrains.bsp.bazel.server.bsp.info.BspInfo
 
-class InternalAspectsResolver(val bspInfo: BspInfo) {
+class InternalAspectsResolver(val bspInfo: BspInfo, val bazelRelease: BazelRelease) {
     private val prefix: Lazy<String> = lazy { getPrefix() }
     fun resolveLabel(aspect: String): String = prefix.value + aspect
 
     val bazelBspRoot: String
         get() = bspInfo.bazelBspDir().toString()
 
-    private fun getPrefix(): String =
-        "@" + Constants.ASPECT_REPOSITORY + "//aspects:core.bzl%"
+    private fun getPrefix(): String = when (bazelRelease.major) {
+        in 0..5 -> "@" + Constants.ASPECT_REPOSITORY + "//aspects:core.bzl%"
+        else -> "@@" + Constants.ASPECT_REPOSITORY + "//aspects:core.bzl%"
+    }
 }

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/common/ServerContainer.kt

@@ -54,7 +54,7 @@ class ServerContainer internal constructor(
                 )
             val bazelInfo = bazelDataResolver.resolveBazelInfo { }
 
-            val aspectsResolver = InternalAspectsResolver(bspInfo)
+            val aspectsResolver = InternalAspectsResolver(bspInfo, bazelInfo.release)
             val bazelBspEnvironmentManager = BazelBspEnvironmentManager(aspectsResolver, BazelExternalRulesQueryImpl(bazelRunner))
             val bazelBspAspectsManager = BazelBspAspectsManager(compilationManager, aspectsResolver, bazelBspEnvironmentManager)
             val bazelPathsResolver = BazelPathsResolver(bazelInfo)

server/src/test/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelBspEnvironmentManagerTest.kt

@@ -2,6 +2,8 @@ package org.jetbrains.bsp.bazel.server.bsp.managers
 
 import io.kotest.matchers.equals.shouldBeEqual
 import org.eclipse.lsp4j.jsonrpc.CancelChecker
+import org.jetbrains.bsp.bazel.bazelrunner.BazelInfo
+import org.jetbrains.bsp.bazel.bazelrunner.BazelRelease
 import org.jetbrains.bsp.bazel.server.bsp.info.BspInfo
 import org.jetbrains.bsp.bazel.server.bsp.utils.InternalAspectsResolver
 import org.junit.jupiter.api.BeforeEach
@@ -60,7 +62,7 @@ class BazelBspEnvironmentManagerTest {
         val dotBazelBspPath = createTempDirectory(".bazelbsp")
 
         dotBazelBspAspectsPath = dotBazelBspPath.resolve("aspects").createDirectory()
-        internalAspectsResolverMock = InternalAspectsResolver(BspInfoMock(dotBazelBspPath))
+        internalAspectsResolverMock = InternalAspectsResolver(BspInfoMock(dotBazelBspPath), BazelRelease(5))
     }
 
     @Test

server/src/test/kotlin/org/jetbrains/bsp/bazel/server/bsp/utils/InternalAspectsResolverTest.kt

@@ -1,6 +1,7 @@
 package org.jetbrains.bsp.bazel.server.bsp.utils
 
 import io.kotest.matchers.shouldBe
+import org.jetbrains.bsp.bazel.bazelrunner.BazelRelease
 import org.jetbrains.bsp.bazel.server.bsp.info.BspInfo
 import org.junit.jupiter.api.Test
 import java.nio.file.Paths
@@ -33,6 +34,25 @@ class InternalAspectsResolverTest {
         aspectLabel shouldBe "@bazelbsp_aspect//aspects:core.bzl%get_classpath"
     }
 
-    private fun createAspectsResolver(bspProjectRoot: String): InternalAspectsResolver =
-        InternalAspectsResolver(BspInfo(Paths.get(bspProjectRoot)))
+    @Test
+    fun `should resolve label differently for bazel version leq 5 and geq 6`() {
+        // given
+        val bspProjectRoot = "/Users/user/workspace/test-project/bsp-projects/test-project-bsp"
+
+        // when
+        val internalAspectsResolverVer5 = createAspectsResolver(bspProjectRoot, BazelRelease(5))
+        val internalAspectsResolverVer6 = createAspectsResolver(bspProjectRoot, BazelRelease(6))
+        val aspectLabelVer5 = internalAspectsResolverVer5.resolveLabel("get_classpath")
+        val aspectLabelVer6 = internalAspectsResolverVer6.resolveLabel("get_classpath")
+
+        // then
+        aspectLabelVer5 shouldBe "@bazelbsp_aspect//aspects:core.bzl%get_classpath"
+        aspectLabelVer6 shouldBe "@@bazelbsp_aspect//aspects:core.bzl%get_classpath"
+    }
+
+    private fun createAspectsResolver(
+            bspProjectRoot: String,
+            bazelRelease: BazelRelease = BazelRelease(5)
+    ): InternalAspectsResolver =
+        InternalAspectsResolver(BspInfo(Paths.get(bspProjectRoot)), bazelRelease)
 }