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

terraform: put quotes before vertex name to avoid false panicwrap 

Fixes #9395
This commit is contained in:
Mitchell Hashimoto 2016-10-23 14:23:36 -07:00
parent 7cb2e69457
commit 83b1c82e93
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dag/dag.go
View File

@ -206,11 +206,11 @@ func (g *AcyclicGraph) Walk(cb WalkFunc) error {
case <-ch: case <-ch:
break DepSatisfied break DepSatisfied
case <-time.After(time.Second * 5): case <-time.After(time.Second * 5):
log.Printf("[DEBUG] vertex %s, waiting for: %s", log.Printf("[DEBUG] vertex %q, waiting for: %q",
VertexName(v), VertexName(deps[i])) VertexName(v), VertexName(deps[i]))
} }
} }
log.Printf("[DEBUG] vertex %s, got dep: %s", log.Printf("[DEBUG] vertex %q, got dep: %q",
VertexName(v), VertexName(deps[i])) VertexName(v), VertexName(deps[i]))
} }

4
terraform/graph.go
View File

@ -255,7 +255,7 @@ func (g *Graph) walk(walker GraphWalker) error {
// If the node is dynamically expanded, then expand it // If the node is dynamically expanded, then expand it
if ev, ok := v.(GraphNodeDynamicExpandable); ok { if ev, ok := v.(GraphNodeDynamicExpandable); ok {
log.Printf( log.Printf(
"[DEBUG] vertex %s.%s: expanding/walking dynamic subgraph", "[DEBUG] vertex '%s.%s': expanding/walking dynamic subgraph",
path, path,
dag.VertexName(v)) dag.VertexName(v))
g, err := ev.DynamicExpand(vertexCtx) g, err := ev.DynamicExpand(vertexCtx)
@ -274,7 +274,7 @@ func (g *Graph) walk(walker GraphWalker) error {
// If the node has a subgraph, then walk the subgraph // If the node has a subgraph, then walk the subgraph
if sn, ok := v.(GraphNodeSubgraph); ok { if sn, ok := v.(GraphNodeSubgraph); ok {
log.Printf( log.Printf(
"[DEBUG] vertex %s.%s: walking subgraph", "[DEBUG] vertex '%s.%s': walking subgraph",
path, path,
dag.VertexName(v)) dag.VertexName(v))

2
terraform/transform_expand.go
View File

@ -43,7 +43,7 @@ func (t *ExpandTransform) Transform(v dag.Vertex) (dag.Vertex, error) {
} }
// Expand the subgraph! // Expand the subgraph!
log.Printf("[DEBUG] vertex %s: static expanding", dag.VertexName(ev)) log.Printf("[DEBUG] vertex %q: static expanding", dag.VertexName(ev))
return ev.Expand(t.Builder) return ev.Expand(t.Builder)
} }