From 010239af9ff8038cc66dccd6a9d6c8bb432ea45b Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Tue, 18 Jul 2023 18:59:21 +0800 Subject: [PATCH] Replace deprecated `github.com/golang/mock` with `go.uber.org/mock` (#13512) Signed-off-by: Eng Zer Jun Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Co-authored-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- go.mod | 1 + go.sum | 2 ++ .../vttablet/tabletserver/txthrottler/mock_healthcheck_test.go | 2 +- go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go | 2 +- .../tabletserver/txthrottler/mock_topology_watcher_test.go | 2 +- go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 63317711cbd..05294c4bb05 100644 --- a/go.mod +++ b/go.mod @@ -120,6 +120,7 @@ require ( github.com/hashicorp/go-version v1.6.0 github.com/planetscale/log v0.0.0-20221118170849-fb599bc35c50 github.com/slok/noglog v0.2.0 + go.uber.org/mock v0.4.0 go.uber.org/zap v1.23.0 golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 golang.org/x/sync v0.3.0 diff --git a/go.sum b/go.sum index 04b512a01e9..494e9dfb049 100644 --- a/go.sum +++ b/go.sum @@ -783,6 +783,8 @@ go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go index 17f21f7690b..84254003496 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go +++ b/go/vt/vttablet/tabletserver/txthrottler/mock_healthcheck_test.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" discovery "vitess.io/vitess/go/vt/discovery" query "vitess.io/vitess/go/vt/proto/query" diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go index 53b827d591a..3ffb3a78a1a 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go +++ b/go/vt/vttablet/tabletserver/txthrottler/mock_throttler_test.go @@ -8,7 +8,7 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" discovery "vitess.io/vitess/go/vt/discovery" throttlerdata "vitess.io/vitess/go/vt/proto/throttlerdata" diff --git a/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go b/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go index 5afb16d3473..163c4c44d4d 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go +++ b/go/vt/vttablet/tabletserver/txthrottler/mock_topology_watcher_test.go @@ -7,7 +7,7 @@ package txthrottler import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockTopologyWatcherInterface is a mock of TopologyWatcherInterface interface. diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go index 9c9c725e1fd..77f311719b4 100644 --- a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go +++ b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "vitess.io/vitess/go/vt/discovery" "vitess.io/vitess/go/vt/throttler"