From c3c587ad194de48978c38a4ed984c9613e2ecfc0 Mon Sep 17 00:00:00 2001
From: Tianyu Geng <tgeng@pinterest.com>
Date: Mon, 11 Mar 2024 14:57:25 -0700
Subject: [PATCH] Make fineGrainedHashExternalRepos work with BzlMod

With Bzlmod, the location of external repository is no longer
`<exec_root>/external/<repo_name>`. Hence, a devoted repo resolver is
added and it resolves bzlmod repo location by doing a `bazel query`. The
result is cached to mitigate performance impact of such a call.
---
 .../main/kotlin/com/bazel_diff/di/Modules.kt  |  61 +++++++++---------
 .../bazel_diff/hash/ExternalRepoResolver.kt   |  47 ++++++++++++++
 .../com/bazel_diff/hash/SourceFileHasher.kt   |  13 ++--
 cli/src/test/kotlin/com/bazel_diff/Modules.kt |  12 ++--
 .../test/kotlin/com/bazel_diff/e2e/E2ETest.kt |  56 ++++++++++++++++
 .../bazel_diff/hash/SourceFileHasherTest.kt   |  23 +++----
 .../fine-grained-hash-bzlmod-test-1.zip       | Bin 0 -> 8168 bytes
 .../fine-grained-hash-bzlmod-test-2.zip       | Bin 0 -> 8216 bytes
 ...ined-hash-bzlmod-test-impacted-targets.txt |  23 +++++++
 9 files changed, 180 insertions(+), 55 deletions(-)
 create mode 100644 cli/src/main/kotlin/com/bazel_diff/hash/ExternalRepoResolver.kt
 create mode 100644 cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-1.zip
 create mode 100644 cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-2.zip
 create mode 100644 cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-impacted-targets.txt

diff --git a/cli/src/main/kotlin/com/bazel_diff/di/Modules.kt b/cli/src/main/kotlin/com/bazel_diff/di/Modules.kt
index c9837fb2..af10e373 100644
--- a/cli/src/main/kotlin/com/bazel_diff/di/Modules.kt
+++ b/cli/src/main/kotlin/com/bazel_diff/di/Modules.kt
@@ -2,10 +2,7 @@ package com.bazel_diff.di
 
 import com.bazel_diff.bazel.BazelClient
 import com.bazel_diff.bazel.BazelQueryService
-import com.bazel_diff.hash.BuildGraphHasher
-import com.bazel_diff.hash.RuleHasher
-import com.bazel_diff.hash.SourceFileHasher
-import com.bazel_diff.hash.TargetHasher
+import com.bazel_diff.hash.*
 import com.bazel_diff.io.ContentHashProvider
 import com.bazel_diff.log.Logger
 import com.bazel_diff.log.StderrLogger
