-
Notifications
You must be signed in to change notification settings - Fork 422
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(v3): Warning for nonexistent mocks #911
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,3 +8,4 @@ coverage.txt | |
site/ | ||
.task/ | ||
tools/tools | ||
*.lua |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -7,14 +7,15 @@ import ( | |||||
"os" | ||||||
"strings" | ||||||
|
||||||
"github.com/chigopher/pathlib" | ||||||
"github.com/rs/zerolog" | ||||||
"github.com/spf13/cobra" | ||||||
"github.com/spf13/pflag" | ||||||
"github.com/vektra/mockery/v3/config" | ||||||
pkg "github.com/vektra/mockery/v3/internal" | ||||||
"github.com/vektra/mockery/v3/internal/logging" | ||||||
"github.com/vektra/mockery/v3/internal/stackerr" | ||||||
|
||||||
"github.com/chigopher/pathlib" | ||||||
"github.com/rs/zerolog" | ||||||
"github.com/spf13/cobra" | ||||||
"github.com/spf13/pflag" | ||||||
"golang.org/x/tools/go/packages" | ||||||
) | ||||||
|
||||||
|
@@ -195,6 +196,31 @@ func (r *RootApp) Run() error { | |||||
} | ||||||
parser := pkg.NewParser(buildTags) | ||||||
|
||||||
// Let's build a missing map here to keep track of seen interfaces. | ||||||
// (pkg -> list of interface names) | ||||||
// After seeing an interface it'll be deleted from the map, keeping only | ||||||
// missing interfaces or packages in there. | ||||||
// | ||||||
// NOTE: We do that here without relying on parser, because parses iterates | ||||||
// over existing go files and interfaces, while user could've had a typo in | ||||||
// interface or pacakge name, making it impossible for parser to find these | ||||||
// files/interfaces in the first place. | ||||||
log.Debug().Msg("Making seen map...") | ||||||
missingMap := make(map[string]map[string]struct{}, len(configuredPackages)) | ||||||
for _, p := range configuredPackages { | ||||||
config, err := r.Config.GetPackageConfig(ctx, p) | ||||||
if err != nil { | ||||||
return err | ||||||
} | ||||||
if _, ok := missingMap[p]; !ok { | ||||||
missingMap[p] = make(map[string]struct{}, len(config.Interfaces)) | ||||||
} | ||||||
|
||||||
for ifaceName := range config.Interfaces { | ||||||
missingMap[p][ifaceName] = struct{}{} | ||||||
} | ||||||
} | ||||||
|
||||||
log.Info().Msg("Parsing configured packages...") | ||||||
interfaces, err := parser.ParsePackages(ctx, configuredPackages) | ||||||
if err != nil { | ||||||
|
@@ -206,8 +232,8 @@ func (r *RootApp) Run() error { | |||||
// outputFilePath|fullyQualifiedInterfaceName|[]*pkg.Interface | ||||||
// The reason why we need an interior map of fully qualified interface name | ||||||
// to a slice of *pkg.Interface (which represents all information necessary | ||||||
// to create the output mock) is because mockery allows multiple mocks to be | ||||||
// created for each input interface. | ||||||
// to create the output mock) is because mockery allows multiple mocks to | ||||||
// be created for each input interface. | ||||||
mockFileToInterfaces := map[string]*InterfaceCollection{} | ||||||
|
||||||
for _, iface := range interfaces { | ||||||
|
@@ -217,6 +243,14 @@ func (r *RootApp) Run() error { | |||||
Str(logging.LogKeyPackagePath, iface.Pkg.Types.Path()). | ||||||
Logger() | ||||||
|
||||||
if _, exist := missingMap[iface.Pkg.PkgPath]; exist { | ||||||
delete(missingMap[iface.Pkg.PkgPath], iface.Name) | ||||||
|
||||||
if len(missingMap[iface.Pkg.PkgPath]) == 0 { | ||||||
delete(missingMap, iface.Pkg.PkgPath) | ||||||
} | ||||||
} | ||||||
|
||||||
ifaceCtx := ifaceLog.WithContext(ctx) | ||||||
|
||||||
pkgConfig, err := r.Config.GetPackageConfig(ctx, iface.Pkg.PkgPath) | ||||||
|
@@ -322,5 +356,16 @@ func (r *RootApp) Run() error { | |||||
} | ||||||
} | ||||||
|
||||||
// The loop above could exit early, so sometimes warnings won't be shown | ||||||
// until other errors are fixed | ||||||
for packageName := range missingMap { | ||||||
for iface := range missingMap[packageName] { | ||||||
log.Warn(). | ||||||
Str(logging.LogKeyInterface, iface). | ||||||
Str(logging.LogKeyPackagePath, packageName). | ||||||
Msg("no such interface") | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Just to be a bit more explicit. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sure |
||||||
} | ||||||
} | ||||||
|
||||||
return nil | ||||||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically, a "package name" is different from a "package path".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
makes sense, fixed