add PruneUnusedValuesTransformer

Since outputs and local nodes are always evaluated, if the reference a
resource form the configuration that isn't in the state, the
interpolation could fail.

Prune any local or output values that have no references in the graph.
This commit is contained in:
James Bardin 2018-01-30 10:24:15 -05:00
parent 2d138d9917
commit 99867f0082
3 changed files with 35 additions and 6 deletions

View File

@ -7641,6 +7641,8 @@ func TestContext2Apply_destroyProvisionerWithLocals(t *testing.T) {
} }
} }
// this also tests a local value in the config referencing a resource that
// wasn't in the state during destroy.
func TestContext2Apply_destroyProvisionerWithMultipleLocals(t *testing.T) { func TestContext2Apply_destroyProvisionerWithMultipleLocals(t *testing.T) {
m := testModule(t, "apply-provisioner-destroy-multiple-locals") m := testModule(t, "apply-provisioner-destroy-multiple-locals")
p := testProvider("aws") p := testProvider("aws")

View File

@ -119,16 +119,19 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer {
// Connect references so ordering is correct // Connect references so ordering is correct
&ReferenceTransformer{}, &ReferenceTransformer{},
// Handle destroy time transformations for output and local values.
// Reverse the edges from outputs and locals, so that // Reverse the edges from outputs and locals, so that
// interpolations don't fail during destroy. // interpolations don't fail during destroy.
// Create a destroy node for outputs to remove them from the state.
// Prune unreferenced values, which may have interpolations that can't
// be resolved.
GraphTransformIf( GraphTransformIf(
func() bool { return b.Destroy }, func() bool { return b.Destroy },
GraphTransformMulti(
&DestroyValueReferenceTransformer{}, &DestroyValueReferenceTransformer{},
),
GraphTransformIf(
func() bool { return b.Destroy },
&DestroyOutputTransformer{}, &DestroyOutputTransformer{},
&PruneUnusedValuesTransformer{},
),
), ),
// Add the node to fix the state count boundaries // Add the node to fix the state count boundaries

View File

@ -112,6 +112,30 @@ func (t *DestroyValueReferenceTransformer) Transform(g *Graph) error {
return nil return nil
} }
// PruneUnusedValuesTransformer is s GraphTransformer that removes local and
// output values which are not referenced in the graph. Since outputs and
// locals always need to be evaluated, if they reference a resource that is not
// available in the state the interpolation could fail.
type PruneUnusedValuesTransformer struct{}
func (t *PruneUnusedValuesTransformer) Transform(g *Graph) error {
vs := g.Vertices()
for _, v := range vs {
switch v.(type) {
case *NodeApplyableOutput, *NodeLocal:
// OK
default:
continue
}
if len(g.EdgesTo(v)) == 0 {
g.Remove(v)
}
}
return nil
}
// ReferenceMap is a structure that can be used to efficiently check // ReferenceMap is a structure that can be used to efficiently check
// for references on a graph. // for references on a graph.
type ReferenceMap struct { type ReferenceMap struct {