[internal] Inline ValidatedJvmToolLockfileRequest into ToolClasspathRequest
#14241
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
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
chrisjrn
approved these changes
Jan 24, 2022
| GenerateJvmLockfileFromTool, | ||
| ValidatedJvmToolLockfileRequest, | ||
| ) | ||
| from pants.jvm.resolve.common import ArtifactRequirements, Coordinate, GatherJvmCoordinatesRequest |
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust]
[ci skip-rust] [ci skip-build-wheels]
Merged
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.
To consume a tool lockfile, we before would:
ValidatedJvmToolLockfileRequest, which only works if it's aJvmToolBaseGenerateJvmLockfile -> CoursierResolvedLockfilerule, which we used withscalac_plugins.pyToolClasspathRequest -> ToolClasspathThe rule in 1.2 was not using the validation added in #14185, and it was generally confusing to have two code paths.
This unifies everything by having
ToolClasspathRequest -> ToolClasspathnow handle reading, validating, and then fetching the lockfile.Reading and validating a lockfile requires the same metadata we need for generating a lockfile with
generate-lockfilesviaGenerateJvmLockfile. So, we reuse that type for the sake of DRY.