@@ -23,26 +20,36 @@ import java.nio.file.Paths
 
 @OptIn(ExperimentalCoroutinesApi::class)
 fun hasherModule(
-    workingDirectory: Path,
-    bazelPath: Path,
-    contentHashPath: File?,
-    startupOptions: List<String>,
-    commandOptions: List<String>,
-    cqueryOptions: List<String>,
-    useCquery: Boolean,
-    keepGoing: Boolean,
-    fineGrainedHashExternalRepos: Set<String>,
+        workingDirectory: Path,
+        bazelPath: Path,
+        contentHashPath: File?,
+        startupOptions: List<String>,
+        commandOptions: List<String>,
+        cqueryOptions: List<String>,
+        useCquery: Boolean,
+        keepGoing: Boolean,
+        fineGrainedHashExternalRepos: Set<String>,
 ): Module = module {
+    val result = runBlocking {
+        process(
+                bazelPath.toString(), "info", "output_base",
+                stdout = Redirect.CAPTURE,
+                workingDirectory = workingDirectory.toFile(),
+                stderr = Redirect.PRINT,
+                destroyForcibly = true,
+        )
+    }
+    val outputPath = Paths.get(result.output.single())
     val debug = System.getProperty("DEBUG", "false").equals("true")
     single {
         BazelQueryService(
-            workingDirectory,
-            bazelPath,
-            startupOptions,
-            commandOptions,
-            cqueryOptions,
-            keepGoing,
-            debug
+                workingDirectory,
+                bazelPath,
+                startupOptions,
+                commandOptions,
+                cqueryOptions,
+                keepGoing,
+                debug
         )
     }
     single { BazelClient(useCquery, fineGrainedHashExternalRepos) }
@@ -50,19 +57,9 @@ fun hasherModule(
     single { TargetHasher() }
     single { RuleHasher(useCquery, fineGrainedHashExternalRepos) }
     single { SourceFileHasher(fineGrainedHashExternalRepos) }
+    single { ExternalRepoResolver(workingDirectory, bazelPath, outputPath) }
     single(named("working-directory")) { workingDirectory }
-    single(named("output-base")) {
-        val result = runBlocking {
-            process(
-                bazelPath.toString(), "info", "output_base",
-                stdout = Redirect.CAPTURE,
-                workingDirectory = workingDirectory.toFile(),
-                stderr = Redirect.PRINT,
-                destroyForcibly = true,
-            )
-        }
-        Paths.get(result.output.single())
-    }
+    single(named("output-base")) { outputPath }
     single { ContentHashProvider(contentHashPath) }
 }
 
diff --git a/cli/src/main/kotlin/com/bazel_diff/hash/ExternalRepoResolver.kt b/cli/src/main/kotlin/com/bazel_diff/hash/ExternalRepoResolver.kt
new file mode 100644
index 00000000..376df046
--- /dev/null
+++ b/cli/src/main/kotlin/com/bazel_diff/hash/ExternalRepoResolver.kt
@@ -0,0 +1,47 @@
+package com.bazel_diff.hash
+
+import com.google.common.cache.CacheBuilder
+import com.google.common.cache.CacheLoader
+import org.koin.core.component.KoinComponent
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+
+class ExternalRepoResolver(
+        private val workingDirectory: Path,
+        private val bazelPath: Path,
+        private val outputBase: Path,
+) : KoinComponent {
+    private val externalRoot: Path by lazy {
+        outputBase.resolve("external")
+    }
+
+    private val cache = CacheBuilder.newBuilder().build(CacheLoader.from { repoName: String ->
+        val externalRepoRoot = externalRoot.resolve(repoName)
+        if (Files.exists(externalRepoRoot)) {
+            return@from externalRepoRoot
+        }
+        resolveBzlModPath(repoName)
+    })
+
+    fun resolveExternalRepoRoot(repoName: String): Path {
+        return cache.get(repoName)
+    }
+
+    private fun resolveBzlModPath(repoName: String): Path {
+        // Query result line should look something like "<exec root>/external/<canonical repo name>/some/bazel/target: <kind> <label>"
+        val queryResultLine = runProcessAndCaptureFirstLine(bazelPath.toString(), "query", "@$repoName//...", "--output", "location")
+        val path = Paths.get(queryResultLine.split(": ", limit = 2)[0])
+        val bzlModRelativePath = path.relativize(externalRoot).first()
+        return externalRoot.resolve(bzlModRelativePath)
+    }
+
+    private fun runProcessAndCaptureFirstLine(vararg command: String): String {
+        val process = ProcessBuilder(*command).directory(workingDirectory.toFile()).start()
+        process.inputStream.bufferedReader().use {
+            // read the first line and close the stream so that Bazel doesn't need to continue
+            // output all the query result.
+            return it.readLine()
+        }
+    }
+}
\ No newline at end of file
diff --git a/cli/src/main/kotlin/com/bazel_diff/hash/SourceFileHasher.kt b/cli/src/main/kotlin/com/bazel_diff/hash/SourceFileHasher.kt
index e9450f3f..1496473d 100644
--- a/cli/src/main/kotlin/com/bazel_diff/hash/SourceFileHasher.kt
+++ b/cli/src/main/kotlin/com/bazel_diff/hash/SourceFileHasher.kt
@@ -13,8 +13,8 @@ class SourceFileHasher : KoinComponent {
     private val workingDirectory: Path
     private val logger: Logger
     private val relativeFilenameToContentHash: Map<String, String>?
-    private val outputBase: Path
     private val fineGrainedHashExternalRepos: Set<String>
+    private val externalRepoResolver: ExternalRepoResolver
 
     init {
         val logger: Logger by inject()
@@ -26,16 +26,16 @@ class SourceFileHasher : KoinComponent {
         this.workingDirectory = workingDirectory
         val contentHashProvider: ContentHashProvider by inject()
         relativeFilenameToContentHash = contentHashProvider.filenameToHash
-        val outputBase: Path by inject(qualifier = named("output-base"))
-        this.outputBase = outputBase
         this.fineGrainedHashExternalRepos = fineGrainedHashExternalRepos
+        val externalRepoResolver: ExternalRepoResolver by inject()
+        this.externalRepoResolver = externalRepoResolver
     }
 
-    constructor(workingDirectory: Path, outputBase: Path, relativeFilenameToContentHash: Map<String, String>?, fineGrainedHashExternalRepos: Set<String> = emptySet()) {
+    constructor(workingDirectory: Path, relativeFilenameToContentHash: Map<String, String>?, externalRepoResolver: ExternalRepoResolver, fineGrainedHashExternalRepos: Set<String> = emptySet()) {
         this.workingDirectory = workingDirectory
-        this.outputBase = outputBase
         this.relativeFilenameToContentHash = relativeFilenameToContentHash
         this.fineGrainedHashExternalRepos = fineGrainedHashExternalRepos
+        this.externalRepoResolver = externalRepoResolver
     }
 
     fun digest(sourceFileTarget: BazelSourceFileTarget): ByteArray {
@@ -55,7 +55,8 @@ class SourceFileHasher : KoinComponent {
                     return@sha256
                 }
                 val relativePath = Paths.get(parts[1].removePrefix(":").replace(':', '/'))
-                outputBase.resolve("external/$repoName").resolve(relativePath)
+                val externalRepoRoot = externalRepoResolver.resolveExternalRepoRoot(repoName)
+                externalRepoRoot.resolve(relativePath)
             } else {
                 return@sha256
             }
diff --git a/cli/src/test/kotlin/com/bazel_diff/Modules.kt b/cli/src/test/kotlin/com/bazel_diff/Modules.kt
index 05a534a7..096a456e 100644
--- a/cli/src/test/kotlin/com/bazel_diff/Modules.kt
+++ b/cli/src/test/kotlin/com/bazel_diff/Modules.kt
@@ -1,10 +1,7 @@
 package com.bazel_diff
 
 import com.bazel_diff.bazel.BazelClient
-import com.bazel_diff.hash.BuildGraphHasher
-import com.bazel_diff.hash.RuleHasher
-import com.bazel_diff.hash.SourceFileHasher
-import com.bazel_diff.hash.TargetHasher
+import com.bazel_diff.hash.*
 import com.bazel_diff.io.ContentHashProvider
 import com.bazel_diff.log.Logger
 import com.google.gson.GsonBuilder
@@ -14,15 +11,18 @@ import org.koin.dsl.module
 import java.nio.file.Paths
 
 fun testModule(): Module = module {
+    val outputBase = Paths.get("output-base")
+    val workingDirectory = Paths.get("working-directory")
     single<Logger> { SilentLogger }
     single { BazelClient(false, emptySet()) }
     single { BuildGraphHasher(get()) }
     single { TargetHasher() }
     single { RuleHasher(false, emptySet()) }
+    single { ExternalRepoResolver(workingDirectory, Paths.get("bazel"), outputBase) }
     single { SourceFileHasher() }
     single { GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create() }
-    single(named("working-directory")) { Paths.get("working-directory") }
-    single(named("output-base")) { Paths.get("output-base") }
+    single(named("working-directory")) { workingDirectory }
+    single(named("output-base")) { outputBase }
     single { ContentHashProvider(null) }
 }
 
diff --git a/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt b/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt
index 3594bbf2..7dbfcad7 100644
--- a/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt
+++ b/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt
@@ -123,6 +123,62 @@ class E2ETest {
         assertThat(actual).isEqualTo(expected)
     }
 
+    @Test
+    fun testFineGrainedHashBzlMod() {
+        // The difference between these two snapshots is simply upgrading the Guava version.
+        // Following is the diff. (The diff on maven_install.json is omitted)
+        //
+        // diff --git a/MODULE.bazel b/MODULE.bazel
+        //         index 9a58823..3ffded3 100644
+        // --- a/MODULE.bazel
+        // +++ b/MODULE.bazel
+        // @@ -4,7 +4,7 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+        // maven.install(
+        //         artifacts = [
+        //             "junit:junit:4.12",
+        //             -        "com.google.guava:guava:31.1-jre",
+        //             +        "com.google.guava:guava:32.0.0-jre",
+        //         ],
+        //         lock_file = "//:maven_install.json",
+        //         repositories = [
+        //
+        // The project contains a single target that depends on Guava:
+        // //src/main/java/com/integration:guava-user
+        //
+        // So this target, its derived targets, and all other changed external targets should be
+        // the only impacted targets.
+        val projectA = extractFixtureProject("/fixture/fine-grained-hash-bzlmod-test-1.zip")
+        val projectB = extractFixtureProject("/fixture/fine-grained-hash-bzlmod-test-2.zip")
+
+        val workingDirectoryA = projectA
+        val workingDirectoryB = projectB
+        val bazelPath = "bazel"
+        val outputDir = temp.newFolder()
+        val from = File(outputDir, "starting_hashes.json")
+        val to = File(outputDir, "final_hashes.json")
+        val impactedTargetsOutput = File(outputDir, "impacted_targets.txt")
+
+        val cli = CommandLine(BazelDiff())
+        //From
+        cli.execute(
+                "generate-hashes", "-w", workingDirectoryA.absolutePath, "-b", bazelPath, "--fineGrainedHashExternalRepos", "bazel_diff_maven", from.absolutePath
+        )
+        //To
+        cli.execute(
+                "generate-hashes", "-w", workingDirectoryB.absolutePath, "-b", bazelPath, "--fineGrainedHashExternalRepos", "bazel_diff_maven", to.absolutePath
+        )
+        //Impacted targets
+        cli.execute(
+                "get-impacted-targets", "-sh", from.absolutePath, "-fh", to.absolutePath, "-o", impactedTargetsOutput.absolutePath
+        )
+
+        val actual: Set<String> = impactedTargetsOutput.readLines().filter { it.isNotBlank() }.toSet()
+        val expected: Set<String> =
+                javaClass.getResourceAsStream("/fixture/fine-grained-hash-bzlmod-test-impacted-targets.txt").use { it.bufferedReader().readLines().filter { it.isNotBlank() }.toSet() }
+
+        assertThat(actual).isEqualTo(expected)
+    }
+
     // TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
     @Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
     @Test
diff --git a/cli/src/test/kotlin/com/bazel_diff/hash/SourceFileHasherTest.kt b/cli/src/test/kotlin/com/bazel_diff/hash/SourceFileHasherTest.kt
index 8f670c76..1ec16950 100644
--- a/cli/src/test/kotlin/com/bazel_diff/hash/SourceFileHasherTest.kt
+++ b/cli/src/test/kotlin/com/bazel_diff/hash/SourceFileHasherTest.kt
@@ -15,12 +15,13 @@ import java.nio.file.Files
 import java.nio.file.Paths
 
 
-internal class SourceFileHasherTest: KoinTest {
+internal class SourceFileHasherTest : KoinTest {
     private val repoAbsolutePath = Paths.get("").toAbsolutePath()
     private val outputBasePath = Files.createTempDirectory("SourceFileHasherTest")
     private val fixtureFileTarget = "//cli/src/test/kotlin/com/bazel_diff/hash/fixture:foo.ts"
     private val fixtureFileContent: ByteArray
     private val seed = "seed".toByteArray()
+    private val externalRepoResolver = ExternalRepoResolver(repoAbsolutePath, Paths.get("bazel"), outputBasePath)
 
     init {
         val path = Paths.get("cli/src/test/kotlin/com/bazel_diff/hash/fixture/foo.ts")
@@ -35,7 +36,7 @@ internal class SourceFileHasherTest: KoinTest {
 
     @Test
     fun testHashConcreteFile() = runBlocking {
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, null)
+        val hasher = SourceFileHasher(repoAbsolutePath, null, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(fixtureFileTarget, seed)
         val actual = hasher.digest(bazelSourceFileTarget).toHexString()
         val expected = sha256 {
@@ -48,7 +49,7 @@ internal class SourceFileHasherTest: KoinTest {
 
     @Test
     fun testHashConcreteFileInExternalRepo() = runBlocking {
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, null, setOf("external_repo"))
+        val hasher = SourceFileHasher(repoAbsolutePath, null, externalRepoResolver, setOf("external_repo"))
         val externalRepoFilePath = outputBasePath.resolve("external/external_repo/path/to/my_file.txt")
         Files.createDirectories(externalRepoFilePath.parent)
         val externalRepoFileTarget = "@external_repo//path/to:my_file.txt"
@@ -66,7 +67,7 @@ internal class SourceFileHasherTest: KoinTest {
 
     @Test
     fun testSoftHashConcreteFile() = runBlocking {
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, null)
+        val hasher = SourceFileHasher(repoAbsolutePath, null, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(fixtureFileTarget, seed)
         val actual = hasher.softDigest(bazelSourceFileTarget)?.toHexString()
         val expected = sha256 {
@@ -79,7 +80,7 @@ internal class SourceFileHasherTest: KoinTest {
 
     @Test
     fun testSoftHashNonExistedFile() = runBlocking {
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, null)
+        val hasher = SourceFileHasher(repoAbsolutePath, null, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget("//i/do/not/exist", seed)
         val actual = hasher.softDigest(bazelSourceFileTarget)
         assertThat(actual).isNull()
@@ -88,7 +89,7 @@ internal class SourceFileHasherTest: KoinTest {
     @Test
     fun testSoftHashExternalTarget() = runBlocking {
         val target = "@bazel-diff//some:file"
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, null)
+        val hasher = SourceFileHasher(repoAbsolutePath, null, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(target, seed)
         val actual = hasher.softDigest(bazelSourceFileTarget)
         assertThat(actual).isNull()
@@ -97,7 +98,7 @@ internal class SourceFileHasherTest: KoinTest {
     @Test
     fun testHashNonExistedFile() = runBlocking {
         val target = "//i/do/not/exist"
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, null)
+        val hasher = SourceFileHasher(repoAbsolutePath, null, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(target, seed)
         val actual = hasher.digest(bazelSourceFileTarget).toHexString()
         val expected = sha256 {
@@ -110,7 +111,7 @@ internal class SourceFileHasherTest: KoinTest {
     @Test
     fun testHashExternalTarget() = runBlocking {
         val target = "@bazel-diff//some:file"
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, null)
+        val hasher = SourceFileHasher(repoAbsolutePath, null, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(target, seed)
         val actual = hasher.digest(bazelSourceFileTarget).toHexString()
         val expected = sha256 {}.toHexString()
@@ -120,7 +121,7 @@ internal class SourceFileHasherTest: KoinTest {
     @Test
     fun testHashWithProvidedContentHash() = runBlocking {
         val filenameToContentHash = hashMapOf("cli/src/test/kotlin/com/bazel_diff/hash/fixture/foo.ts" to "foo-content-hash")
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, filenameToContentHash)
+        val hasher = SourceFileHasher(repoAbsolutePath, filenameToContentHash, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(fixtureFileTarget, seed)
         val actual = hasher.digest(bazelSourceFileTarget).toHexString()
         val expected = sha256 {
@@ -134,7 +135,7 @@ internal class SourceFileHasherTest: KoinTest {
     @Test
     fun testHashWithProvidedContentHashButNotInKey() = runBlocking {
         val filenameToContentHash = hashMapOf("cli/src/test/kotlin/com/bazel_diff/hash/fixture/bar.ts" to "foo-content-hash")
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, filenameToContentHash)
+        val hasher = SourceFileHasher(repoAbsolutePath, filenameToContentHash, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(fixtureFileTarget, seed)
         val actual = hasher.digest(bazelSourceFileTarget).toHexString()
         val expected = sha256 {
@@ -149,7 +150,7 @@ internal class SourceFileHasherTest: KoinTest {
     fun testHashWithProvidedContentHashWithLeadingColon() = runBlocking {
         val targetName = "//:cli/src/test/kotlin/com/bazel_diff/hash/fixture/bar.ts"
         val filenameToContentHash = hashMapOf("cli/src/test/kotlin/com/bazel_diff/hash/fixture/bar.ts" to "foo-content-hash")
-        val hasher = SourceFileHasher(repoAbsolutePath, outputBasePath, filenameToContentHash)
+        val hasher = SourceFileHasher(repoAbsolutePath, filenameToContentHash, externalRepoResolver)
         val bazelSourceFileTarget = BazelSourceFileTarget(targetName, seed)
         val actual = hasher.digest(bazelSourceFileTarget).toHexString()
         val expected = sha256 {
diff --git a/cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-1.zip b/cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..f96c205f526ba259c7c96ee2de19d0ee60c37ffe
GIT binary patch
literal 8168
zcmb7J2RN1O8$b5mLdu@WIQE{IAv?0q;n?#W<JcJy*%D>TPO?)*WM;3jDk8}WSt0z-
z`F!%l_f`MrT+j8sm+QHI&vXCo;l7_&Qxy#z7l0f~UiJnLB%&Y}5bwx|4Zs0#gF)U9
z2dIUfE(QR_H)sW7;q2(>>_pGS<=|{#Z)NKMF>`dbgh)DDS>bB_jfDLd(h|hRjvav_
zh?uxYBx_qYTWcq0DC7s0>eb?_Jp<~U-7{BFEBMy0Y7gBZRpna;G4ABDXkJ&bb5*(K
z@6AgII0imCA_DKnz(4@Y>8Ys6|G+$6dvu6zem3SG5vwCn004Z%T6GP1JvD_RrGAJ&
zG@G27>GA95E)(bLc6JY{i^~@cA11TP^RY3ph@g_H@9$zN8`-WmVZN{M@_+n1J8n`W
z>AHHywaD7m%%mAHmG1<fi}~unm&KmEQv8l)x|7AuS_Q7-p(Ptotot~3xGX0?6cn~a
zJ-0U8(4%s$a#Qxa4uu2WY|s}y%I`w^{PitUGhlZcsDIdQ$0N2k1L$Z2=ER{2kBeUI
zJPzH3xYg*qfbtHTSUyo7_aIAR?l3`(Oke8t6iFBfOl^}k^p{KaW0JQVj`gG$zU?L^
z^+KF{AiaZwOt(yE@A01Ldm3N3E7~zFM-*b*X@qhjXhBXK#7|#CTUAF>_KLy}PCT8V
z_AnQa1%%xR<Ordcq-Xrg5zH)Yt*p#!o!lVSP>`FgvlHVb+#hy7!sa%8gQAYWMNSq3
z_Fr;bR<=$ME`$u?Vaa6!g4u9^y&Vvq!{r8nxpDFS*q6rzYU=@VgYbBOpgeAlE<9#O
z`?^^}oUC~)M1%xHMIja-UOpiKevp-bB@k!<vb3<U5(ZlWMZi1|IK%?#?Ci#4=7`wp
zSm`5Q2;e7I(8LD-@+1HNQpCX=K^_n%gf1{Qkb?ua9n9J3$0=Hk7M<UU5FWmN0Uqd!
zx~%%uz5!!osY>RlWaT`H&z)u&BD?Gsi@x1B*4oj-eVe`^e*X^H6+#8l=I>gJmm+d(
zHv9CY_cy$s)g5^3?W_oAI5ikgzOOSn`2Jz0=j*$<+5EnzU1m}*_Ey)QbWLp2H8@Qk
zLigt<Hrr!fG?;$h*xlOiNlIbSmhv-gsBNe>^*`8H8<~C4;J5c}x5s0ODC1yl*~4pp
zcB{E>B%pTxxo^P!rX;jY_TnILV~22S_S52A%wbC*Pwd?goS1OBO65dr)~X^y3e8Wp
zCSwv;x-*pR!tI?C=N^$uut(I5l6zs^*>W9|;!(Ian`l$hiLsfibb;kl`A&n9;igOH
zo>;|e@Lr0KzxeyHS}O|l!`GcW5uMaoMdkW-TKdnn*$1g9dS>+Y;O=~Tfp|Ne;#zMO
zhxDT)vTfvnneMU5j9#Q+5w3P}424@3b_G*_a4q`6h?@&CcCA$rawVjlq}=R7OPfwD
zFWxU%`-Eh_rQWMrQJ|e<^w`j$(Jg7>7aA%zO}w*LZqDp-P8|12Rw2DsH$K4(J5FK5
zt>_w5&4|{ZHa=dGbGiv4fGN&<T1))OHpSr)img_(V<j!6qmTIdD0+DG0|iy%Ls<PU
zqEo|33ql^<u3+DQa9U0&W%1E7_m5Hr#>%%7+tUK6scA?sAEN5;Y{kn4=9|18TNu_S
zb)VAx+K){d!W&bmQA5a1pv!5o%5aY%mmxtVXmNh#jtp^z0w1bimVB*AXr;mHX)Vsk
zQd^Uonz&c3%Wl!_d`9H}8`~EtbTdv360tCkyF_xm#13zG>6dj2B-N2@9~^^&mzen>
zB!;XnBlh|JGACDlre3yYP6(<h{(<s+m*z-P5b@2e;ErSw(lQ{4p>dctdc1rDo?OU9
zPshpiCtvVfNWK*Xm0x}AMqzC3vYM;mmYJ+6A!jeF82yZIFh-Do5xc)!ikO6%RgvHd
zVcr<}XQ18NRvHWq#~ZS&mbiH({aVJ5B>a(#Qe{}@ZDJd9oHiR^Bo)o>-TU$+3RRJ4
z>LIA=x3Bu%m#^VeR#k+wr)9uD;=V~)*uf31f_Fb|7-uVZv{L=NcKmrqEOc8SY1^)B
ze?1<kG0=WKA~H1E@*%MvI`Fgo)w|k!_ygOn`k7r=S-5D|03&@PHO9nHk|^=Sl``2^
zkFra?P%JxJOTWCSp4=kBNFNObD=U+i+`5Lk;hg7pKKW)FvtlhCF5@tx7N|S9PnZ1L
zT1fGMmxJ`HmnDpC>exvPGZJcU9RzJI5cKAxppd|LstmAfB(H2H5S1?@RvC=`^~&QQ
z8%BHD%YhFg&+Df9mdLy@l;(Mm|7dGKbYF9dN<0Xt0vN)vN&}4O%THOfDJ?1_C*_cX
z<QUb`lA{@8smbg}%h+)@a?}ecpW*njT#pr<5Cw~U(hj{j1`Njuq0#}4;5~?qz2C@Y
zkcuv#&7hdj(oS;`uY2t-XqW*7^WhkHuC-IgGm|zGc*~%9yAE!!WNN%`dT01q37-@N
zTcD;cFwzIN!av*QB`~1PAdy`cmxVc!nZ8C_-Ly4;W0;gNxF8%AgM}?Aeloo3CG@G`
z5*@Ikro9p9fNDC8#_jzQUaZcHO>I<~jHk94_@RalEfOc$ZziNQ>o$6f&6LFrs%AKT
z-EESnx<zBjQ4X`EgWmWzN+^Lv#CT#9n1+KPu)Gir!RF}*k~AvXJ%4$Y1#o3saG>Jl
zy}B}ZcS{R}<(x`=9OXkEOU-epD;#<*378flzaVpy0sjgonhN#@spbdGL^6tTFQ?Hj
zv-f&kY-g|`6X=Ws7?`&)wJFrt+}gh;sZ~PxZH6;PNQGQpV(nSuU<P#*13?$$RUomN
zn?z$gxdxiSzQxyAlu)ZUV&Vr%?0m6nobc7r=JQI;n0y5H%liYm=kIB}SXN3Cldqdc
z5z}q*bMS-A0l#E_{~S!nwvOg4hF{eYQ2WODP`b-;<jXB9k)CepMxl3xIen}{?F)z1
zfu;peEbr&*;?<w8i@iwuik}lrxToA96)9*?P<LN$i6gj#RT9PX@*qQ~Lx{IbZ_-nh
zw*5@c*=S3mbeCpfhF+s)v8MqyJ?7Z6N*SvH1lGX)wph=Zu?klP{L<?lUS%tBQ*6rO
z)1y>q@1)EW)CC(S54~5)STodq(#+J9^7b4-ht)aqu|hK<28r-I*AOpvh)F1CV@@Uq
zmgUY~2Rxzq?zz0Xo0(;4yFz|=E|#g49?~1bI&EY<UebBe1H~f+juzh&0%Po#VmsTE
z(zT&j3E4}Ny=)t<eG@2&jichY9Yaltld_q*V16-diR?s6$)dp`;*?rm0EN%YhMi<l
zQBQk;y;f9obe4Z)-KC}R>sus>?iVK%_e%sZ{iyq&KCig-{&u$amQa=2V-9<Zr6Hoi
zifeu^?Hh%RL~HtJ7tRx_^NQN#!qU0i36<6<A8p#^yK6O}Kxv7#IImF9Ee39m`Qa_0
zhb2*l`cxU-R#ku9Ao6K<J^PLLu<Kk%b}t`$@8oq6ZO7VHEseOE4ENx~R_Z8k)AOc-
zyvcf{op^Y&%x+xith}G|+zr)Zs`Oyg`tJf$Tzt$m&@-ml7kgN%&<2ymblyE*P`;3|
zVBj?@^cpRgPR2eCL{i(pev`-iTwZ#38Sc0Gwt4{+>gq#LOnZNV8L=;M3TazBuQAG7
zB*zve@aTqMF4600uxqxF4#Msnq4!`|&2UhZ9$6^~i6Un;mU&*&evHt3I#slc#AO4n
zqPowDDRELRha?VDZ)dB*9@je)2CV`_W$Z-5Zc~#ffP_uZ2<5zqc$#fG76i$AT`ZbZ
z`aey<l4==XQG|RB)jAHFzJ{}DAJX~Ds_lZ7a-a358IKb+zjaWP%3eHAxNT`yap^<!
zYWY2mbNS0pxPwic2R)QxxYa3V!;3hIiyz7I_O5Lvs6S@M+~38Yl%%;PM`OH}iiguv
z2xq<c^t!D+jBU)725*k?tAz@I0jzNBd+h_)2CoNlL{|=My<sy(&4z?4l|EXL7=<)m
z`t=0fUufTqD!NTnn@n+Y5yT05r4tT3up7A^>{QF-Gkz~+O=YX2_?iww8m5A$SLLN*
z%*}B$I!D_yo!$?srUBDyz2jbf^Z6P{y>GcQX2cx3VXFtNQbS%z?*?TlSo+5{g}Clk
zP_1ubE}Im0z2=k}%BjAA?-j^>qesVH&j^?&y3=D`?w{Jz`a)R@|K+Mc3<?uyLctNO
zowGNO)iJt(KY7qtvb#yRBu!Sdi|A{$TO-&DvoEhhm}pfZEVuDCuxmK%n@AGQhB28g
zs=oE7K>_!Q3Fg{r1`5*L#f!BbqwmLLp1RMb&U^TA>a)G$&#JE|2Vf+BdFL^BkE~0u
zSaPm#q}md9^y4ifmr<yrw7tmGngo;Dg8<Ja+6->#`6yHO&-+EM(;N=p*x%Sy*?(u7
z#AD8u{AIK@X<3O}E#OK^_o$wqf5W^C?r59X#64ZyUC?Tdd4=Pgr}!jVW);_BIjolo
zFrBlI#Szln^0^#MX&%SL3}zp}GHI?JXy3lFx3ilD(pX-ZP1P}ZlTUZ&$x5H<oTxE8
zR{hcXRwzGz`ZRY66WQC8O4G4*Bb+1&ac8%XO?TF|^KJFtNn`G>zVccnEn@Ad;qcnR
zD5HF&RsY(~g^9*RN!SDPnp3?LEmoY*gMoUHr!*m@YWWGhRu%2OoO~OAiIpjSOefo9
zPc|w=a1TmF{TOUutG02|lN$?^J}N**#zR;zqt-KW6NmFlklw(v;$gfA);(M6<z+9z
zEMwym`LVpDhGM%*`MDF#5^;%>`K=O-f>c`hi5HTBwQDsD_h`erZr5jUg$;OQ=6%kN
z&i#b$EhfD!H(<Za2`?*3d4FxOaj0wT!#lmu;OdJ+j7&y8U?t&zy-N?h$_lTGbKTdO
zE*Og0^R~|Awi`USQ<xUNp$s3|^G>o}gAcjgya=orbBi-tzD-jzD{`|vVzZK0D#*Cd
zhwUvU?o*U5G1yC!wqT~xmWw7$MfoYO>l1y-<cf9)%O?iw=+ibXJ#Bt5K6%SN+iRj}
z@oj$nqayWZ@V)A+-DG)M6#H55X0>0obHHak<vG<{YvEVB^oI!-YMZxp_MG7OGycOp
zlYvG!Sl%o9{d7L_&^Gm<KpnUl`eJ(0-gXa|UD?FgMzZGnd;q=g{=yUeLzLr2<ZJ_r
zj%Y++Pz#<Pt;c^aMK)^4rO3|aPu3IubG;qN1N0|C$j0c$CVvSb8vZ{Kr2SXHe{_mx
zL5|uoG2YhabBJDX6w#tH{TAfsX8&<)k6kkmzkS6kVoC>B-H(XedlBt!njEi3F%>}o
zxj12^hV<B&0U;!Ro}P1_?MA>Dy?Z-1uaWY!PD%XwG!_9&tS|}EelIbkv>-cD!^7r*
z-&;Yh`$>f3u&%qlfy;uuuo!<7ve}@f?Ur&244qWcz&6a+QA^eG8=r7#vGLb*F)Q{!
zSM=2i`lr9<gvPlZq)^e`xRE;Q$0R7x*<Xg)ik%lzlkoWwwG>9XC*IoKM7#$AL{BqD
zwu1z|YTRPgDeS|UHc}YTKFC}+w0$=GFaoOk;UjMPdf)~&Sx_1Mf?Ud^>NnJ5pEx3{
ztOHLKh9K-7VsieLFeP_{<@I0?C^yoYKio_`s)+!V7a#qwknvm%3a*T@@1;iT8*!rI
zQmuq^@+%+VYw2lYXtwQbiMsTdvQTDx!i-=M8E@!?<mvq|g4|{@GwhFB8a%nTX{5^2
zGoK01!Yovo^&wYl?)S8)?{LSdihRnGTcl=Ma4%V4f)8)!`~C=mBQ5Z$3ADTr8azQv
zzTax0;|8^LvQ~mPK@ist&Zl+h<|TXy#K-8D%r6ydipO&UPXkgL4X#6M(mFj1G*_;T
zyG=Qptt>uKc21?TxwoV!I?8mxr%-X}h5(!o|C0A=Q1;F(x^CTj0W>;>i!cg1jn9NJ
zz=8SR&Yn9>!m?eW^VpV=P4&hlbCxl#x;j)&??TsNxg6)Qj_q<btl5975zHNoxc+c=
zfc#fnbb6{+-a(Mlj+k8k2i(sQq8{0V+e}X^zv6#uNk#ScwoKMxzXdiZO32_%jtxGu
znVDdi2O-|Nm4}T2(-aBmm`H=GQf}vRq+jdx40M7pR7I$mxrhwk)(XbV4Lt9zm5b>r
zd#^uo*>J>wBJTH9+6^>6=E?weTz>1q4Kh<Ffg6*O>H>{(-zntNJX>bh(_FxMt}*zL
zl`7fN?3k@1``_74ozO?9=8Bj?|A%@y$GrXQ&wAZW1UKpN0gVCq=0V(3RM#}^uN2AP
zU`V&U6J(Y0HG?L?^VtIvvW45Y-<O3?*l<Q0K5tPpd0dyOg6HH$Tt53Enq@*PUJc;R
zsj?&bO0t_SglsD4!tt5US{Qlrh`hTxYreB<k=LJpt^Lz1j7;4p0)Lo+sm}=gLG~qm
z1iU(nFhLI@`_laq;Ag*z((EdF2_$~EeYvx^$e@D9*u_(N>Ujcb-g2dUd^mGqrkQj6
z?l_$HP9T5kh`iB7j?rf~5|Wf89unIMp+)&mm<T#tRmLmSo9j187l|b*<%nP_h~Se_
zyfUkSLu0Bk5=`B0=$iQoq<L>qexvl2t}sk9^rH+L9SfGt0m*A#x^ac%(j~!N=3qbh
zfTm07{^6Id76(sjExq4ebP}~vSu4>vNT@b(zqu*2BU|gOS6a*ySL(^n)z!{$J_k!q
zo)V<#dZ0I8#Pps~n&vx4oQcPMRx)*J2{OEai`Lg=KjGXTYfEuHw*HaFhCd|2=|)gh
zfuIVRv3@qtKe^UL_{A?XR#Ysn6XO4tf@hjs2eaoCMkH#_Fq#0RIk}uBSe09a<w|U=
zQnX3Fi`ZSVHR;L2Aj}Omd`mw{+0o#5cAyIPk_tU*Zesy&{wuNR^G$OHPlu?<_82M*
z2RPs<qK#!a1*PX0uETxOzdy98^ogAB<NKx^eaTllo5Rv6ASffZmf8d_tbAp`!Z(c3
zWB7VbJ+;xCMJ4S7ekx4Dz^~r3M=i3V7q@H6iOl3pgZ(&0YkS60O{@|7s#<}7Rtd^3
z_h|Tp0~=(h`+LvZZW>Kh6jbC5KXUxr7X;+r5sdvk&U{Ze5kF%2^k)O4+>!WI#M{4o
zL^uIB8+gbdJpp)#c>URnPh^iaKmEDjM79s{`mY}kP9To9KYg`+0`Uo<#@UN@q&y|s
z34N!p&yVE~v*Zvo|9_Y1CuciS@AM7$F*X1&fx!O7efSB`S&oqv?9m`bJS>R-r|a3D
z-Q(}Ie?5>D?a@Gr#{4aMy1xByd1RVAk$>?|`O}&9zd?`{?+M7p8IV)i_rHOV74QiV
z7eb}8h4eqO#E)9+gxw=Eovw(HphqD9{VnLP{rhz3c!K<p<afvYk3#bF;ZN6fCtKK(
z{%(t3=FF3g&iWv-+&UUaM-nId-A4afd>vc%$Oxy)uM<5Y{tx(Ho8xp1bh3vn`Jb!s
z9~IHB_&Uyu005FNnsb0NrOYuIXSqfeGe-j{t8y&+=K=R~)O!B}@W;W1EOt&#@#GB1
z9|hX!;s*(M6lklz1pKvCPuB@2s23>zCi*Y3kh=c!n7^$WG*vM$kziDapB)weAVUQJ
uumgmwg!p(t0wRLK{8m;%5D_b|l?5LVECdk*3GoREK|o+pVGut*-~Ryn&pA2(

literal 0
HcmV?d00001

diff --git a/cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-2.zip b/cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-2.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d1d025c579edd46960622244b8eac90dd36b1294
GIT binary patch
literal 8216
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

literal 0
HcmV?d00001

diff --git a/cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-impacted-targets.txt b/cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-impacted-targets.txt
new file mode 100644
index 00000000..e97f553f
--- /dev/null
+++ b/cli/src/test/resources/fixture/fine-grained-hash-bzlmod-test-impacted-targets.txt
@@ -0,0 +1,23 @@
+//src/main/java/com/integration:guava-user
+//src/main/java/com/integration:libguava-user-src.jar
+//src/main/java/com/integration:libguava-user.jar
+@bazel_diff_maven//:com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar
+@bazel_diff_maven//:com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar
+@bazel_diff_maven//:com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar
+@bazel_diff_maven//:com_google_errorprone_error_prone_annotations
+@bazel_diff_maven//:com_google_errorprone_error_prone_annotations_2_18_0
+@bazel_diff_maven//:com_google_errorprone_error_prone_annotations_2_18_0_extension
+@bazel_diff_maven//:com_google_guava_guava
+@bazel_diff_maven//:com_google_guava_guava_32_0_0_jre
+@bazel_diff_maven//:com_google_guava_guava_32_0_0_jre_extension
+@bazel_diff_maven//:com_google_guava_guava_testlib
+@bazel_diff_maven//:com_google_guava_guava_testlib_31_1_jre
+@bazel_diff_maven//:com_google_j2objc_j2objc_annotations
+@bazel_diff_maven//:com_google_j2objc_j2objc_annotations_2_8
+@bazel_diff_maven//:com_google_j2objc_j2objc_annotations_2_8_extension
+@bazel_diff_maven//:com_google_truth_truth
+@bazel_diff_maven//:com_google_truth_truth_1_1_2
+@bazel_diff_maven//:org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar
+@bazel_diff_maven//:org_checkerframework_checker_qual
+@bazel_diff_maven//:org_checkerframework_checker_qual_3_33_0
+@bazel_diff_maven//:org_checkerframework_checker_qual_3_33_0_extension
\ No newline at end of file