From fea62032e9c76e032496d517af7e99f67f3844b3 Mon Sep 17 00:00:00 2001
From: Vincent Behar <v.behar@free.fr>
Date: Mon, 31 Dec 2018 17:33:16 +0100
Subject: [PATCH] fix: cleanup hook executed too early for apply command (#426)

fixes https://github.com/roboll/helmfile/issues/412

the `apply` command first runs the `diff` command, which triggers the execution of the `cleanup` hooks at the end of the `diff`.
---
 main.go        | 3 ++-
 state/state.go | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 4bb9b666..6c1acfb8 100644
--- a/main.go
+++ b/main.go
@@ -548,8 +548,9 @@ func executeDiffCommand(c *cli.Context, st *state.HelmState, helm helmexec.Inter
 
 	values := c.StringSlice("values")
 	workers := c.Int("concurrency")
+	triggerCleanupEvents := c.Command.HasName("diff")
 
-	return st.DiffReleases(helm, values, workers, detailedExitCode, suppressSecrets)
+	return st.DiffReleases(helm, values, workers, detailedExitCode, suppressSecrets, triggerCleanupEvents)
 }
 
 type app struct {
diff --git a/state/state.go b/state/state.go
index 04cccfa7..fd80c988 100644
--- a/state/state.go
+++ b/state/state.go
@@ -644,7 +644,7 @@ func (state *HelmState) prepareDiffReleases(helm helmexec.Interface, additionalV
 
 // DiffReleases wrapper for executing helm diff on the releases
 // It returns releases that had any changes
-func (state *HelmState) DiffReleases(helm helmexec.Interface, additionalValues []string, workerLimit int, detailedExitCode, suppressSecrets bool) ([]*ReleaseSpec, []error) {
+func (state *HelmState) DiffReleases(helm helmexec.Interface, additionalValues []string, workerLimit int, detailedExitCode, suppressSecrets bool, triggerCleanupEvents bool) ([]*ReleaseSpec, []error) {
 	preps, prepErrs := state.prepareDiffReleases(helm, additionalValues, workerLimit, detailedExitCode, suppressSecrets)
 	if len(prepErrs) > 0 {
 		return []*ReleaseSpec{}, prepErrs
@@ -682,8 +682,10 @@ func (state *HelmState) DiffReleases(helm helmexec.Interface, additionalValues [
 					results <- diffResult{}
 				}
 
-				if _, err := state.triggerCleanupEvent(prep.release, "diff"); err != nil {
-					state.logger.Warnf("warn: %v\n", err)
+				if triggerCleanupEvents {
+					if _, err := state.triggerCleanupEvent(prep.release, "diff"); err != nil {
+						state.logger.Warnf("warn: %v\n", err)
+					}
 				}
 			}
 			waitGroup.Done()