Implement the new artifacts hashing algorithm #1280
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shs96c
force-pushed
the
new-artifacts-hash
branch
from
4bf9b05 to
1526bbe
Compare
shs96c
force-pushed
the
new-artifacts-hash
branch
2 times, most recently
from
375945f to
c0b40e3
Compare
shs96c
force-pushed
the
new-artifacts-hash
branch
from
c0b40e3 to
26571a7
Compare
jin
approved these changes
Dec 5, 2024
| @@ -57,17 +57,30 @@ def unpack_coordinates(coords): | |||
| def _is_version_number(part): | |||
| return part[0].isdigit() | |||
|
|
|||
| def _unpack_if_necssary(coords): | |||
| @@ -45,7 +45,7 @@ public void shouldRenderAggregatingJarsAsJarWithNullShasum() { | |||
| Set.of(), | |||
| new TreeMap<>()); | |||
|
|
|||
| Map<String, Object> rendered = new V2LockFile(repos, Set.of(aggregator), Set.of()).render(); | |||
| import java.util.TreeSet; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class ArtifactsHash { |
| for (DependencyInfo info : infos) { | ||
| StringBuilder line = new StringBuilder(); | ||
| line.append(info.getCoordinates().toString()) | ||
| .append(" | ") |
| // utility class | ||
| } | ||
|
|
||
| public static int calculateArtifactsHash(Collection<DependencyInfo> infos) { |
There was a problem hiding this comment.
Does this format/spec need to be versioned?
| } | ||
|
|
||
| groupId = Objects.requireNonNull(parts[0]); | ||
| artifactId = Objects.requireNonNull(parts[1]); | ||
|
|
||
| boolean isGradle = | ||
| coordinates.contains("@") |
There was a problem hiding this comment.
can non-gradle coordinates contain @?
| } | ||
|
|
||
| groupId = Objects.requireNonNull(parts[0]); | ||
| artifactId = Objects.requireNonNull(parts[1]); | ||
|
|
||
| boolean isGradle = |
There was a problem hiding this comment.
Please document this constructor formally on what formats are accepted. It's getting a bit harder to understand this code, and AFAIUC, we are trying to use this to canonicalize the format, so some documentation will be useful.
| artifacts = _get_artifacts(lock_file_contents) | ||
|
|
||
| for artifact in artifacts: | ||
| line = "%s | %s | " % (to_external_form(artifact["coordinates"]), artifact["sha256"] if artifact["sha256"] else "") |
There was a problem hiding this comment.
Probably want to mention that the format should also be updated in tandem with ArtifactsHash.java.
|
Also please update the PR description with more details on why this is happening. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.