From 1e956ae8a5cd6c7d69e7d9c3b2b6245a37b01b27 Mon Sep 17 00:00:00 2001
From: KUOKA Yusuke <ykuoka@gmail.com>
Date: Wed, 22 Jul 2020 22:33:45 +0900
Subject: [PATCH] Fix list failure when patches are used (#1371)

Fixes #1368
---
 pkg/app/app.go | 4 ++--
 pkg/app/run.go | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/app/app.go b/pkg/app/app.go
index 235e9646..ad006a8b 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -342,7 +342,7 @@ func (a *App) Test(c TestConfigProvider) error {
 
 func (a *App) PrintState(c StateConfigProvider) error {
 	return a.VisitDesiredStatesWithReleasesFiltered(a.FileOrDir, func(st *state.HelmState) (errs []error) {
-		err := NewRun(st, nil, NewContext()).withPreparedCharts(false, "build", func() {
+		err := NewRun(st, a.getHelm(st), NewContext()).withPreparedCharts(false, "build", func() {
 			state, err := st.ToYaml()
 			if err != nil {
 				errs = []error{err}
@@ -365,7 +365,7 @@ func (a *App) ListReleases(c ListConfigProvider) error {
 	var releases []*HelmRelease
 
 	err := a.VisitDesiredStatesWithReleasesFiltered(a.FileOrDir, func(st *state.HelmState) []error {
-		err := NewRun(st, nil, NewContext()).withPreparedCharts(false, "list", func() {
+		err := NewRun(st, a.getHelm(st), NewContext()).withPreparedCharts(false, "list", func() {
 
 			//var releases m
 			for _, r := range st.Releases {
diff --git a/pkg/app/run.go b/pkg/app/run.go
index 2e3f2eb0..68fe79f5 100644
--- a/pkg/app/run.go
+++ b/pkg/app/run.go
@@ -22,6 +22,10 @@ type Run struct {
 }
 
 func NewRun(st *state.HelmState, helm helmexec.Interface, ctx Context) *Run {
+	if helm == nil {
+		panic("Assertion failed: helmexec.Interface must not be nil")
+	}
+
 	return &Run{state: st, helm: helm, ctx: ctx}
 }