GradleInspector: Ignore artifacts of zero byte size #8305
Merged
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
This simplifies an upcoming change. Signed-off-by: Frank Viernau <[email protected]>
sschuberth
requested changes
Feb 19, 2024
| @@ -87,6 +87,11 @@ private val GRADLE_USER_HOME = Os.env["GRADLE_USER_HOME"]?.let { File(it) } ?: O | |||
| */ | |||
| const val OPTION_GRADLE_VERSION = "gradleVersion" | |||
|
|
|||
| /** | |||
There was a problem hiding this comment.
Commit message nits:
- Should we say "Maven" instead of "Gradle" artifacts?
- Typo in "rot" -> "root".
| /** | ||
| * The sha1 sum for a zero by size file. | ||
| */ | ||
| private const val ZERO_BYTES_FILE_SHA1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709" |
There was a problem hiding this comment.
We already have this as EMPTY_PACKAGE_VERIFICATION_CODE. How about refactoring that first to a constant in HashAlgorithm?
There was a problem hiding this comment.
EMPTY_PACKAGE_VERIFICATION_CODE is in spdx-utils and does not know about the HashAlgorithm class. What do you think?
There was a problem hiding this comment.
It's only used in UtilsTest which could add the model as a dependency. I'll propose a follow-up refactoring.
| @@ -371,7 +376,11 @@ private fun createRemoteArtifact( | |||
| val checksum = okHttpClient.downloadText("$artifactUrl.$algorithm") | |||
| .getOrElse { return RemoteArtifact.EMPTY } | |||
|
|
|||
| return RemoteArtifact(artifactUrl, parseChecksum(checksum, algorithm)) | |||
| // Ignore file with zero byte size, because it cannot be a valid archive. | |||
| val hash = parseChecksum(checksum, algorithm).takeIf { it.value != ZERO_BYTES_FILE_SHA1 } | |||
There was a problem hiding this comment.
Nit: Do better document the expected default, consider takeUnless { it == ZERO_BYTES_FILE_SHA1 }.
Maven artifacts are archive files. A file with zero bytes size never is a valid archive, so fallback to `RemoteArtifact.EMPTY` in that case. This fixes one possible root cause of #8116. Signed-off-by: Frank Viernau <[email protected]>
fviernau
force-pushed
the
gradle-inspector-ignore-zero-byte-archives
branch
from
6849f66 to
769f34d
Compare
sschuberth
approved these changes
Feb 19, 2024
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.
See individual commits.