From c07a82da700c3af713636677b1812ae4a19c8bc9 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Sun, 15 Mar 2026 09:50:30 +0800 Subject: [PATCH] fix: use config for includeNeeds in Deps command - Add IncludeNeeds() method to DepsConfigProvider interface - Implement IncludeNeeds() in DepsImpl - Update depsConfig in tests - Use c.IncludeNeeds() in run.go instead of hardcoded false Signed-off-by: yxxhero --- pkg/app/app_test.go | 19 +++++++++++++------ pkg/app/config.go | 1 + pkg/app/run.go | 2 +- pkg/config/deps.go | 5 +++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go index 50e3682a..36aaf9f5 100644 --- a/pkg/app/app_test.go +++ b/pkg/app/app_test.go @@ -2626,22 +2626,28 @@ func (a applyConfig) TrackLogs() bool { type depsConfig struct { skipRepos bool + includeNeeds bool includeTransitiveNeeds bool + args []string } -func (d depsConfig) SkipRepos() bool { - return d.skipRepos +func (c depsConfig) SkipRepos() bool { + return c.skipRepos } -func (d depsConfig) IncludeTransitiveNeeds() bool { - return d.includeTransitiveNeeds +func (c depsConfig) IncludeNeeds() bool { + return c.includeNeeds } -func (d depsConfig) Args() string { +func (c depsConfig) IncludeTransitiveNeeds() bool { + return c.includeTransitiveNeeds +} + +func (c depsConfig) Args() string { return "" } -func (d depsConfig) Concurrency() int { +func (c depsConfig) Concurrency() int { return 2 } @@ -4116,6 +4122,7 @@ releases: depsErr := app.Deps(depsConfig{ skipRepos: false, + includeNeeds: false, includeTransitiveNeeds: false, }) switch { diff --git a/pkg/app/config.go b/pkg/app/config.go index 03bdc627..de34473f 100644 --- a/pkg/app/config.go +++ b/pkg/app/config.go @@ -31,6 +31,7 @@ type ConfigProvider interface { type DepsConfigProvider interface { Args() string SkipRepos() bool + IncludeNeeds() bool IncludeTransitiveNeeds() bool concurrencyConfig diff --git a/pkg/app/run.go b/pkg/app/run.go index 0fbfb29a..589bba9b 100644 --- a/pkg/app/run.go +++ b/pkg/app/run.go @@ -137,7 +137,7 @@ func (r *Run) Deps(c DepsConfigProvider) []error { r.helm.SetExtraArgs(GetArgs(c.Args(), r.state)...) - return r.state.UpdateDeps(r.helm, false, c.IncludeTransitiveNeeds()) + return r.state.UpdateDeps(r.helm, c.IncludeNeeds(), c.IncludeTransitiveNeeds()) } func (r *Run) Repos(c ReposConfigProvider) error { diff --git a/pkg/config/deps.go b/pkg/config/deps.go index f4dd4608..fd1e3e91 100644 --- a/pkg/config/deps.go +++ b/pkg/config/deps.go @@ -32,6 +32,11 @@ func (d *DepsImpl) SkipRepos() bool { return d.DepsOptions.SkipRepos } +// IncludeNeeds returns the includeNeeds +func (d *DepsImpl) IncludeNeeds() bool { + return false +} + // IncludeTransitiveNeeds returns the includeTransitiveNeeds func (d *DepsImpl) IncludeTransitiveNeeds() bool { return false