public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: address review comments - preserve tab delimiters in List and fix transitive needs cross-namespace resolution 

1. exec.go List(): Filter empty lines without TrimSpace-ing non-empty
   lines, preserving trailing tab separators from helm list output.

2. state.go collectNeedsWithTransitives(): Resolve transitives by full
   ReleaseToID matching (via ID→ReleaseSpec map) instead of name-based
   matching, avoiding cross-namespace ambiguity when multiple releases
   share the same name.

Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/94b03eb4-31e5-4d04-9959-eeaafb695855

Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-03-27 00:14:14 +00:00
parent cd216c6ee9
commit 121fda4900
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/helmexec/exec.go
View File

@ -528,8 +528,8 @@ func (helm *execer) List(context HelmContext, filter string, flags ...string) (s
lines := strings.Split(string(out), "\n")
var filtered []string
for _, line := range lines[1:] {
if trimmed := strings.TrimSpace(line); trimmed != "" {
filtered = append(filtered, trimmed)
if strings.TrimSpace(line) != "" {
filtered = append(filtered, line)
}
}
out = []byte(strings.Join(filtered, "\n"))

22
pkg/state/state.go
View File

@ -3089,10 +3089,17 @@ func unmarkReleasesByNeedID(toUnmark map[string]struct{}, releases []Release) {
}
func collectAllNeedsWithTransitives(filteredReleases []Release, allReleases []ReleaseSpec) map[string]struct{} {
// Build an ID→ReleaseSpec map for efficient lookup by fully-qualified ID,
// avoiding cross-namespace ambiguity from name-based matching.
idToRelease := map[string]ReleaseSpec{}
for _, r := range allReleases {
idToRelease[ReleaseToID(&r)] = r
}
needsWithTranstives := map[string]struct{}{}
for _, r := range filteredReleases {
if !r.Filtered {
collectNeedsWithTransitives(r.ReleaseSpec, allReleases, needsWithTranstives)
collectNeedsWithTransitives(r.ReleaseSpec, idToRelease, needsWithTranstives)
}
}
return needsWithTranstives
@ -3106,16 +3113,15 @@ func unmarkReleases(toUnmark map[string]struct{}, releases []Release) {
}
}
func collectNeedsWithTransitives(release ReleaseSpec, allReleases []ReleaseSpec, needsWithTranstives map[string]struct{}) {
func collectNeedsWithTransitives(release ReleaseSpec, idToRelease map[string]ReleaseSpec, needsWithTranstives map[string]struct{}) {
for _, id := range release.Needs {
if _, exists := needsWithTranstives[id]; !exists {
needsWithTranstives[id] = struct{}{}
releaseParts := strings.Split(id, "/")
releaseName := releaseParts[len(releaseParts)-1]
for _, r := range allReleases {
if r.Name == releaseName {
collectNeedsWithTransitives(r, allReleases, needsWithTranstives)
}
// After ApplyOverrides/reformat(), need IDs are already fully-qualified
// (matching ReleaseToID format), so we look up by full ID to avoid
// cross-namespace ambiguity when multiple releases share the same name.
if r, ok := idToRelease[id]; ok {
collectNeedsWithTransitives(r, idToRelease, needsWithTranstives)
}
}
}