improves handling of Helm index with broken helm chart versions #13176

bb-Ricardo · mattfarina · commit 961194d85dd0 · 2024-10-09T15:15:41.000-04:00
Signed-off-by: ricardo.bartels@telekom.de <ricardo.bartels@telekom.de> (cherry picked from commit 154b477)
diff --git a/pkg/repo/index.go b/pkg/repo/index.go
@@ -353,6 +353,10 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {
 		return i, err
 	}
 
+	if i.APIVersion == "" {
+		return i, ErrNoAPIVersion
+	}
+
 	for name, cvs := range i.Entries {
 		for idx := len(cvs) - 1; idx >= 0; idx-- {
 			if cvs[idx] == nil {
@@ -371,11 +375,10 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {
 				cvs = append(cvs[:idx], cvs[idx+1:]...)
 			}
 		}
+		// adjust slice to only contain a set of valid versions
+		i.Entries[name] = cvs
 	}
 	i.SortEntries()
-	if i.APIVersion == "" {
-		return i, ErrNoAPIVersion
-	}
 	return i, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,10 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {`
`353`	`353`	`return i, err`
`354`	`354`	`}`
`355`	`355`
	`356`	`+ if i.APIVersion == "" {`
	`357`	`+ return i, ErrNoAPIVersion`
	`358`	`+ }`
	`359`	`+`
`356`	`360`	`for name, cvs := range i.Entries {`
`357`	`361`	`for idx := len(cvs) - 1; idx >= 0; idx-- {`
`358`	`362`	`if cvs[idx] == nil {`
`@@ -371,11 +375,10 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {`
`371`	`375`	`cvs = append(cvs[:idx], cvs[idx+1:]...)`
`372`	`376`	`}`
`373`	`377`	`}`
	`378`	`+ // adjust slice to only contain a set of valid versions`
	`379`	`+ i.Entries[name] = cvs`
`374`	`380`	`}`
`375`	`381`	`i.SortEntries()`
`376`		`- if i.APIVersion == "" {`
`377`		`- return i, ErrNoAPIVersion`
`378`		`- }`
`379`	`382`	`return i, nil`
`380`	`383`	`}`
`381`	`384`