helm/chart-testing
1
0
Fork 0
mirror of https://github.com/helm/chart-testing.git synced 2026-02-05 09:45:14 +01:00
Code Issues Activity

Fix regression in changed chart detection (#85)

Browse Source 
* Fix regression in changed chart detection

 Please enter the commit message for your changes. Lines starting

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>

* Refactor to consider charts at root

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>

* Make sure charts are processed only once

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>

* Fix typo

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
This commit is contained in:
Reinhard Nägele
2019-01-20 23:15:48 +01:00
committed by Scott Rigby
parent fa29453c5b
commit b679b85de0
3 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/chart/chart.go
View File

@@ -119,11 +119,11 @@ type DirectoryLister interface {
// ChartUtils is the interface that wraps chart-related methods
//
// IsChartdir checks if a directory is a chart directory
// LookupChartDir looks up the chart's root directory based on some chart file that has changed
//
// ReadChartYaml reads the `Chart.yaml` from the specified directory
type ChartUtils interface {
IsChartDir(dir string) bool
LookupChartDir(chartDirs []string, dir string) (string, error)
ReadChartYaml(dir string) (*util.ChartYaml, error)
}
@@ -433,9 +433,15 @@ func (t *Testing) ComputeChangedChartDirectories() ([]string, error) {
continue
}
dir := filepath.Dir(file)
// Only add if not already in list and double-check if it is a chart directory
if !util.StringSliceContains(changedChartDirs, dir) && t.chartUtils.IsChartDir(dir) {
changedChartDirs = append(changedChartDirs, dir)
// Make sure directory is really a chart directory
chartDir, err := t.chartUtils.LookupChartDir(cfg.ChartDirs, dir)
if err == nil {
// Only add it if not already in the list
if !util.StringSliceContains(changedChartDirs, chartDir) {
changedChartDirs = append(changedChartDirs, chartDir)
}
} else {
fmt.Printf("Directory '%s' is no chart directory. Skipping...", chartDir)
}
}
@@ -451,7 +457,8 @@ func (t *Testing) ReadAllChartDirectories() ([]string, error) {
for _, chartParentDir := range cfg.ChartDirs {
dirs, err := t.directoryLister.ListChildDirs(chartParentDir,
func(dir string) bool {
return t.chartUtils.IsChartDir(dir) && !util.StringSliceContains(cfg.ExcludedCharts, path.Base(dir))
_, err := t.chartUtils.LookupChartDir(chartDirs, dir)
return err == nil && !util.StringSliceContains(cfg.ExcludedCharts, path.Base(dir))
})
if err != nil {
return nil, errors.Wrap(err, "Error reading chart directories")

9
pkg/chart/chart_test.go
View File

@@ -51,7 +51,7 @@ func (g fakeGit) ListChangedFilesInDirs(commit string, dirs ...string) ([]string
"incubator/excluded/values.yaml",
"stable/blah/Chart.yaml",
"stable/blah/README.md",
"stable/this-is-no-chart-dir/foo.md",
"foo/this-is-no-chart-dir/foo.md",
}, nil
}
@@ -76,8 +76,11 @@ func (l fakeDirLister) ListChildDirs(parentDir string, test func(dir string) boo
type fakeChartUtils struct{}
func (v fakeChartUtils) IsChartDir(dir string) bool {
return dir != "stable/this-is-no-chart-dir"
func (v fakeChartUtils) LookupChartDir(chartDirs []string, dir string) (string, error) {
if strings.HasPrefix(dir, "foo") {
return "", errors.New("no chart dir")
}
return dir, nil
}
func (v fakeChartUtils) ReadChartYaml(dir string) (*util.ChartYaml, error) {

19
pkg/util/util.go
View File

@@ -23,6 +23,7 @@ import (
"math/rand"
"os"
"path"
"path/filepath"
"strings"
"time"
)
@@ -121,8 +122,22 @@ func (l DirectoryLister) ListChildDirs(parentDir string, test func(dir string) b
type ChartUtils struct{}
func (u ChartUtils) IsChartDir(dir string) bool {
return FileExists(path.Join(dir, "Chart.yaml"))
func (u ChartUtils) LookupChartDir(chartDirs []string, dir string) (string, error) {
for _, chartDir := range chartDirs {
currentDir := dir
for {
if FileExists(path.Join(currentDir, "Chart.yaml")) {
return currentDir, nil
}
currentDir = filepath.Dir(currentDir)
relativeDir, _ := filepath.Rel(chartDir, currentDir)
joined := filepath.Join(chartDir, relativeDir)
if joined == chartDir {
break
}
}
}
return "", errors.New("no chart directory")
}
func (u ChartUtils) ReadChartYaml(dir string) (*ChartYaml, error) {