public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix unused helm parameter in appendWaitFlags function 

Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-09-11 00:28:32 +00:00 committed by yxxhero
parent 3e35d584b0
commit 3e7843a47f
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/state/helmx.go
View File

@ -157,7 +157,7 @@ func (st *HelmState) appendWaitForJobsFlags(flags []string, release *ReleaseSpec
return flags 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 { switch {
case release.Wait != nil && *release.Wait: case release.Wait != nil && *release.Wait:
flags = append(flags, "--wait") flags = append(flags, "--wait")

16
pkg/state/helmx_test.go
View File

@ -76,7 +76,6 @@ func TestAppendWaitFlags(t *testing.T) {
name string name string
release *ReleaseSpec release *ReleaseSpec
syncOpts *SyncOpts syncOpts *SyncOpts
helm helmexec.Interface
helmSpec HelmSpec helmSpec HelmSpec
expected []string expected []string
}{ }{
@ -85,7 +84,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "release wait", name: "release wait",
release: &ReleaseSpec{Wait: &[]bool{true}[0]}, release: &ReleaseSpec{Wait: &[]bool{true}[0]},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.11.0"),
helmSpec: HelmSpec{}, helmSpec: HelmSpec{},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -93,7 +91,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "cli flags wait", name: "cli flags wait",
release: &ReleaseSpec{}, release: &ReleaseSpec{},
syncOpts: &SyncOpts{Wait: true}, syncOpts: &SyncOpts{Wait: true},
helm: testutil.NewVersionHelmExec("3.11.0"),
helmSpec: HelmSpec{}, helmSpec: HelmSpec{},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -101,7 +98,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "helm defaults wait", name: "helm defaults wait",
release: &ReleaseSpec{}, release: &ReleaseSpec{},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.11.0"),
helmSpec: HelmSpec{Wait: true}, helmSpec: HelmSpec{Wait: true},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -109,7 +105,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "release wait false", name: "release wait false",
release: &ReleaseSpec{Wait: &[]bool{false}[0]}, release: &ReleaseSpec{Wait: &[]bool{false}[0]},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.11.0"),
helmSpec: HelmSpec{Wait: true}, helmSpec: HelmSpec{Wait: true},
expected: []string{}, expected: []string{},
}, },
@ -117,7 +112,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "cli flags wait false", name: "cli flags wait false",
release: &ReleaseSpec{}, release: &ReleaseSpec{},
syncOpts: &SyncOpts{}, syncOpts: &SyncOpts{},
helm: testutil.NewVersionHelmExec("3.11.0"),
helmSpec: HelmSpec{Wait: true}, helmSpec: HelmSpec{Wait: true},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -125,7 +119,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "helm defaults wait false", name: "helm defaults wait false",
release: &ReleaseSpec{}, release: &ReleaseSpec{},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.11.0"),
helmSpec: HelmSpec{Wait: false}, helmSpec: HelmSpec{Wait: false},
expected: []string{}, expected: []string{},
}, },
@ -134,7 +127,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "release wait and retry unsupported", name: "release wait and retry unsupported",
release: &ReleaseSpec{Wait: &[]bool{true}[0], WaitRetries: &[]int{1}[0]}, release: &ReleaseSpec{Wait: &[]bool{true}[0], WaitRetries: &[]int{1}[0]},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.11.0"),
helmSpec: HelmSpec{}, helmSpec: HelmSpec{},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -142,7 +134,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "release wait and retry - retries ignored", name: "release wait and retry - retries ignored",
release: &ReleaseSpec{Wait: &[]bool{true}[0], WaitRetries: &[]int{1}[0]}, release: &ReleaseSpec{Wait: &[]bool{true}[0], WaitRetries: &[]int{1}[0]},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.15.0"),
helmSpec: HelmSpec{}, helmSpec: HelmSpec{},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -150,7 +141,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "no wait retry", name: "no wait retry",
release: &ReleaseSpec{WaitRetries: &[]int{1}[0]}, release: &ReleaseSpec{WaitRetries: &[]int{1}[0]},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.15.0"),
helmSpec: HelmSpec{}, helmSpec: HelmSpec{},
expected: []string{}, expected: []string{},
}, },
@ -158,7 +148,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "cli flags wait and retry - retries ignored", name: "cli flags wait and retry - retries ignored",
release: &ReleaseSpec{}, release: &ReleaseSpec{},
syncOpts: &SyncOpts{Wait: true, WaitRetries: 2}, syncOpts: &SyncOpts{Wait: true, WaitRetries: 2},
helm: testutil.NewVersionHelmExec("3.15.0"),
helmSpec: HelmSpec{}, helmSpec: HelmSpec{},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -166,7 +155,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "helm defaults wait retry - retries ignored", name: "helm defaults wait retry - retries ignored",
release: &ReleaseSpec{}, release: &ReleaseSpec{},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.15.0"),
helmSpec: HelmSpec{Wait: true, WaitRetries: 3}, helmSpec: HelmSpec{Wait: true, WaitRetries: 3},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -174,7 +162,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "release wait default retries - retries ignored", name: "release wait default retries - retries ignored",
release: &ReleaseSpec{Wait: &[]bool{true}[0]}, release: &ReleaseSpec{Wait: &[]bool{true}[0]},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.15.0"),
helmSpec: HelmSpec{WaitRetries: 4}, helmSpec: HelmSpec{WaitRetries: 4},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -182,7 +169,6 @@ func TestAppendWaitFlags(t *testing.T) {
name: "release retries default wait - retries ignored", name: "release retries default wait - retries ignored",
release: &ReleaseSpec{WaitRetries: &[]int{5}[0]}, release: &ReleaseSpec{WaitRetries: &[]int{5}[0]},
syncOpts: nil, syncOpts: nil,
helm: testutil.NewVersionHelmExec("3.15.0"),
helmSpec: HelmSpec{Wait: true}, helmSpec: HelmSpec{Wait: true},
expected: []string{"--wait"}, expected: []string{"--wait"},
}, },
@ -192,7 +178,7 @@ func TestAppendWaitFlags(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
st := &HelmState{} st := &HelmState{}
st.HelmDefaults = tt.helmSpec 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) require.Equalf(t, tt.expected, got, "appendWaitFlags() = %v, want %v", got, tt.expected)
}) })
} }

2
pkg/state/state.go
View File

@ -2799,7 +2799,7 @@ func (st *HelmState) flagsForUpgrade(helm helmexec.Interface, release *ReleaseSp
flags = st.appendChartVersionFlags(flags, release) flags = st.appendChartVersionFlags(flags, release)
flags = st.appendEnableDNSFlags(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) flags = st.appendWaitForJobsFlags(flags, release, opt)
// non-OCI chart should be verified here // non-OCI chart should be verified here