fix: Fix more canonical names

Tinder · Oct 1, 2024 · 87596b5 · 87596b5
1 parent 8d85ffd
commit 87596b5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/cli/src/main/kotlin/com/bazel_diff/bazel/BazelClient.kt b/cli/src/main/kotlin/com/bazel_diff/bazel/BazelClient.kt
@@ -2,10 +2,9 @@ package com.bazel_diff.bazel
 
 import com.bazel_diff.log.Logger
 import com.google.devtools.build.lib.query2.proto.proto2api.Build
-import java.nio.file.Path
-import java.util.*
-import org.koin.core.component.inject
 import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import java.util.Calendar
 
 class BazelClient(private val useCquery: Boolean, private val fineGrainedHashExternalRepos: Set<String>) : KoinComponent {
     private val logger: Logger by inject()
@@ -31,7 +30,7 @@ class BazelClient(private val useCquery: Boolean, private val fineGrainedHashExt
                 queryService.query(repoTargetsQuery.joinToString(" + ") { "'$it'" }))
                 .distinctBy { it.rule.name }
         } else {
-            val buildTargetsQuery = listOf("//...:all-targets") + fineGrainedHashExternalRepos.map { "@$it//...:all-targets" }
+            val buildTargetsQuery = listOf("//...:all-targets") + fineGrainedHashExternalRepos.map { "@@$it//...:all-targets" }
             queryService.query((repoTargetsQuery + buildTargetsQuery).joinToString(" + ") { "'$it'" })
         }
         val queryDuration = Calendar.getInstance().getTimeInMillis() - queryEpoch

diff --git a/cli/src/main/kotlin/com/bazel_diff/bazel/BazelQueryService.kt b/cli/src/main/kotlin/com/bazel_diff/bazel/BazelQueryService.kt
@@ -45,7 +45,10 @@ class BazelQueryService(
         val targets = outputFile.inputStream().buffered().use { proto ->
             if (useCquery) {
                 val cqueryResult = AnalysisProtosV2.CqueryResult.parseFrom(proto)
-                cqueryResult.resultsList.filter { it.target.rule.name in compatibleTargetSet }.map { it.target }
+                cqueryResult.resultsList.filter {
+                    it.target.rule.name in compatibleTargetSet ||
+                            it.target.rule.name.startsWith("@") && "@${it.target.rule.name}" in compatibleTargetSet
+                }.map { it.target }
             } else {
                 mutableListOf<Build.Target>().apply {
                     while (true) {

diff --git a/cli/src/main/kotlin/com/bazel_diff/bazel/BazelRule.kt b/cli/src/main/kotlin/com/bazel_diff/bazel/BazelRule.kt
@@ -37,11 +37,11 @@ class BazelRule(private val rule: Build.Rule) {
     val name: String = rule.name
 
     private fun transformRuleInput(fineGrainedHashExternalRepos: Set<String>, ruleInput: String): String {
-        if (ruleInput.startsWith("@") && fineGrainedHashExternalRepos.none { ruleInput.startsWith("@$it") }) {
+        if (ruleInput.startsWith("@") && fineGrainedHashExternalRepos.none { ruleInput.startsWith("@$it") || ruleInput.startsWith("@@${it}") }) {
             val splitRule = ruleInput.split("//".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
             if (splitRule.size == 2) {
                 var externalRule = splitRule[0]
-                externalRule = externalRule.replaceFirst("@".toRegex(), "")
+                externalRule = externalRule.replaceFirst("@+".toRegex(), "")
                 return String.format("//external:%s", externalRule)
             }
         }

diff --git a/cli/src/main/kotlin/com/bazel_diff/hash/ExternalRepoResolver.kt b/cli/src/main/kotlin/com/bazel_diff/hash/ExternalRepoResolver.kt
@@ -37,7 +37,7 @@ class ExternalRepoResolver(
         val queryResultLine = runProcessAndCaptureFirstLine(
             bazelPath.toString(),
             "query",
-            "@$repoName//...",
+            "@@$repoName//...",
             "--keep_going",
             "--output",
             "location"
@@ -67,4 +67,4 @@ class ExternalRepoResolver(
             return it.readLine()
         }
     }
-}
+}
diff --git a/cli/src/main/kotlin/com/bazel_diff/hash/SourceFileHasher.kt b/cli/src/main/kotlin/com/bazel_diff/hash/SourceFileHasher.kt
@@ -48,7 +48,11 @@ class SourceFileHasher : KoinComponent {
                 val filenameSubstring = name.substring(2)
                 Paths.get(filenameSubstring.removePrefix(":").replace(':', '/'))
             } else if (name.startsWith("@")) {
-                val parts = name.substring(1).split("//")
+                val parts = if (name.startsWith("@@")) {
+                    name.substring(2).split("//")
+                } else {
+                    name.substring(1).split("//")
+                }
                 if (parts.size != 2) {
                     logger.w { "Invalid source label $name" }
                     return@sha256