Skip to content

Commit 619018c

Browse files
helsaawyhelsaawy
authored
Replace deprecated github.com/golang/mock (#1839)
Signed-off-by: Hamza El-Saawy <[email protected]>
1 parent 492992f commit 619018c

31 files changed

Lines changed: 711 additions & 242 deletions

‎cmd/ncproxy/hcn_networking_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
computeagentMock "github.com/Microsoft/hcsshim/internal/computeagent/mock"
1414
"github.com/Microsoft/hcsshim/osversion"
1515
ncproxygrpc "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1"
16-
"github.com/golang/mock/gomock"
16+
"go.uber.org/mock/gomock"
1717
)
1818

1919
const (

‎cmd/ncproxy/ncproxy_networking_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
computeagentMock "github.com/Microsoft/hcsshim/internal/computeagent/mock"
1111
ncproxynetworking "github.com/Microsoft/hcsshim/internal/ncproxy/networking"
1212
ncproxygrpc "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1"
13-
"github.com/golang/mock/gomock"
13+
"go.uber.org/mock/gomock"
1414
)
1515

1616
func TestAddNIC_NCProxy(t *testing.T) {

‎cmd/ncproxy/ncproxy_v0_service_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
computeagentMock "github.com/Microsoft/hcsshim/internal/computeagent/mock"
1212
"github.com/Microsoft/hcsshim/osversion"
1313
ncproxygrpcv0 "github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v0"
14-
"github.com/golang/mock/gomock"
14+
"go.uber.org/mock/gomock"
1515
)
1616

1717
func TestAddNIC_V0_HCN(t *testing.T) {

‎cmd/ncproxy/server_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
nodenetsvc "github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1"
1818
nodenetsvcMock "github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1/mock"
1919
"github.com/containerd/ttrpc"
20-
"github.com/golang/mock/gomock"
2120
"github.com/pkg/errors"
2221
bolt "go.etcd.io/bbolt"
22+
"go.uber.org/mock/gomock"
2323
"google.golang.org/grpc/codes"
2424
"google.golang.org/grpc/status"
2525
)

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
github.com/containerd/protobuild v0.3.0
1414
github.com/containerd/ttrpc v1.2.2
1515
github.com/containerd/typeurl/v2 v2.1.1
16-
github.com/golang/mock v1.6.0
1716
github.com/google/go-cmp v0.5.9
1817
github.com/google/go-containerregistry v0.15.2
1918
github.com/lestrrat-go/jwx v1.2.26
@@ -31,6 +30,7 @@ require (
3130
github.com/vishvananda/netns v0.0.4
3231
go.etcd.io/bbolt v1.3.7
3332
go.opencensus.io v0.24.0
33+
go.uber.org/mock v0.2.0
3434
golang.org/x/sync v0.3.0
3535
golang.org/x/sys v0.10.0
3636
google.golang.org/grpc v1.56.2

‎go.sum‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
504504
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
505505
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
506506
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
507-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
508507
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
509508
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
510509
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -1090,6 +1089,8 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
10901089
go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU=
10911090
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
10921091
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
1092+
go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
1093+
go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
10931094
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
10941095
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
10951096
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=

‎internal/computeagent/doc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
// used for ncproxy.
66
package computeagent
77

8-
//go:generate go run github.com/golang/mock/mockgen -source=computeagent_ttrpc.pb.go -package=computeagent_mock -destination=mock\computeagent_mock.pb.go
8+
//go:generate go run go.uber.org/mock/mockgen -source=computeagent_ttrpc.pb.go -package=computeagent_mock -destination=mock\computeagent_mock.pb.go

‎internal/computeagent/mock/computeagent_mock.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/ncproxy/nodenetsvc/v0/doc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package v0
22

3-
//go:generate go run github.com/golang/mock/mockgen -source=nodenetsvc_grpc.pb.go -package=nodenetsvc_v0_mock -destination=mock\nodenetsvc_mock.pb.go
3+
//go:generate go run go.uber.org/mock/mockgen -source=nodenetsvc_grpc.pb.go -package=nodenetsvc_v0_mock -destination=mock\nodenetsvc_mock.pb.go

‎pkg/ncproxy/nodenetsvc/v0/mock/nodenetsvc_mock.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)