update mockery to version 2 and adapt to tools-install approach (#3358

)
jaegertracing · Oct 31, 2021 · b1254bd · b1254bd
1 parent 7844198
commit b1254bd
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 58 deletions.
diff --git a/Makefile b/Makefile
@@ -408,13 +408,13 @@ generate-zipkin-swagger: init-submodules
 
 .PHONY: install-mockery
 install-mockery:
-	go install github.com/vektra/mockery/.../
+	go install github.com/vektra/mockery/v2@v2.9.4
 
 .PHONY: generate-mocks
 generate-mocks: install-mockery
-	$(MOCKERY) -all -dir ./pkg/es/ -output ./pkg/es/mocks && rm pkg/es/mocks/ClientBuilder.go
-	$(MOCKERY) -all -dir ./storage/spanstore/ -output ./storage/spanstore/mocks
-	$(MOCKERY) -all -dir ./proto-gen/storage_v1/ -output ./proto-gen/storage_v1/mocks
+	$(MOCKERY) --all --dir ./pkg/es/ --output ./pkg/es/mocks && rm pkg/es/mocks/ClientBuilder.go
+	$(MOCKERY) --all --dir ./storage/spanstore/ --output ./storage/spanstore/mocks
+	$(MOCKERY) --all --dir ./proto-gen/storage_v1/ --output ./proto-gen/storage_v1/mocks
 
 .PHONY: echo-version
 echo-version:

diff --git a/go.mod b/go.mod
@@ -45,7 +45,6 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/uber/jaeger-client-go v2.29.1+incompatible
 	github.com/uber/jaeger-lib v2.4.1+incompatible
-	github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5
 	github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
 	github.com/xdg-go/scram v1.0.2
 	go.opentelemetry.io/collector/model v0.37.0

diff --git a/go.sum b/go.sum
@@ -769,8 +769,6 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5 h1:Xim2mBRFdXzXmKRO8DJg/FJtn/8Fj9NOEpO6+WuMPmk=
-github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5/go.mod h1:ppEjwdhyy7Y31EnHRDm1JkChoC7LXIJ7Ex0VYLWtZtQ=
 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad h1:W0LEBv82YCGEtcmPA3uNZBI33/qF//HAAs3MawDjRa0=
 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
@@ -1064,7 +1062,6 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181112210238-4b1f3b6b1646/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

diff --git a/pkg/es/mocks/Client.go b/pkg/es/mocks/Client.go
diff --git a/pkg/es/mocks/IndexService.go b/pkg/es/mocks/IndexService.go
diff --git a/pkg/es/mocks/IndicesCreateService.go b/pkg/es/mocks/IndicesCreateService.go
diff --git a/pkg/es/mocks/IndicesExistsService.go b/pkg/es/mocks/IndicesExistsService.go
diff --git a/pkg/es/mocks/MultiSearchService.go b/pkg/es/mocks/MultiSearchService.go
diff --git a/pkg/es/mocks/SearchService.go b/pkg/es/mocks/SearchService.go
diff --git a/pkg/es/mocks/TemplateApplier.go b/pkg/es/mocks/TemplateApplier.go
diff --git a/pkg/es/mocks/TemplateBuilder.go b/pkg/es/mocks/TemplateBuilder.go
diff --git a/pkg/es/mocks/TemplateCreateService.go b/pkg/es/mocks/TemplateCreateService.go
diff --git a/proto-gen/storage_v1/mocks/ArchiveSpanReaderPluginClient.go b/proto-gen/storage_v1/mocks/ArchiveSpanReaderPluginClient.go
diff --git a/proto-gen/storage_v1/mocks/ArchiveSpanReaderPluginServer.go b/proto-gen/storage_v1/mocks/ArchiveSpanReaderPluginServer.go
diff --git a/proto-gen/storage_v1/mocks/ArchiveSpanReaderPlugin_GetArchiveTraceClient.go b/proto-gen/storage_v1/mocks/ArchiveSpanReaderPlugin_GetArchiveTraceClient.go
diff --git a/proto-gen/storage_v1/mocks/ArchiveSpanReaderPlugin_GetArchiveTraceServer.go b/proto-gen/storage_v1/mocks/ArchiveSpanReaderPlugin_GetArchiveTraceServer.go
diff --git a/proto-gen/storage_v1/mocks/ArchiveSpanWriterPluginClient.go b/proto-gen/storage_v1/mocks/ArchiveSpanWriterPluginClient.go
diff --git a/proto-gen/storage_v1/mocks/ArchiveSpanWriterPluginServer.go b/proto-gen/storage_v1/mocks/ArchiveSpanWriterPluginServer.go
diff --git a/proto-gen/storage_v1/mocks/DependenciesReaderPluginClient.go b/proto-gen/storage_v1/mocks/DependenciesReaderPluginClient.go
diff --git a/proto-gen/storage_v1/mocks/DependenciesReaderPluginServer.go b/proto-gen/storage_v1/mocks/DependenciesReaderPluginServer.go
diff --git a/proto-gen/storage_v1/mocks/PluginCapabilitiesClient.go b/proto-gen/storage_v1/mocks/PluginCapabilitiesClient.go
diff --git a/proto-gen/storage_v1/mocks/PluginCapabilitiesServer.go b/proto-gen/storage_v1/mocks/PluginCapabilitiesServer.go
diff --git a/proto-gen/storage_v1/mocks/SpanReaderPluginClient.go b/proto-gen/storage_v1/mocks/SpanReaderPluginClient.go
diff --git a/proto-gen/storage_v1/mocks/SpanReaderPluginServer.go b/proto-gen/storage_v1/mocks/SpanReaderPluginServer.go
diff --git a/proto-gen/storage_v1/mocks/SpanReaderPlugin_FindTracesClient.go b/proto-gen/storage_v1/mocks/SpanReaderPlugin_FindTracesClient.go
diff --git a/proto-gen/storage_v1/mocks/SpanReaderPlugin_FindTracesServer.go b/proto-gen/storage_v1/mocks/SpanReaderPlugin_FindTracesServer.go
diff --git a/proto-gen/storage_v1/mocks/SpanReaderPlugin_GetTraceClient.go b/proto-gen/storage_v1/mocks/SpanReaderPlugin_GetTraceClient.go
diff --git a/proto-gen/storage_v1/mocks/SpanReaderPlugin_GetTraceServer.go b/proto-gen/storage_v1/mocks/SpanReaderPlugin_GetTraceServer.go
diff --git a/proto-gen/storage_v1/mocks/SpanWriterPluginClient.go b/proto-gen/storage_v1/mocks/SpanWriterPluginClient.go
diff --git a/proto-gen/storage_v1/mocks/SpanWriterPluginServer.go b/proto-gen/storage_v1/mocks/SpanWriterPluginServer.go
diff --git a/storage/spanstore/mocks/Reader.go b/storage/spanstore/mocks/Reader.go
diff --git a/storage/spanstore/mocks/Writer.go b/storage/spanstore/mocks/Writer.go
diff --git a/tools.go b/tools.go
@@ -23,7 +23,6 @@ import (
 
 	_ "github.com/mjibson/esc"
 	_ "github.com/securego/gosec/cmd/gosec"
-	_ "github.com/vektra/mockery/cmd/mockery"
 	_ "github.com/wadey/gocovmerge"
 	_ "golang.org/x/lint/golint"
 )