Skip to content

Commit

Permalink
replace github.com/golang/mock/gomock with go.uber.org/mock/gomock
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinForReal authored Jan 6, 2025
1 parent 98c1c74 commit b331a18
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 1,496 deletions.
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ require (
github.com/Azure/go-autorest/autorest v0.11.29
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/container-storage-interface/spec v1.10.0
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.4
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
github.com/kubernetes-csi/csi-lib-utils v0.14.1
github.com/kubernetes-csi/csi-proxy/client v1.0.1
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/moby/sys/userns v0.1.0 // indirect
github.com/onsi/ginkgo/v2 v2.22.1
github.com/onsi/gomega v1.36.2
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021
Expand All @@ -48,8 +48,6 @@ require (
sigs.k8s.io/yaml v1.4.0
)

require github.com/moby/sys/userns v0.1.0 // indirect

require (
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,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 v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
Expand Down
2 changes: 1 addition & 1 deletion pkg/azurefile/directvolume_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package azurefile
import (
reflect "reflect"

gomock "github.com/golang/mock/gomock"
gomock "go.uber.org/mock/gomock"
volume "github.com/kata-containers/kata-containers/src/runtime/pkg/direct-volume"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/azurefile/nodeserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (

azure2 "github.com/Azure/go-autorest/autorest/azure"
"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
volume "github.com/kata-containers/kata-containers/src/runtime/pkg/direct-volume"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
Expand Down
2 changes: 1 addition & 1 deletion pkg/azurefile/resolver_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
net "net"
reflect "reflect"

gomock "github.com/golang/mock/gomock"
gomock "go.uber.org/mock/gomock"
)

// MockResolver is a mock of Resolver interface.
Expand Down
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.

Loading

0 comments on commit b331a18

Please sign in to comment.