Skip to content

Create config file for Mockery instead of using explicit CLI flags in the Makefile#5623

Merged
yurishkuro merged 4 commits intojaegertracing:mainfrom
jesslourenco:config-mockery
Jun 13, 2024
Merged

Create config file for Mockery instead of using explicit CLI flags in the Makefile#5623
yurishkuro merged 4 commits intojaegertracing:mainfrom
jesslourenco:config-mockery

Conversation

@jesslourenco
Copy link
Copy Markdown
Contributor

@jesslourenco jesslourenco commented Jun 13, 2024

Which problem is this PR solving?

Description of the changes

  • Created the configuration file (.mockery.yaml) to match what was being done by make generate-mocks
  • Removed a few mock files from es/mocks that were defined within the subpackage client. These files are still (auto) generated but within es/client/mocks only

How was this change tested?

  • manually by running mockery
  • by running make test

Checklist

@jesslourenco jesslourenco requested a review from a team as a code owner June 13, 2024 17:29
@jesslourenco jesslourenco requested a review from jkowall June 13, 2024 17:29
@yurishkuro
Copy link
Copy Markdown
Member

please make sure all commits are signed

Signed-off-by: jessica lourenco <jess.mailed@gmail.com>
Signed-off-by: jesslourenco <70455379+jesslourenco@users.noreply.github.com>
jesslourenco and others added 3 commits June 13, 2024 16:18
- Updated target in makefile

Signed-off-by: jesslourenco <70455379+jesslourenco@users.noreply.github.com>
…nstead of Mock<Interfacename>

- removed custom rules for es/client in mockery config since they are no longer necessary

Signed-off-by: jesslourenco <70455379+jesslourenco@users.noreply.github.com>
@yurishkuro yurishkuro changed the title Create Config File For Mockery Create config file for Mockery instead of using explicit CLI flags in the Makefile Jun 13, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.19%. Comparing base (d1a5107) to head (5b38c45).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5623      +/-   ##
==========================================
- Coverage   96.20%   96.19%   -0.02%     
==========================================
  Files         327      327              
  Lines       16014    16014              
==========================================
- Hits        15406    15404       -2     
- Misses        432      433       +1     
- Partials      176      177       +1     
Flag Coverage Δ
badger_v1 8.05% <ø> (ø)
badger_v2 1.93% <ø> (ø)
cassandra-3.x-v1 16.45% <ø> (ø)
cassandra-3.x-v2 1.85% <ø> (ø)
cassandra-4.x-v1 16.45% <ø> (ø)
cassandra-4.x-v2 1.85% <ø> (ø)
elasticsearch-7.x-v1 18.89% <ø> (+0.01%) ⬆️
elasticsearch-8.x-v1 19.07% <ø> (-0.02%) ⬇️
elasticsearch-8.x-v2 19.07% <ø> (-0.02%) ⬇️
grpc_v1 9.48% <ø> (+0.01%) ⬆️
grpc_v2 7.53% <ø> (ø)
kafka 9.77% <ø> (ø)
opensearch-1.x-v1 18.93% <ø> (-0.02%) ⬇️
opensearch-2.x-v1 18.94% <ø> (+0.01%) ⬆️
opensearch-2.x-v2 18.94% <ø> (+0.01%) ⬆️
unittests 94.06% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@yurishkuro yurishkuro added the changelog:ci Change related to continuous integration / testing label Jun 13, 2024
@yurishkuro yurishkuro merged commit 1830148 into jaegertracing:main Jun 13, 2024
@yurishkuro yurishkuro mentioned this pull request Jun 13, 2024
2 tasks
@yurishkuro
Copy link
Copy Markdown
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog:ci Change related to continuous integration / testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants