Fix Bazel module resolution regression in go_deps #1966
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
|
@Buzz-Lightyear Could you review this? |
2a65ce8 made it so that Bazel modules would no longer override Go modules if their versions don't match exactly. Also do not report version mismatches for overridden Bazel modules.
fmeum
force-pushed
the
tweak-version-resolution
branch
from
1f32ce2
to
d45893b
Compare
honnix
reviewed
Nov 15, 2024
| # Only use the Bazel module if it is at least as high as the required Go module version. | ||
| if path in module_resolutions and bazel_dep.version != module_resolutions[path].version: | ||
| # Do not report version mismatches for overridden Bazel modules. | ||
| if path in module_resolutions and bazel_dep.version != _HIGHEST_VERSION_SENTINEL and bazel_dep.version != module_resolutions[path].version: | ||
| outdated_direct_dep_printer("\n\nMismatch between versions requested for module {module}\nBazel dependency version requested in MODULE.bazel: {bazel_dep_version}\nGo module version requested in go.mod: {go_module_version}\nPlease resolve this mismatch to prevent discrepancies between native Go and Bazel builds\n\n".format( |
There was a problem hiding this comment.
Is it expected that this DEBUG print also happens when the dep in go.mod is indirect?
To give a concrete example, we have cel.dev/expr v0.18.0 // indirect in go.mod, and 0.15.0 in bazel mod graph which is a transitive dep of grpc-java shown as following, so neither of them is a direct dep.
├───grpc-java@1.67.1
├───cel-spec@0.15.0
There was a problem hiding this comment.
I'd say that's desired behavior as it gives you the opportunity to explicitly add a replace directive for the version you'd like, if you so chose.
There was a problem hiding this comment.
This check makes sense. I was just wondering whether this function outdated_direct_dep_printer was designed for this purpose.
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.
What type of PR is this?
Bug fix
What package or component does this PR mostly affect?
go_depsWhat does this PR do? Why is it needed?
2a65ce8 made it so that Bazel modules would no longer override Go modules if their versions don't match exactly.
Also do not report version mismatches for overridden Bazel modules.
Which issues(s) does this PR fix?
Fixes #
Other notes for review