fix "concurrent map read/write" panics

Fixes #737
roboll · Jul 3, 2019 · 7f2d006 · 7f2d006
1 parent b82f77e
commit 7f2d006
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/pkg/state/state.go b/pkg/state/state.go
@@ -10,6 +10,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/roboll/helmfile/pkg/environment"
 	"github.com/roboll/helmfile/pkg/event"
@@ -58,6 +59,9 @@ type HelmState struct {
 	tempDir    func(string, string) (string, error)
 
 	runner helmexec.Runner
+
+	vals      map[string]interface{}
+	valsMutex sync.Mutex
 }
 
 // SubHelmfileSpec defines the subhelmfile path and options

diff --git a/pkg/state/state_exec_tmpl.go b/pkg/state/state_exec_tmpl.go
@@ -8,6 +8,12 @@ import (
 )
 
 func (st *HelmState) Values() (map[string]interface{}, error) {
+	st.valsMutex.Lock()
+	defer st.valsMutex.Unlock()
+	if st.vals != nil {
+		return st.vals, nil
+	}
+
 	vals := map[string]interface{}{}
 
 	if err := mergo.Merge(&vals, st.Env.Defaults, mergo.WithOverride); err != nil {
@@ -22,6 +28,8 @@ func (st *HelmState) Values() (map[string]interface{}, error) {
 		return nil, err
 	}
 
+	st.vals = vals
+
 	return vals, nil
 }