Skip to content

fix: disallow target depending on itself #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2022
Merged

fix: disallow target depending on itself #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/src/main/kotlin/com/bazel_diff/hash/RuleHasher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class RuleHasher : KoinComponent {
inputRule == null && sourceDigests.containsKey(ruleInput) -> {
safePutBytes(sourceDigests[ruleInput])
}
inputRule?.name != null && inputRule.name != rule.name -> {
inputRule?.name != null -> {
val ruleInputHash = digest(
inputRule,
allRulesMap,
Expand Down
19 changes: 0 additions & 19 deletions cli/src/test/kotlin/com/bazel_diff/hash/BuildGraphHasherTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,25 +114,6 @@ class BuildGraphHasherTest : KoinTest {
)
}

@Test
fun testCyclicRuleInput() = runBlocking {
val ruleInputs = listOf("rule1", "rule4")
val rule3 = createRuleTarget("rule3", ruleInputs, "digest")
val rule4 = createRuleTarget("rule4", ruleInputs, "digest2")
defaultTargets.add(rule3)
defaultTargets.add(rule4)

whenever(bazelClientMock.queryAllTargets()).thenReturn(defaultTargets)
whenever(bazelClientMock.queryAllSourcefileTargets()).thenReturn(emptyList())
val hash = hasher.hashAllBazelTargetsAndSourcefiles()
assertThat(hash).containsOnly(
"rule1" to "2c963f7c06bc1cead7e3b4759e1472383d4469fc3238dc42f8848190887b4775",
"rule2" to "bdc1abd0a07103cea34199a9c0d1020619136ff90fb88dcc3a8f873c811c1fe9",
"rule3" to "ca2f970a5a5a18730d7633cc32b48b1d94679f4ccaea56c4924e1f9913bd9cb5",
"rule4" to "bf15e616e870aaacb02493ea0b8e90c6c750c266fa26375e22b30b78954ee523",
)
}

@Test
fun testCircularDependency() = runBlocking {
val rule3 = createRuleTarget("rule3", listOf("rule2", "rule4"), "digest3")
Expand Down