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

terraform: fix data race

This commit is contained in:
Mitchell Hashimoto 2014-07-01 10:11:07 -07:00
parent bce5d55a85
commit 4b74ddc9d1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
terraform/terraform.go
View File

@ -297,7 +297,7 @@ func (t *Terraform) planWalkFn(result *Plan, opts *PlanOpts) depgraph.WalkFunc {
func (t *Terraform) genericWalkFn( func (t *Terraform) genericWalkFn(
invars map[string]string, invars map[string]string,
cb genericWalkFunc) depgraph.WalkFunc { cb genericWalkFunc) depgraph.WalkFunc {
var l sync.Mutex var l sync.RWMutex
// Initialize the variables for application // Initialize the variables for application
vars := make(map[string]string) vars := make(map[string]string)
@ -334,6 +334,8 @@ func (t *Terraform) genericWalkFn(
} }
rn := n.Meta.(*GraphNodeResource) rn := n.Meta.(*GraphNodeResource)
l.RLock()
if len(vars) > 0 && rn.Config != nil { if len(vars) > 0 && rn.Config != nil {
if err := rn.Config.RawConfig.Interpolate(vars); err != nil { if err := rn.Config.RawConfig.Interpolate(vars); err != nil {
panic(fmt.Sprintf("Interpolate error: %s", err)) panic(fmt.Sprintf("Interpolate error: %s", err))
@ -342,6 +344,7 @@ func (t *Terraform) genericWalkFn(
// Force the config to be set later // Force the config to be set later
rn.Resource.Config = nil rn.Resource.Config = nil
} }
l.RUnlock()
// Make sure that at least some resource configuration is set // Make sure that at least some resource configuration is set
if !rn.Orphan { if !rn.Orphan {