chore: remove go.uber.org/mock dependency#4932
Merged
Merged
Conversation
Replace the generated mocks under pkg/infoutil/infoutilmock and the inline gomock-based MockParse in pkg/cmd/builder/build_test.go with hand-rolled fakes that use function fields. This drops the go.uber.org/mock require from go.mod / go.sum. Fixes containerd#3325 Signed-off-by: Metbcy <amirbredy1@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #3325.
Replaces the generated gomock mocks with small hand-rolled fakes that use function fields, and drops
go.uber.org/mockfromgo.mod/go.sum.Changes:
pkg/infoutil/infoutilmock/infoutil_mock.go: hand-rolledFakeWindowsInfoUtilwithRtlGetVersionFunc,GetRegistryStringValueFunc,GetRegistryIntValueFuncfields.pkg/infoutil/infoutil_windows_test.go: switched to the fake.pkg/cmd/builder/build_test.go: replaced the inline gomock-basedMockParsewith afakePlatformParserusing function fields.go.mod/go.sum: dropgo.uber.org/mock v0.6.0.I went with in-line fakes per the issue text rather than relocating mockgen to a separate package (the alternative @fahedouch raised on the thread); happy to refactor toward that approach instead if preferred.
Verified locally:
go build ./...go vet ./...go test ./pkg/cmd/builder/...passes.GOOS=windows.grep -r go.uber.org/mockreturns no source references.