Skip to content

Commit 33aa665

Browse files
authored
Merge pull request kubernetes#87326 from wawa0210/bump-golang-mock
Bump golang/mock version to v1.3.1
2 parents 23fa359 + 8cbc5dc commit 33aa665

File tree

7 files changed

+70
-20
lines changed

7 files changed

+70
-20
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ require (
6262
github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f // indirect
6363
github.com/gogo/protobuf v1.3.1
6464
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
65-
github.com/golang/mock v1.2.0
65+
github.com/golang/mock v1.3.1
6666
github.com/google/cadvisor v0.35.0
6767
github.com/google/go-cmp v0.3.0
6868
github.com/google/gofuzz v1.0.0
@@ -300,7 +300,7 @@ replace (
300300
github.com/golang/freetype => github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
301301
github.com/golang/glog => github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
302302
github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
303-
github.com/golang/mock => github.com/golang/mock v1.2.0
303+
github.com/golang/mock => github.com/golang/mock v1.3.1
304304
github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
305305
github.com/golangci/check => github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2
306306
github.com/golangci/dupl => github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekf
218218
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
219219
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
220220
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
221-
github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
222-
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
221+
github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
222+
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
223223
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
224224
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
225225
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=

staging/src/k8s.io/legacy-cloud-providers/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534
1616
github.com/aws/aws-sdk-go v1.16.26
1717
github.com/dnaeon/go-vcr v1.0.1 // indirect
18-
github.com/golang/mock v1.2.0
18+
github.com/golang/mock v1.3.1
1919
github.com/gophercloud/gophercloud v0.1.0
2020
github.com/mitchellh/mapstructure v1.1.2
2121
github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c

staging/src/k8s.io/legacy-cloud-providers/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/mock/gomock/controller.go

Lines changed: 36 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/mock/gomock/matchers.go

Lines changed: 26 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ github.com/gogo/protobuf/vanity
328328
github.com/gogo/protobuf/vanity/command
329329
# github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 => github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
330330
github.com/golang/groupcache/lru
331-
# github.com/golang/mock v1.2.0 => github.com/golang/mock v1.2.0
331+
# github.com/golang/mock v1.3.1 => github.com/golang/mock v1.3.1
332332
github.com/golang/mock/gomock
333333
# github.com/golang/protobuf v1.3.2 => github.com/golang/protobuf v1.3.2
334334
github.com/golang/protobuf/jsonpb

0 commit comments

Comments
 (0)