Merge pull request #105 from moul/fix/gfanton/store-concurrency

fix(store): Fix store concurrency

helpers/helpers.go

@@ -6,6 +6,7 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
+	"sync"
 	"text/template"
 
 	"github.com/Masterminds/sprig"
@@ -22,13 +23,6 @@ var (
 	registry *ggdescriptor.Registry // some helpers need access to registry
 )
 
-// Utility to store some vars across multiple scope
-var store = make(map[string]interface{})
-
-func SetRegistry(reg *ggdescriptor.Registry) {
-	registry = reg
-}
-
 var ProtoHelpersFuncMap = template.FuncMap{
 	"string": func(i interface {
 		String() string
@@ -166,19 +160,50 @@ var ProtoHelpersFuncMap = template.FuncMap{
 
 var pathMap map[interface{}]*descriptor.SourceCodeInfo_Location
 
-func setStore(key string, i interface{}) string {
+var store = newStore()
-	store[key] = i
+
-	return ""
+// Utility to store some vars across multiple scope
+type globalStore struct {
+	store map[string]interface{}
+	mu    sync.Mutex
 }
 
-func getStore(s string) interface{} {
+func newStore() *globalStore {
-	if v, ok := store[s]; ok {
+	return &globalStore{
+		store: make(map[string]interface{}),
+	}
+}
+
+func (s *globalStore) getData(key string) interface{} {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	if v, ok := s.store[key]; ok {
 		return v
 	}
 
 	return false
 }
 
+func (s *globalStore) setData(key string, o interface{}) {
+	s.mu.Lock()
+	s.store[key] = o
+	s.mu.Unlock()
+}
+
+func setStore(key string, o interface{}) string {
+	store.setData(key, o)
+	return ""
+}
+
+func getStore(key string) interface{} {
+	return store.getData(key)
+}
+
+func SetRegistry(reg *ggdescriptor.Registry) {
+	registry = reg
+}
+
 func InitPathMap(file *descriptor.FileDescriptorProto) {
 	pathMap = make(map[interface{}]*descriptor.SourceCodeInfo_Location)
 	addToPathMap(file.GetSourceCodeInfo(), file, []int32{})