[internal] Refactor JVM artifact mapping code #13905
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
# 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]
# 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]
Eric-Arellano
commented
Dec 16, 2021
| """Maps JVM unversioned coordinates to target `Address`es and declared packages.""" | ||
|
|
||
| artifacts: FrozenDict[UnversionedCoordinate, tuple[tuple[Address, ...], tuple[str, ...]]] | ||
|
|
||
| def addresses_for_coordinates( |
| @@ -156,42 +142,57 @@ def find_all_jvm_provides_fields(targets: AllTargets) -> AllJvmTypeProvidingTarg | |||
| class ThirdPartyPackageToArtifactMapping: | |||
| mapping_root: FrozenTrieNode | |||
|
|
|||
| def addresses_for_symbol(self, symbol: str) -> FrozenOrderedSet[Address]: | |||
There was a problem hiding this comment.
Simply converted into a method rather than free function. Only line 147 changed
Comment on lines
-168
to
-178
| group = tgt[JvmArtifactGroupField].value | ||
| if not group: | ||
| raise ValueError( | ||
| f"The {JvmArtifactGroupField.alias} field of target {tgt.address} must be set." | ||
| ) | ||
|
|
||
| artifact = tgt[JvmArtifactArtifactField].value | ||
| if not artifact: | ||
| raise ValueError( | ||
| f"The {JvmArtifactArtifactField.alias} field of target {tgt.address} must be set." | ||
| ) |
There was a problem hiding this comment.
The Target API already validates that these are set.
Comment on lines
-71
to
-72
| # TODO: error if no resolves for the target. Wait to change until we automatically set a | ||
| # default resolve. |
There was a problem hiding this comment.
Given that we a) decided to not have [jvm].default_compatible_resolves in #13902, and b) we plan to set a default for default_resolve, this won't be able to happen soon. There will always be a resolve defined.
| @@ -35,3 +42,35 @@ def resolves(self) -> dict[str, str]: | |||
| @property | |||
| def default_resolve(self) -> str | None: | |||
| return cast(str, self.options.default_resolve) | |||
|
|
|||
| def resolves_for_target(self, target: Target) -> tuple[str, ...]: | |||
There was a problem hiding this comment.
Note that this is checking that all resolves are recognized, which we did not do before.
stuhood
reviewed
Dec 16, 2021
| @@ -18,14 +20,19 @@ def register_options(cls, register): | |||
| register( | |||
| "--resolves", | |||
| type=dict, | |||
| # TODO: Default this to something like {'jvm-default': '3rdparty/jvm/default.lockfile'}. | |||
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.
Four different refactors as prework for #13621.