From 7c80a859fac4ce4490499250a4593db6a1a3ec62 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sun, 1 Mar 2020 17:23:03 -0600 Subject: [PATCH] Fix awkward dependency error message (#1130) --- pkg/app/app_test.go | 4 ++-- pkg/state/create_test.go | 2 +- pkg/state/state_run.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go index d91edf1d..06c8e211 100644 --- a/pkg/app/app_test.go +++ b/pkg/app/app_test.go @@ -3379,7 +3379,7 @@ releases: upgraded: []exectest.Release{}, deleted: []exectest.Release{}, concurrency: 1, - error: `in ./helmfile.yaml: "foo" has dependency to inexistent release "bar"`, + error: `in ./helmfile.yaml: "foo" depends on nonexistent release "bar"`, log: `processing file "helmfile.yaml" in directory "." first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= first-pass uses: &{default map[] map[]} @@ -3421,7 +3421,7 @@ Affected releases are: baz (mychart3) UPDATED foo (mychart1) UPDATED -err: "foo" has dependency to inexistent release "bar" +err: "foo" depends on nonexistent release "bar" `, }, } diff --git a/pkg/state/create_test.go b/pkg/state/create_test.go index d70f9c8a..d42db9bb 100644 --- a/pkg/state/create_test.go +++ b/pkg/state/create_test.go @@ -46,7 +46,7 @@ func TestReadFromYaml(t *testing.T) { } } -func TestReadFromYaml_InexistentEnv(t *testing.T) { +func TestReadFromYaml_NonexistentEnv(t *testing.T) { yamlFile := "example/path/to/yaml/file" yamlContent := []byte(`releases: - name: myrelease diff --git a/pkg/state/state_run.go b/pkg/state/state_run.go index 4cedf96c..e9050394 100644 --- a/pkg/state/state_run.go +++ b/pkg/state/state_run.go @@ -160,7 +160,7 @@ func GroupReleasesByDependency(releases []Release) ([][]Release, error) { for _, n := range r.Needs { if _, ok := idToReleases[n]; !ok { id := ReleaseToID(&r.ReleaseSpec) - return nil, fmt.Errorf("%q has dependency to inexistent release %q", id, n) + return nil, fmt.Errorf("%q depends on nonexistent release %q", id, n) } } }