From c92dd2e06441891ae1d53c956f788015e2d35a3a Mon Sep 17 00:00:00 2001 From: LandonTClipp <11232769+LandonTClipp@users.noreply.github.com> Date: Sun, 19 Jan 2025 22:25:13 -0600 Subject: [PATCH] Additional fix with deprecation warning --- cmd/mockery.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/mockery.go b/cmd/mockery.go index f9cb2e15..107997c0 100644 --- a/cmd/mockery.go +++ b/cmd/mockery.go @@ -232,7 +232,11 @@ func (r *RootApp) Run() error { boilerplate = string(data) } - if r.Config.Packages == nil { + configuredPackages, err := r.Config.GetPackages(ctx) + if err != nil && !errors.Is(err, os.ErrNotExist) { + return fmt.Errorf("failed to determine configured packages: %w", err) + } + if len(configuredPackages) == 0 { logging.WarnDeprecated( "packages", "use of the packages config will be the only way to generate mocks in v3. Please migrate your config to use the packages feature.", @@ -241,13 +245,7 @@ func (r *RootApp) Run() error { "migration": logging.DocsURL("/migrating_to_packages/"), }, ) - } - - configuredPackages, err := r.Config.GetPackages(ctx) - if err != nil && !errors.Is(err, os.ErrNotExist) { - return fmt.Errorf("failed to determine configured packages: %w", err) - } - if len(configuredPackages) != 0 { + } else { r.Config.LogUnsupportedPackagesConfig(ctx) configuredPackages, err := r.Config.GetPackages(ctx)