From cec989d66045cf693e8504cfaee27e7271a3e137 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Thu, 26 Mar 2020 11:52:41 -0400 Subject: [PATCH] comment update and remove extra Name method This name method won't be called in the full graph, and remove it to prevent confusion with the parent node in logs. --- terraform/node_resource_apply.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/terraform/node_resource_apply.go b/terraform/node_resource_apply.go index 6b4250a30..88a378851 100644 --- a/terraform/node_resource_apply.go +++ b/terraform/node_resource_apply.go @@ -9,10 +9,9 @@ import ( ) // nodeExpandApplyableResource handles the first layer of resource -// expansion during apply. This is required because EvalTree does not have a -// context with which to expand the resource into multiple instances. -// This type should be a drop in replacement for NodeApplyableResource, and -// needs to mirror any non-evaluation methods exactly. +// expansion during apply. Even though the resource instances themselves are +// already expanded from the plan, we still need to expand the +// NodeApplyableResource nodes into their respective modules. type nodeExpandApplyableResource struct { *NodeAbstractResource } @@ -74,10 +73,6 @@ func (n *NodeApplyableResource) Path() addrs.ModuleInstance { return n.Addr.Module } -func (n *NodeApplyableResource) Name() string { - return n.NodeAbstractResource.Name() + " (prepare state)" -} - func (n *NodeApplyableResource) References() []*addrs.Reference { if n.Config == nil { log.Printf("[WARN] NodeApplyableResource %q: no configuration, so can't determine References", dag.VertexName(n))