Skip to content

Commit

Permalink
Merge pull request #4468 from RainbowMango/pr_remove_golang_mock
Browse files Browse the repository at this point in the history
Remove golang mock as it has been replaced with uber mock
  • Loading branch information
karmada-bot committed Dec 25, 2023
2 parents 7a4d85b + 9a776a7 commit 2ffe976
Show file tree
Hide file tree
Showing 17 changed files with 754 additions and 482 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0
github.com/go-co-op/gocron v1.30.1
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/kr/pretty v0.3.1
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ package tools

import (
_ "github.com/gogo/protobuf/protoc-gen-gogo"
_ "github.com/golang/mock/mockgen"
_ "github.com/onsi/ginkgo/v2/ginkgo"
_ "github.com/vektra/mockery/v2"
_ "go.uber.org/mock/mockgen"
_ "golang.org/x/tools/cmd/goimports"
_ "k8s.io/code-generator"
)
2 changes: 1 addition & 1 deletion hack/update-mocks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ source "${KARMADA_ROOT}"/hack/util.sh
echo -n "Preparing: 'mockgen' existence check - "
if [ ! $(util::cmd_exist mockgen) ]; then
# install from vendor with the pinned version in go.mod file
GO111MODULE=on go install "github.com/golang/mock/mockgen"
GO111MODULE=on go install "go.uber.org/mock/mockgen"
fi

find_files() {
Expand Down
17 changes: 11 additions & 6 deletions pkg/scheduler/framework/testing/mock_interface.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions vendor/github.com/golang/mock/AUTHORS

This file was deleted.

37 changes: 0 additions & 37 deletions vendor/github.com/golang/mock/CONTRIBUTORS

This file was deleted.

202 changes: 0 additions & 202 deletions vendor/github.com/golang/mock/LICENSE

This file was deleted.

26 changes: 0 additions & 26 deletions vendor/github.com/golang/mock/mockgen/version.1.11.go

This file was deleted.

Loading

0 comments on commit 2ffe976

Please sign in to comment.