Do cleanup decrypted env secrets files (#1304)

* Do cleanup decrypted env secrets files

Resolves #503

pkg/app/app.go

@@ -38,6 +38,7 @@ type App struct {
 	FileOrDir string
 
 	readFile          func(string) ([]byte, error)
+	deleteFile        func(string) error
 	fileExists        func(string) (bool, error)
 	glob              func(string) ([]string, error)
 	abs               func(string) (string, error)
@@ -82,6 +83,7 @@ func New(conf ConfigProvider) *App {
 
 func Init(app *App) *App {
 	app.readFile = ioutil.ReadFile
+	app.deleteFile = os.Remove
 	app.glob = filepath.Glob
 	app.abs = filepath.Abs
 	app.getwd = os.Getwd
@@ -482,6 +484,7 @@ func (a *App) loadDesiredStateFromYaml(file string, opts ...LoadOpts) (*state.He
 
 	ld := &desiredStateLoader{
 		readFile:   a.readFile,
+		deleteFile: a.deleteFile,
 		fileExists: a.fileExists,
 		env:        a.Env,
 		namespace:  a.Namespace,

pkg/app/desired_state_file_loader.go

@@ -28,6 +28,7 @@ type desiredStateLoader struct {
 	namespace string
 
 	readFile   func(string) ([]byte, error)
+	deleteFile func(string) error
 	fileExists func(string) (bool, error)
 	abs        func(string) (string, error)
 	glob       func(string) ([]string, error)
@@ -150,6 +151,7 @@ func (ld *desiredStateLoader) loadFileWithOverrides(inheritedEnv, overrodeEnv *e
 
 func (a *desiredStateLoader) underlying() *state.StateCreator {
 	c := state.NewCreator(a.logger, a.readFile, a.fileExists, a.abs, a.glob, a.valsRuntime, a.getHelm, a.overrideHelmBinary, a.remote)
+	c.DeleteFile = a.deleteFile
 	c.LoadFile = a.loadFile
 	return c
 }

pkg/app/run.go

@@ -63,7 +63,7 @@ func (r *Run) withPreparedCharts(forceDownload bool, helmfileCommand string, f f
 		return err
 	}
 
-	releaseToChart, errs := state.PrepareCharts(r.helm, r.state, dir, 2, helmfileCommand, forceDownload)
+	releaseToChart, errs := r.state.PrepareCharts(r.helm, dir, 2, helmfileCommand, forceDownload)
 
 	if len(errs) > 0 {
 		return fmt.Errorf("%v", errs)