ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terraform: remove data race around validation

This commit is contained in:
Mitchell Hashimoto 2014-07-10 13:36:06 -07:00
parent d257d3623f
commit 9c9f478811
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
terraform/context.go
View File

@ -693,6 +693,8 @@ func (c *Context) refreshWalkFn() depgraph.WalkFunc {
} }
func (c *Context) validateWalkFn(rws *[]string, res *[]error) depgraph.WalkFunc { func (c *Context) validateWalkFn(rws *[]string, res *[]error) depgraph.WalkFunc {
var l sync.Mutex
return func(n *depgraph.Noun) error { return func(n *depgraph.Noun) error {
// If it is the root node, ignore // If it is the root node, ignore
if n.Name == GraphRootNode { if n.Name == GraphRootNode {
@ -719,8 +721,11 @@ func (c *Context) validateWalkFn(rws *[]string, res *[]error) depgraph.WalkFunc
for i, e := range es { for i, e := range es {
es[i] = fmt.Errorf("'%s' error: %s", rn.Resource.Id, e) es[i] = fmt.Errorf("'%s' error: %s", rn.Resource.Id, e)
} }
l.Lock()
*rws = append(*rws, ws...) *rws = append(*rws, ws...)
*res = append(*res, es...) *res = append(*res, es...)
l.Unlock()
for idx, p := range rn.Resource.Provisioners { for idx, p := range rn.Resource.Provisioners {
ws, es := p.Provisioner.Validate(p.Config) ws, es := p.Provisioner.Validate(p.Config)
@ -730,8 +735,11 @@ func (c *Context) validateWalkFn(rws *[]string, res *[]error) depgraph.WalkFunc
for i, e := range es { for i, e := range es {
es[i] = fmt.Errorf("'%s.provisioner.%d' error: %s", rn.Resource.Id, idx, e) es[i] = fmt.Errorf("'%s.provisioner.%d' error: %s", rn.Resource.Id, idx, e)
} }
l.Lock()
*rws = append(*rws, ws...) *rws = append(*rws, ws...)
*res = append(*res, es...) *res = append(*res, es...)
l.Unlock()
} }
case *GraphNodeResourceProvider: case *GraphNodeResourceProvider:
@ -751,8 +759,10 @@ func (c *Context) validateWalkFn(rws *[]string, res *[]error) depgraph.WalkFunc
es[i] = fmt.Errorf("Provider '%s' error: %s", k, e) es[i] = fmt.Errorf("Provider '%s' error: %s", k, e)
} }
l.Lock()
*rws = append(*rws, ws...) *rws = append(*rws, ws...)
*res = append(*res, es...) *res = append(*res, es...)
l.Unlock()
} }
} }