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

core: Attach schemas to nodes created by ResourceCountTransformer 

Previously we were only doing this in the case where count wasn't set at
all.
This commit is contained in:
Martin Atkins 2018-12-07 15:38:11 -08:00
parent f9fef56167
commit b1ed146931
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
terraform/node_resource_abstract.go
View File

@ -182,7 +182,7 @@ func (n *NodeAbstractResource) References() []*addrs.Reference {
if n.Schema == nil {
// Should never happens, but we'll log if it does so that we can
// see this easily when debugging.
log.Printf("[WARN] no schema is attached to %s, so references cannot be detected", n.Name())
log.Printf("[WARN] no schema is attached to %s, so config references cannot be detected", n.Name())
}
refs, _ := lang.ReferencesInExpr(c.Count)
@ -220,6 +220,13 @@ func (n *NodeAbstractResourceInstance) References() []*addrs.Reference {
// embedded abstract resource, which knows how to extract dependencies
// from configuration.
if n.Config != nil {
if n.Schema == nil {
// We'll produce a log message about this out here so that
// we can include the full instance address, since the equivalent
// message in NodeAbstractResource.References cannot see it.
log.Printf("[WARN] no schema is attached to %s, so config references cannot be detected", n.Name())
return nil
}
return n.NodeAbstractResource.References()
}

1
terraform/transform_resource_count.go
View File

@ -43,6 +43,7 @@ func (t *ResourceCountTransformer) Transform(g *Graph) error {
addr := t.Addr.Instance(key)
abstract := NewNodeAbstractResourceInstance(addr)
abstract.Schema = t.Schema
var node dag.Vertex = abstract
if f := t.Concrete; f != nil {
node = f(abstract)