IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2024-12-28 01:41:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

core: DestroyEdgeTransformer must use instance rather than resource addrs

Browse Source 
The initial destroyer map is constructed using DestroyAddr(), which
returns resource instance addresses, but we were then going on to _use_
that map with resource addresses, which means the keys can't match when
indexed instances are being destroyed.

Now we'll use resource instance addresses in all cases.

This also includes some additional logging that was helpful in debugging
this issue.
This commit is contained in:
Martin Atkins 2018-05-29 18:43:57 -07:00
parent aedbbc6207
commit ea73922780
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
terraform/transform_destroy_edge.go
View File

@ -177,7 +177,7 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
// Run the graph transforms so we have the information we need to
// build references.
log.Println("[TRACE] DestroyEdgeTransformer: constructing temporary graph for analysis of references")
log.Printf("[TRACE] DestroyEdgeTransformer: constructing temporary graph for analysis of references, starting from:\n%s", tempG.StringWithNodeTypes())
for _, s := range steps {
log.Printf("[TRACE] DestroyEdgeTransformer: running %T on temporary graph", s)
if err := s.Transform(&tempG); err != nil {
@ -185,7 +185,7 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
return err
}
}
log.Printf("[TRACE] DestroyEdgeTransformer: temporary reference graph: %s", tempG.String())
log.Printf("[TRACE] DestroyEdgeTransformer: temporary reference graph:\n%s", tempG.String())
// Go through all the nodes in the graph and determine what they
// depend on.
@ -216,12 +216,13 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
// Get the destroy node for this. In the example of our struct,
// we are currently at B and we're looking for B_d.
rn, ok := v.(GraphNodeResource)
rn, ok := v.(GraphNodeResourceInstance)
if !ok {
log.Printf("[TRACE] DestroyEdgeTransformer: skipping %s, since it's not a resource", dag.VertexName(v))
continue
}
addr := rn.ResourceAddr()
addr := rn.ResourceInstanceAddr()
dns := destroyers[addr.String()]
// We have dependencies, check if any are being destroyed
@ -236,12 +237,12 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
// to see if A_d exists.
var depDestroyers []dag.Vertex
for _, v := range refs {
rn, ok := v.(GraphNodeResource)
rn, ok := v.(GraphNodeResourceInstance)
if !ok {
continue
}
addr := rn.ResourceAddr()
addr := rn.ResourceInstanceAddr()
key := addr.String()
if ds, ok := destroyers[key]; ok {
for _, d := range ds {
@ -258,6 +259,7 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
for _, a_d := range dns {
for _, b_d := range depDestroyers {
if b_d != a_d {
log.Printf("[TRACE] DestroyEdgeTransformer: %q depends on %q", dag.VertexName(b_d), dag.VertexName(a_d))
g.Connect(dag.BasicEdge(b_d, a_d))
}
}