[latest-17.0](vitessio#2663): CherryPick(vitessio#13512): Replace dep…

…recated `github.com/golang/mock` with `go.uber.org/mock` (vitessio#2672)

* backport of 2663

* resolve conflict

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>

---------

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

@@ -21,7 +21,6 @@ require (
  github.com/fsnotify/fsnotify v1.6.0
  github.com/go-sql-driver/mysql v1.7.0
  github.com/golang/glog v1.1.0
- github.com/golang/mock v1.6.0
  github.com/golang/protobuf v1.5.3
  github.com/golang/snappy v0.0.4
  github.com/google/go-cmp v0.5.9
@@ -72,6 +71,7 @@ require (
  go.etcd.io/etcd/api/v3 v3.5.7
  go.etcd.io/etcd/client/pkg/v3 v3.5.7
  go.etcd.io/etcd/client/v3 v3.5.7
+ go.uber.org/mock v0.2.0
  golang.org/x/crypto v0.7.0 // indirect
  golang.org/x/mod v0.10.0 // indirect
  golang.org/x/net v0.9.0

go.sum

@@ -216,7 +216,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 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.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -646,6 +645,8 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
 go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
+go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=

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"