fix: unexpected no releases found for any helmfiles on helmfiles: config (#318)

Fixes #315
Fixes #316

state/create.go

@@ -30,14 +30,38 @@ func (e *UndefinedEnvError) Error() string {
 	return e.msg
 }
 
-func CreateFromYaml(content []byte, file string, env string, logger *zap.SugaredLogger) (*HelmState, error) {
-	return createFromYamlWithFileReader(content, file, env, logger, ioutil.ReadFile)
+func createFromYaml(content []byte, file string, env string, logger *zap.SugaredLogger) (*HelmState, error) {
+	c := &creator{
+		logger,
+		ioutil.ReadFile,
+		filepath.Abs,
+	}
+	return c.CreateFromYaml(content, file, env)
 }
 
-func createFromYamlWithFileReader(content []byte, file string, env string, logger *zap.SugaredLogger, readFile func(string) ([]byte, error)) (*HelmState, error) {
+type creator struct {
+	logger   *zap.SugaredLogger
+	readFile func(string) ([]byte, error)
+	abs      func(string) (string, error)
+}
+
+func NewCreator(logger *zap.SugaredLogger, readFile func(string) ([]byte, error), abs func(string) (string, error)) *creator {
+	return &creator{
+		logger:   logger,
+		readFile: readFile,
+		abs:      abs,
+	}
+}
+
+func (c *creator) CreateFromYaml(content []byte, file string, env string) (*HelmState, error) {
 	var state HelmState
 
-	state.basePath, _ = filepath.Abs(filepath.Dir(file))
+	basePath, err := c.abs(filepath.Dir(file))
+	if err != nil {
+		return nil, &StateLoadError{fmt.Sprintf("failed to read %s", file), err}
+	}
+	state.basePath = basePath
+
 	if err := yaml.UnmarshalStrict(content, &state); err != nil {
 		return nil, &StateLoadError{fmt.Sprintf("failed to read %s", file), err}
 	}
@@ -51,15 +75,15 @@ func createFromYamlWithFileReader(content []byte, file string, env string, logge
 		state.DeprecatedReleases = []ReleaseSpec{}
 	}
 
-	state.logger = logger
+	state.logger = c.logger
 
-	e, err := state.loadEnv(env, readFile)
+	e, err := state.loadEnv(env, c.readFile)
 	if err != nil {
 		return nil, &StateLoadError{fmt.Sprintf("failed to read %s", file), err}
 	}
 	state.env = *e
 
-	state.readFile = readFile
+	state.readFile = c.readFile
 
 	return &state, nil
 }

state/create_test.go

@@ -2,6 +2,7 @@ package state
 
 import (
 	"fmt"
+	"path/filepath"
 	"reflect"
 	"testing"
 )
@@ -13,7 +14,7 @@ func TestReadFromYaml(t *testing.T) {
   namespace: mynamespace
   chart: mychart
 `)
-	state, err := CreateFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
+	state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
 	if err != nil {
 		t.Errorf("unxpected error: %v", err)
 	}
@@ -36,7 +37,7 @@ func TestReadFromYaml_InexistentEnv(t *testing.T) {
   namespace: mynamespace
   chart: mychart
 `)
-	_, err := CreateFromYaml(yamlContent, yamlFile, "production", logger)
+	_, err := createFromYaml(yamlContent, yamlFile, "production", logger)
 	if err == nil {
 		t.Error("expected error")
 	}
@@ -97,7 +98,7 @@ bar: {{ readFile "bar.txt" }}
 		return nil, fmt.Errorf("unexpected filename: %s", filename)
 	}
 
-	state, err := createFromYamlWithFileReader(yamlContent, yamlFile, "production", logger, readFile)
+	state, err := NewCreator(logger, readFile, filepath.Abs).CreateFromYaml(yamlContent, yamlFile, "production")
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -125,7 +126,7 @@ func TestReadFromYaml_StrictUnmarshalling(t *testing.T) {
   namespace: mynamespace
   releases: mychart
 `)
-	_, err := CreateFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
+	_, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
 	if err == nil {
 		t.Error("expected an error for wrong key 'releases' which is not in struct")
 	}
@@ -137,7 +138,7 @@ func TestReadFromYaml_DeprecatedReleaseReferences(t *testing.T) {
 - name: myrelease
   chart: mychart
 `)
-	state, err := CreateFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
+	state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
 	if err != nil {
 		t.Errorf("unxpected error: %v", err)
 	}
@@ -159,7 +160,7 @@ releases:
 - name: myrelease2
   chart: mychart2
 `)
-	_, err := CreateFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
+	_, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
 	if err == nil {
 		t.Error("expected error")
 	}
@@ -195,7 +196,7 @@ func TestReadFromYaml_FilterReleasesOnLabels(t *testing.T) {
 		{LabelFilter{positiveLabels: [][]string{[]string{"tier", "frontend"}}, negativeLabels: [][]string{[]string{"foo", "bar"}}},
 			[]bool{false, true, false}},
 	}
-	state, err := CreateFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
+	state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -234,7 +235,7 @@ func TestReadFromYaml_FilterNegatives(t *testing.T) {
 		{LabelFilter{negativeLabels: [][]string{[]string{"stage", "pre"}, []string{"stage", "post"}}},
 			[]bool{false, false, true}},
 	}
-	state, err := CreateFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
+	state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}

state/state.go

@@ -742,10 +742,8 @@ func (state *HelmState) FilterReleases(labels []string) error {
 		filteredReleases = append(filteredReleases, r)
 	}
 	state.Releases = filteredReleases
-	if len(filteredReleases) == 0 {
-		state.logger.Debugf("specified selector did not match any releases in %s\n", state.FilePath)
-		return nil
-	}
+	numFound := len(filteredReleases)
+	state.logger.Debugf("%d release(s) matching %s found in %s\n", numFound, strings.Join(labels, ","), state.FilePath)
 	return nil
 }