Skip to content

Commit afdd311

Browse files
Add all mocks to mockery config file and regenerate (jaegertracing#5626)
## What problem is this solving Resolves jaegertracing#5569 ## Description of the changes - added packages to mockery config file ## How was this change tested? - make test ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: danish siddiqui <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
1 parent 1c1bc08 commit afdd311

File tree

75 files changed

+1335
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1335
-684
lines changed

.mockery.header.txt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// Copyright (c) The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
//
4+
// Run 'make generate-mocks' to regenerate.

.mockery.yaml

+53-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,66 @@ outpkg: "mocks"
44
dir: "{{.InterfaceDir}}/mocks/"
55
mockname: "{{.InterfaceName}}"
66
filename: "{{.InterfaceName}}.go"
7+
boilerplate-file: .mockery.header.txt
78
packages:
9+
github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/cache:
10+
interfaces:
11+
ServiceAliasMappingExternalSource:
12+
ServiceAliasMappingStorage:
13+
github.com/jaegertracing/jaeger/cmd/ingester/app/consumer:
14+
interfaces:
15+
Message:
16+
github.com/jaegertracing/jaeger/cmd/ingester/app/processor:
17+
interfaces:
18+
SpanProcessor:
19+
github.com/jaegertracing/jaeger/crossdock/services:
20+
interfaces:
21+
AgentService:
22+
QueryService:
23+
github.com/jaegertracing/jaeger/pkg/cassandra:
24+
config:
25+
unroll-variadic: false
26+
interfaces:
27+
Iterator:
28+
Query:
29+
Session:
30+
github.com/jaegertracing/jaeger/pkg/distributedlock:
31+
config:
32+
all: true
833
github.com/jaegertracing/jaeger/pkg/es:
934
config:
1035
all: true
11-
github.com/jaegertracing/jaeger/storage/spanstore:
36+
github.com/jaegertracing/jaeger/pkg/es/client:
1237
config:
1338
all: true
14-
github.com/jaegertracing/jaeger/proto-gen/storage_v1:
39+
github.com/jaegertracing/jaeger/pkg/kafka/consumer:
40+
interfaces:
41+
Consumer:
42+
github.com/jaegertracing/jaeger/plugin/sampling/leaderelection:
1543
config:
1644
all: true
17-
github.com/jaegertracing/jaeger/pkg/es/client:
45+
github.com/jaegertracing/jaeger/plugin/storage/grpc:
46+
interfaces:
47+
PluginCapabilities:
48+
github.com/jaegertracing/jaeger/plugin/storage/kafka:
49+
interfaces:
50+
Marshaller:
51+
Unmarshaller:
52+
github.com/jaegertracing/jaeger/proto-gen/storage_v1:
53+
config:
54+
all: true
55+
github.com/jaegertracing/jaeger/storage:
56+
config:
57+
all: true
58+
github.com/jaegertracing/jaeger/storage/dependencystore:
59+
interfaces:
60+
Reader:
61+
github.com/jaegertracing/jaeger/storage/metricsstore:
62+
config:
63+
all: true
64+
github.com/jaegertracing/jaeger/storage/samplingstore:
65+
config:
66+
all: true
67+
github.com/jaegertracing/jaeger/storage/spanstore:
1868
config:
1969
all: true
20-

cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingExternalSource.go

+27-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/collector/app/sanitizer/cache/mocks/ServiceAliasMappingStorage.go

+31-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/ingester/app/consumer/consumer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
"github.com/stretchr/testify/require"
3030
"go.uber.org/zap"
3131

32-
kmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
3332
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor"
3433
pmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/processor/mocks"
3534
"github.com/jaegertracing/jaeger/internal/metricstest"
3635
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
36+
kmocks "github.com/jaegertracing/jaeger/pkg/kafka/consumer/mocks"
3737
"github.com/jaegertracing/jaeger/pkg/metrics"
3838
)
3939

@@ -146,7 +146,7 @@ func TestSaramaConsumerWrapper_start_Messages(t *testing.T) {
146146
partitionConsumer: &partitionConsumerWrapper{
147147
topic: topic,
148148
partition: partition,
149-
PartitionConsumer: &kmocks.PartitionConsumer{},
149+
PartitionConsumer: &smocks.PartitionConsumer{},
150150
},
151151
},
152152
}

cmd/ingester/app/consumer/mocks/Message.go

+39-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)