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

Ensure no key added to graph first

This commit is contained in:
Pam Selle 2019-08-13 10:10:36 -04:00
parent 979a2fa6d1
commit 3662dbc03d
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
terraform/transform_orphan_count.go
View File

@ -50,6 +50,16 @@ func (t *OrphanResourceCountTransformer) Transform(g *Graph) error {
} }
func (t *OrphanResourceCountTransformer) transformForEach(haveKeys map[addrs.InstanceKey]struct{}, g *Graph) error { func (t *OrphanResourceCountTransformer) transformForEach(haveKeys map[addrs.InstanceKey]struct{}, g *Graph) error {
// If there is a no-key node, add this to the graph first,
// because the last item determines the resource mode for the whole resource,
// so if this (non-deterministically) happens to end up as the last one,
// that will change the resource's EachMode and our addressing for our instances
// will not work as expected
noKeyNode, hasNoKeyNode := haveKeys[addrs.NoKey]
if hasNoKeyNode {
g.Add(noKeyNode)
}
for key := range haveKeys { for key := range haveKeys {
s, _ := key.(addrs.StringKey) s, _ := key.(addrs.StringKey)
// If the key is present in our current for_each, carry on // If the key is present in our current for_each, carry on
@ -57,6 +67,11 @@ func (t *OrphanResourceCountTransformer) transformForEach(haveKeys map[addrs.Ins
continue continue
} }
// If the key is no-key, we have already added it, so skip
if key == addrs.NoKey {
continue
}
abstract := NewNodeAbstractResourceInstance(t.Addr.Instance(key)) abstract := NewNodeAbstractResourceInstance(t.Addr.Instance(key))
var node dag.Vertex = abstract var node dag.Vertex = abstract
if f := t.Concrete; f != nil { if f := t.Concrete; f != nil {