all types of action deferrals should lead to deferred triggering resources

Author: DanielMSchmidt

internal/terraform/context_plan_actions_test.go

@@ -2824,6 +2824,14 @@ resource "test_object" "a" {
 				if ai.Addr.String() != `action.test_unlinked.hello["a"]` {
 					t.Fatalf(`expected action invocation for action.test_unlinked.hello["a"], got %s`, ai.Addr.String())
 				}
+
+				if len(p.DeferredResources) != 1 {
+					t.Fatalf("expected 1 deferred resource, got %d", len(p.DeferredResources))
+				}
+
+				if p.DeferredResources[0].ChangeSrc.Addr.String() != "test_object.a" {
+					t.Fatalf("expected test_object.a, got %s", p.DeferredResources[0].ChangeSrc.Addr.String())
+				}
 			},
 		},
 		"action with unknown module expansion": {
@@ -3020,11 +3028,27 @@ resource "test_object" "a" {
 					t.Errorf("Expected 1 deferred action invocation, got %d", len(p.DeferredActionInvocations))
 				}
 				if p.DeferredActionInvocations[0].ActionInvocationInstanceSrc.Addr.String() != "action.test_unlinked.hello" {
-					t.Errorf("Expected action.test_unlinked.hello, got %s", p.DeferredActionInvocations[0].ActionInvocationInstanceSrc.Addr.String())
+					t.Errorf("Expected action. test_unlinked.hello, got %s", p.DeferredActionInvocations[0].ActionInvocationInstanceSrc.Addr.String())
 				}
 				if p.DeferredActionInvocations[0].DeferredReason != providers.DeferredReasonDeferredPrereq {
 					t.Errorf("Expected DeferredReasonDeferredPrereq, got %s", p.DeferredActionInvocations[0].DeferredReason)
 				}
+
+				if len(p.DeferredResources) != 2 {
+					t.Fatalf("Expected 2 deferred resources, got %d", len(p.DeferredResources))
+				}
+				if p.DeferredResources[0].ChangeSrc.Addr.String() != "test_object.origin" {
+					t.Errorf("Expected test_object.origin, got %s", p.DeferredResources[0].ChangeSrc.Addr.String())
+				}
+				if p.DeferredResources[0].DeferredReason != providers.DeferredReasonAbsentPrereq {
+					t.Errorf("Expected DeferredReasonAbsentPrereq, got %s", p.DeferredResources[0].DeferredReason)
+				}
+				if p.DeferredResources[1].ChangeSrc.Addr.String() != "test_object.a" {
+					t.Errorf("Expected test_object.a, got %s", p.DeferredResources[1].ChangeSrc.Addr.String())
+				}
+				if p.DeferredResources[1].DeferredReason != providers.DeferredReasonDeferredPrereq {
+					t.Errorf("Expected DeferredReasonDeferredPrereq, got %s", p.DeferredResources[1].DeferredReason)
+				}
 			},
 		},
 	} {

internal/terraform/node_action_trigger_instance_plan.go

@@ -76,12 +76,23 @@ func (n *nodeActionTriggerPlanInstance) Execute(ctx EvalContext, operation walkO
 
 		ActionTrigger: n.lifecycleActionTrigger.ActionTrigger(configs.Unknown),
 	}
+	change := ctx.Changes().GetResourceInstanceChange(n.lifecycleActionTrigger.resourceAddress, n.lifecycleActionTrigger.resourceAddress.CurrentObject().DeposedKey)
 
+	// If we should defer the action invocation, we need to report it and if the resource instance
+	// was not deferred (and therefore was planned) we need to retroactively remove the change
 	if deferrals.ShouldDeferActionInvocation(ai) {
 		deferrals.ReportActionInvocationDeferred(ai, providers.DeferredReasonDeferredPrereq)
+		if change != nil {
+			ctx.Changes().RemoveResourceInstanceChange(change.Addr, change.Addr.CurrentObject().DeposedKey)
+			deferrals.ReportResourceInstanceDeferred(change.Addr, providers.DeferredReasonDeferredPrereq, change)
+		}
 		return nil
 	}
 
+	if change == nil {
+		panic("change cannot be nil")
+	}
+
 	if n.lifecycleActionTrigger == nil {
 		panic("Only actions triggered by plan and apply are supported")
 	}
@@ -102,10 +113,6 @@ func (n *nodeActionTriggerPlanInstance) Execute(ctx EvalContext, operation walkO
 	// provider so we'll do that ourselves now.
 	ai.ConfigValue = ephemeral.RemoveEphemeralValues(actionInstance.ConfigValue)
 
-	change := ctx.Changes().GetResourceInstanceChange(n.lifecycleActionTrigger.resourceAddress, n.lifecycleActionTrigger.resourceAddress.CurrentObject().DeposedKey)
-	if change == nil {
-		panic("change cannot be nil")
-	}
 	triggeringEvent, isTriggered := actionIsTriggeredByEvent(n.lifecycleActionTrigger.events, change.Action)
 	if !isTriggered {
 		return diags
@@ -180,11 +187,9 @@ func (n *nodeActionTriggerPlanInstance) Execute(ctx EvalContext, operation walkO
 		return diags
 	}
 
+	// If the action is deferred, we need to also defer the resource instance
 	if resp.Deferred != nil {
 		deferrals.ReportActionInvocationDeferred(ai, resp.Deferred.Reason)
-
-		// If we run as part of a before action we need to retrospectively defer the triggering resource
-		// For this we remove the change and report the deferral
 		ctx.Changes().RemoveResourceInstanceChange(change.Addr, change.Addr.CurrentObject().DeposedKey)
 		deferrals.ReportResourceInstanceDeferred(change.Addr, providers.DeferredReasonDeferredPrereq, change)
 		return diags