Skip to content

fix: handle skipped artifacts in calculateArtifactHash to prevent NPE #1547

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

Open
tharakadesilva wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: handle skipped artifacts in calculateArtifactHash to prevent NPE #1547

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
6 changes: 4 additions & 2 deletions private/rules/v3_lock_file.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,12 @@ def _compute_lock_file_hash_v3(lock_file_contents):

for repo, artifacts in lock_file_contents["repositories"].items():
for artifact in artifacts:
all_infos[artifact]["repository"] = repo
if artifact in all_infos:
all_infos[artifact]["repository"] = repo

for dep, dep_info in lock_file_contents["dependencies"].items():
all_infos[dep]["dependencies"] = sorted(dep_info)
if dep in all_infos:
all_infos[dep]["dependencies"] = sorted(dep_info)

return _compute_final_hash(all_infos)

Expand Down
10 changes: 8 additions & 2 deletions private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/cmd/AbstractMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,20 @@ public static Map<String, Integer> calculateArtifactHash(Map<String, Object> ren
for (Map.Entry<String, Iterable<String>> repo : repositories.entrySet()) {
Iterable<String> repoArtifacts = repo.getValue();
for (String art : repoArtifacts) {
allInfos.get(art).put("repository", repo.getKey());
Map<String, Object> info = allInfos.get(art);
if (info != null) {
info.put("repository", repo.getKey());
}
}
}

Map<String, Set<String>> dependencies =
sortMapRecursively((Map<?, ?>) rendered.get("dependencies"));
for (Map.Entry<String, Set<String>> dep : dependencies.entrySet()) {
allInfos.get(dep.getKey()).put("dependencies", dep.getValue());
Map<String, Object> info = allInfos.get(dep.getKey());
if (info != null) {
info.put("dependencies", dep.getValue());
}
}

Map<String, Integer> finalHash = new TreeMap<>();
Expand Down
63 changes: 63 additions & 0 deletions tests/com/github/bazelbuild/rules_jvm_external/resolver/lockfile/V3LockFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import com.github.bazelbuild.rules_jvm_external.Coordinates;
import com.github.bazelbuild.rules_jvm_external.resolver.Conflict;
Expand Down Expand Up @@ -252,6 +253,68 @@ public void testCalculateArtifactHashMatchesStoredHash() throws IOException {
}
}

@Test
@SuppressWarnings("unchecked")
public void calculateArtifactHashShouldHandleSkippedArtifacts() {
Coordinates mainCoords = new Coordinates("com.example:item:1.0.0");
Coordinates depCoords = new Coordinates("com.example:dep:1.0.0");
Coordinates sourcesCoords = mainCoords.setClassifier("sources");
String sourcesKey = sourcesCoords.asKey();

DependencyInfo dep =
new DependencyInfo(
depCoords,
repos,
Optional.empty(),
Optional.of("deadbeef"),
Set.of(),
Set.of(),
Set.of(),
new TreeMap<>());

DependencyInfo mainJar =
new DependencyInfo(
mainCoords,
repos,
Optional.empty(),
Optional.of("cafebabe"),
Set.of(depCoords),
Set.of(),
Set.of(),
new TreeMap<>());

DependencyInfo skippedSources =
new DependencyInfo(
sourcesCoords,
repos,
Optional.empty(),
Optional.empty(),
Set.of(depCoords),
Set.of(),
Set.of(),
new TreeMap<>());

Map<String, Object> rendered =
new V3LockFile(repos, Set.of(mainJar, dep, skippedSources), Set.of(), true).render();

Set<String> skipped = (Set<String>) rendered.get("skipped");
assertTrue("sources artifact should be skipped", skipped.contains(sourcesKey));

Map<String, Set<String>> renderedRepos =
(Map<String, Set<String>>) rendered.get("repositories");
boolean foundInRepos =
renderedRepos.values().stream().anyMatch(arts -> arts.contains(sourcesKey));
assertTrue("skipped artifact should still appear in repositories", foundInRepos);

Map<String, Set<String>> renderedDeps =
(Map<String, Set<String>>) rendered.get("dependencies");
assertTrue(
"skipped artifact should still appear in dependencies",
renderedDeps.containsKey(sourcesKey));

AbstractMain.calculateArtifactHash(rendered);
}

private V3LockFile roundTrip(V3LockFile lockFile) {
Map<String, Object> rendered = lockFile.render();
String converted =
Expand Down