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.
The merge from v2 branch brought in a dependency update from
github.com/golang/mock
togo.uber.org/mock
. While we should probably update that dependency eventually (as the golang one is no longer maintained), this update currently causes test compilation issues when pulling into solo-projects, as all our other repos still use the golang mock. It will take some coordination to get the updates into all the other repos. For now just revert the update in gloo to avoid the conflicts.Note: not including in changelog because there hasn't been a gloo release with the uber mock update so there should be no user facing change