diff --git a/pkg/state/helmx.go b/pkg/state/helmx.go index b48e6ac8..c906f61d 100644 --- a/pkg/state/helmx.go +++ b/pkg/state/helmx.go @@ -157,7 +157,7 @@ func (st *HelmState) appendWaitForJobsFlags(flags []string, release *ReleaseSpec return flags } -func (st *HelmState) appendWaitFlags(flags []string, helm helmexec.Interface, release *ReleaseSpec, ops *SyncOpts) []string { +func (st *HelmState) appendWaitFlags(flags []string, release *ReleaseSpec, ops *SyncOpts) []string { switch { case release.Wait != nil && *release.Wait: flags = append(flags, "--wait") diff --git a/pkg/state/helmx_test.go b/pkg/state/helmx_test.go index d03318cb..78c0c3d1 100644 --- a/pkg/state/helmx_test.go +++ b/pkg/state/helmx_test.go @@ -76,7 +76,6 @@ func TestAppendWaitFlags(t *testing.T) { name string release *ReleaseSpec syncOpts *SyncOpts - helm helmexec.Interface helmSpec HelmSpec expected []string }{ @@ -85,7 +84,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "release wait", release: &ReleaseSpec{Wait: &[]bool{true}[0]}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.11.0"), helmSpec: HelmSpec{}, expected: []string{"--wait"}, }, @@ -93,7 +91,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "cli flags wait", release: &ReleaseSpec{}, syncOpts: &SyncOpts{Wait: true}, - helm: testutil.NewVersionHelmExec("3.11.0"), helmSpec: HelmSpec{}, expected: []string{"--wait"}, }, @@ -101,7 +98,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "helm defaults wait", release: &ReleaseSpec{}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.11.0"), helmSpec: HelmSpec{Wait: true}, expected: []string{"--wait"}, }, @@ -109,7 +105,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "release wait false", release: &ReleaseSpec{Wait: &[]bool{false}[0]}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.11.0"), helmSpec: HelmSpec{Wait: true}, expected: []string{}, }, @@ -117,7 +112,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "cli flags wait false", release: &ReleaseSpec{}, syncOpts: &SyncOpts{}, - helm: testutil.NewVersionHelmExec("3.11.0"), helmSpec: HelmSpec{Wait: true}, expected: []string{"--wait"}, }, @@ -125,7 +119,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "helm defaults wait false", release: &ReleaseSpec{}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.11.0"), helmSpec: HelmSpec{Wait: false}, expected: []string{}, }, @@ -134,7 +127,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "release wait and retry unsupported", release: &ReleaseSpec{Wait: &[]bool{true}[0], WaitRetries: &[]int{1}[0]}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.11.0"), helmSpec: HelmSpec{}, expected: []string{"--wait"}, }, @@ -142,7 +134,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "release wait and retry - retries ignored", release: &ReleaseSpec{Wait: &[]bool{true}[0], WaitRetries: &[]int{1}[0]}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.15.0"), helmSpec: HelmSpec{}, expected: []string{"--wait"}, }, @@ -150,7 +141,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "no wait retry", release: &ReleaseSpec{WaitRetries: &[]int{1}[0]}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.15.0"), helmSpec: HelmSpec{}, expected: []string{}, }, @@ -158,7 +148,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "cli flags wait and retry - retries ignored", release: &ReleaseSpec{}, syncOpts: &SyncOpts{Wait: true, WaitRetries: 2}, - helm: testutil.NewVersionHelmExec("3.15.0"), helmSpec: HelmSpec{}, expected: []string{"--wait"}, }, @@ -166,7 +155,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "helm defaults wait retry - retries ignored", release: &ReleaseSpec{}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.15.0"), helmSpec: HelmSpec{Wait: true, WaitRetries: 3}, expected: []string{"--wait"}, }, @@ -174,7 +162,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "release wait default retries - retries ignored", release: &ReleaseSpec{Wait: &[]bool{true}[0]}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.15.0"), helmSpec: HelmSpec{WaitRetries: 4}, expected: []string{"--wait"}, }, @@ -182,7 +169,6 @@ func TestAppendWaitFlags(t *testing.T) { name: "release retries default wait - retries ignored", release: &ReleaseSpec{WaitRetries: &[]int{5}[0]}, syncOpts: nil, - helm: testutil.NewVersionHelmExec("3.15.0"), helmSpec: HelmSpec{Wait: true}, expected: []string{"--wait"}, }, @@ -192,7 +178,7 @@ func TestAppendWaitFlags(t *testing.T) { t.Run(tt.name, func(t *testing.T) { st := &HelmState{} st.HelmDefaults = tt.helmSpec - got := st.appendWaitFlags([]string{}, tt.helm, tt.release, tt.syncOpts) + got := st.appendWaitFlags([]string{}, tt.release, tt.syncOpts) require.Equalf(t, tt.expected, got, "appendWaitFlags() = %v, want %v", got, tt.expected) }) } diff --git a/pkg/state/state.go b/pkg/state/state.go index 8af1561a..85f8dee9 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -2799,7 +2799,7 @@ func (st *HelmState) flagsForUpgrade(helm helmexec.Interface, release *ReleaseSp flags = st.appendChartVersionFlags(flags, release) flags = st.appendEnableDNSFlags(flags, release) - flags = st.appendWaitFlags(flags, helm, release, opt) + flags = st.appendWaitFlags(flags, release, opt) flags = st.appendWaitForJobsFlags(flags, release, opt) // non-OCI chart should be verified here