From 28e13c3a1894124c35479600d5eceb17761225f2 Mon Sep 17 00:00:00 2001 From: Ilya Vassyutovich Date: Sat, 6 Jun 2020 03:31:25 +0300 Subject: [PATCH] typo: Fix message for detected diff (#1284) --- pkg/app/app.go | 2 +- pkg/app/diff_test.go | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index 294379e4..cf1aef15 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -193,7 +193,7 @@ func (a *App) Diff(c DiffConfigProvider) error { // See https://github.com/roboll/helmfile/issues/749 code := 2 e := &Error{ - msg: "Identified at least on change", + msg: "Identified at least one change", code: &code, } return e diff --git a/pkg/app/diff_test.go b/pkg/app/diff_test.go index 2069fdd3..8b5127e2 100644 --- a/pkg/app/diff_test.go +++ b/pkg/app/diff_test.go @@ -172,7 +172,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ // noop on frontend-v2 exectest.DiffKey{Name: "frontend-v2", Chart: "charts/frontend", Flags: "--kube-contextdefault--detailed-exitcode"}: nil, @@ -389,7 +389,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -461,7 +461,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -483,7 +483,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -506,7 +506,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--namespacetestNamespace--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--namespacetestNamespace--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -529,7 +529,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--namespacetestNamespace--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--namespacetestNamespace--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -553,7 +553,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--namespacens2--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--namespacens1--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -577,7 +577,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--namespacens2--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--namespacens1--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -604,7 +604,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--tiller-namespacetns2--kube-contextdefault--namespacens2--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--tiller-namespacetns1--kube-contextdefault--namespacens1--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -630,7 +630,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--tiller-namespacetns2--kube-contextdefault--namespacens2--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--tiller-namespacetns1--kube-contextdefault--namespacens1--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -705,7 +705,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -737,7 +737,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -771,7 +771,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -803,7 +803,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -835,7 +835,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -867,7 +867,7 @@ releases: `, }, detailedExitcode: true, - error: "Identified at least on change", + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ exectest.DiffKey{Name: "bar", Chart: "mychart2", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -925,7 +925,7 @@ releases: upgraded: []exectest.Release{}, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - error: "Identified at least on change", + error: "Identified at least one change", 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[]}