remove NodeApplyableResource

Move the logic for NodeApplyableResource into
nodeExpandApplyableResource to remove an unnecessary level of expansion.

Author: jbardin

internal/terraform/node_resource_apply.go

@@ -4,8 +4,6 @@
 package terraform
 
 import (
-	"log"
-
 	"github.com/hashicorp/terraform/internal/addrs"
 	"github.com/hashicorp/terraform/internal/tfdiags"
 )
@@ -19,7 +17,6 @@ type nodeExpandApplyableResource struct {
 }
 
 var (
-	_ GraphNodeDynamicExpandable    = (*nodeExpandApplyableResource)(nil)
 	_ GraphNodeReferenceable        = (*nodeExpandApplyableResource)(nil)
 	_ GraphNodeReferencer           = (*nodeExpandApplyableResource)(nil)
 	_ GraphNodeConfigResource       = (*nodeExpandApplyableResource)(nil)
@@ -49,56 +46,14 @@ func (n *nodeExpandApplyableResource) Name() string {
 	return n.NodeAbstractResource.Name() + " (expand)"
 }
 
-func (n *nodeExpandApplyableResource) DynamicExpand(ctx EvalContext) (*Graph, error) {
-	var g Graph
-
+func (n *nodeExpandApplyableResource) Execute(ctx EvalContext, op walkOperation) tfdiags.Diagnostics {
+	var diags tfdiags.Diagnostics
 	expander := ctx.InstanceExpander()
 	moduleInstances := expander.ExpandModule(n.Addr.Module)
 	for _, module := range moduleInstances {
-		g.Add(&NodeApplyableResource{
-			NodeAbstractResource: n.NodeAbstractResource,
-			Addr:                 n.Addr.Resource.Absolute(module),
-		})
-	}
-	addRootNodeToGraph(&g)
-
-	return &g, nil
-}
-
-// NodeApplyableResource represents a resource that is "applyable":
-// it may need to have its record in the state adjusted to match configuration.
-//
-// Unlike in the plan walk, this resource node does not DynamicExpand. Instead,
-// it should be inserted into the same graph as any instances of the nodes
-// with dependency edges ensuring that the resource is evaluated before any
-// of its instances, which will turn ensure that the whole-resource record
-// in the state is suitably prepared to receive any updates to instances.
-type NodeApplyableResource struct {
-	*NodeAbstractResource
-
-	Addr addrs.AbsResource
-}
-
-var (
-	_ GraphNodeModuleInstance       = (*NodeApplyableResource)(nil)
-	_ GraphNodeConfigResource       = (*NodeApplyableResource)(nil)
-	_ GraphNodeExecutable           = (*NodeApplyableResource)(nil)
-	_ GraphNodeProviderConsumer     = (*NodeApplyableResource)(nil)
-	_ GraphNodeAttachResourceConfig = (*NodeApplyableResource)(nil)
-	_ GraphNodeReferencer           = (*NodeApplyableResource)(nil)
-)
-
-func (n *NodeApplyableResource) Path() addrs.ModuleInstance {
-	return n.Addr.Module
-}
-
-// GraphNodeExecutable
-func (n *NodeApplyableResource) Execute(ctx EvalContext, op walkOperation) tfdiags.Diagnostics {
-	if n.Config == nil {
-		// Nothing to do, then.
-		log.Printf("[TRACE] NodeApplyableResource: no configuration present for %s", n.Name())
-		return nil
+		ctx = ctx.WithPath(module)
+		diags = diags.Append(n.writeResourceState(ctx, n.Addr.Resource.Absolute(module)))
 	}
 
-	return n.writeResourceState(ctx, n.Addr)
+	return diags
 }

internal/terraform/node_resource_apply_test.go

@@ -12,33 +12,40 @@ import (
 	"github.com/hashicorp/terraform/internal/states"
 )
 
-func TestNodeApplyableResourceExecute(t *testing.T) {
+func TestNodeExpandApplyableResourceExecute(t *testing.T) {
 	state := states.NewState()
-	ctx := &MockEvalContext{
-		StateState:               state.SyncWrapper(),
-		InstanceExpanderExpander: instances.NewExpander(),
-	}
-
 	t.Run("no config", func(t *testing.T) {
-		node := NodeApplyableResource{
+		ctx := &MockEvalContext{
+			StateState:               state.SyncWrapper(),
+			InstanceExpanderExpander: instances.NewExpander(),
+		}
+
+		node := &nodeExpandApplyableResource{
 			NodeAbstractResource: &NodeAbstractResource{
+				Addr:   mustConfigResourceAddr("test_instance.foo"),
 				Config: nil,
 			},
-			Addr: mustAbsResourceAddr("test_instance.foo"),
 		}
 		diags := node.Execute(ctx, walkApply)
 		if diags.HasErrors() {
 			t.Fatalf("unexpected error: %s", diags.Err())
 		}
+
+		state.PruneResourceHusks()
 		if !state.Empty() {
 			t.Fatalf("expected no state, got:\n %s", state.String())
 		}
 	})
 
 	t.Run("simple", func(t *testing.T) {
+		ctx := &MockEvalContext{
+			StateState:               state.SyncWrapper(),
+			InstanceExpanderExpander: instances.NewExpander(),
+		}
 
-		node := NodeApplyableResource{
+		node := &nodeExpandApplyableResource{
 			NodeAbstractResource: &NodeAbstractResource{
+				Addr: mustConfigResourceAddr("test_instance.foo"),
 				Config: &configs.Resource{
 					Mode: addrs.ManagedResourceMode,
 					Type: "test_instance",
@@ -49,7 +56,6 @@ func TestNodeApplyableResourceExecute(t *testing.T) {
 					Module:   addrs.RootModule,
 				},
 			},
-			Addr: mustAbsResourceAddr("test_instance.foo"),
 		}
 		diags := node.Execute(ctx, walkApply)
 		if diags.HasErrors() {