feat(ui): Recursive Helm Values files detection (argoproj#15935) (arg…

…oproj#15936) Signed-off-by: bagnaram <[email protected]> Signed-off-by: jmilic1 <[email protected]>
jmilic1 · Nov 13, 2023 · fd55886 · fd55886
1 parent c195b3c
commit fd55886
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
@@ -2021,12 +2021,13 @@ func (s *Service) createGetAppDetailsCacheHandler(res *apiclient.RepoAppDetailsR
 
 func populateHelmAppDetails(res *apiclient.RepoAppDetailsResponse, appPath string, repoRoot string, q *apiclient.RepoServerAppDetailsQuery, gitRepoPaths io.TempPaths) error {
 	var selectedValueFiles []string
+	var availableValueFiles []string
 
 	if q.Source.Helm != nil {
 		selectedValueFiles = q.Source.Helm.ValueFiles
 	}
 
-	availableValueFiles, err := findHelmValueFilesInPath(appPath)
+	err := filepath.Walk(appPath, walkHelmValueFilesInPath(appPath, &availableValueFiles))
 	if err != nil {
 		return err
 	}
@@ -2103,26 +2104,25 @@ func loadFileIntoIfExists(path pathutil.ResolvedFilePath, destination *string) e
 	return nil
 }
 
-func findHelmValueFilesInPath(path string) ([]string, error) {
-	var result []string
+func walkHelmValueFilesInPath(root string, valueFiles *[]string) filepath.WalkFunc {
+	return func(path string, info os.FileInfo, err error) error {
 
-	files, err := os.ReadDir(path)
-	if err != nil {
-		return result, fmt.Errorf("error reading helm values file from %s: %w", path, err)
-	}
-
-	for _, f := range files {
-		if f.IsDir() {
-			continue
+		if err != nil {
+			return fmt.Errorf("error reading helm values file from %s: %w", path, err)
 		}
-		filename := f.Name()
-		fileNameExt := strings.ToLower(filepath.Ext(filename))
+
+		filename := info.Name()
+		fileNameExt := strings.ToLower(filepath.Ext(path))
 		if strings.Contains(filename, "values") && (fileNameExt == ".yaml" || fileNameExt == ".yml") {
-			result = append(result, filename)
+			relPath, err := filepath.Rel(root, path)
+			if err != nil {
+				return fmt.Errorf("error traversing path from %s to %s: %w", root, path, err)
+			}
+			*valueFiles = append(*valueFiles, relPath)
 		}
-	}
 
-	return result, nil
+		return nil
+	}
 }
 
 func populateKustomizeAppDetails(res *apiclient.RepoAppDetailsResponse, q *apiclient.RepoServerAppDetailsQuery, appPath string, reversion string, credsStore git.CredsStore) error {

diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go
@@ -2663,16 +2663,27 @@ func runGit(t *testing.T, workDir string, args ...string) string {
 	return stringOut
 }
 
-func Test_findHelmValueFilesInPath(t *testing.T) {
+func Test_walkHelmValueFilesInPath(t *testing.T) {
 	t.Run("does not exist", func(t *testing.T) {
-		files, err := findHelmValueFilesInPath("/obviously/does/not/exist")
+		var files []string
+		root := "/obviously/does/not/exist"
+		err := filepath.Walk(root, walkHelmValueFilesInPath(root, &files))
 		assert.Error(t, err)
 		assert.Empty(t, files)
 	})
 	t.Run("values files", func(t *testing.T) {
-		files, err := findHelmValueFilesInPath("./testdata/values-files")
+		var files []string
+		root := "./testdata/values-files"
+		err := filepath.Walk(root, walkHelmValueFilesInPath(root, &files))
 		assert.NoError(t, err)
-		assert.Len(t, files, 4)
+		assert.Len(t, files, 5)
+	})
+	t.Run("unrelated root", func(t *testing.T) {
+		var files []string
+		root := "./testdata/values-files"
+		unrelated_root := "/different/root/path"
+		err := filepath.Walk(root, walkHelmValueFilesInPath(unrelated_root, &files))
+		assert.Error(t, err)
 	})
 }
 
@@ -2690,7 +2701,7 @@ func Test_populateHelmAppDetails(t *testing.T) {
 	err = populateHelmAppDetails(&res, appPath, appPath, &q, emptyTempPaths)
 	require.NoError(t, err)
 	assert.Len(t, res.Helm.Parameters, 3)
-	assert.Len(t, res.Helm.ValueFiles, 4)
+	assert.Len(t, res.Helm.ValueFiles, 5)
 }
 
 func Test_populateHelmAppDetails_values_symlinks(t *testing.T) {

diff --git a/reposerver/repository/testdata/values-files/dir/values.yaml b/reposerver/repository/testdata/values-files/dir/values.yaml
@@ -0,0 +1 @@
+values: yaml