Add actions to the apply graph

docs/plugin-protocol/tfplugin5.proto

@@ -463,7 +463,8 @@ message GetProviderSchema {
         map<string, Function> functions = 7;
         map<string, Schema> ephemeral_resource_schemas = 8;
         map<string, Schema> list_resource_schemas = 9;
-        map<string, ActionSchema> action_schemas = 10;
+        reserved 10; // Field number 10 is used by state stores in version 6
+        map<string, ActionSchema> action_schemas = 11;
         repeated Diagnostic diagnostics = 4;
         Schema provider_meta = 5;
         ServerCapabilities server_capabilities = 6;
@@ -936,9 +937,9 @@ message PlanAction {
         // linked resources, this should match the order the resources are specified in the schema.
         repeated LinkedResource linked_resources = 2;
         // config of the action, based on the schema of the actual action
-        DynamicValue config = 6;
+        DynamicValue config = 3;
         // metadata
-        ClientCapabilities client_capabilities = 8;
+        ClientCapabilities client_capabilities = 4;
     }
 
     message Response {

docs/plugin-protocol/tfplugin6.proto

@@ -974,9 +974,9 @@ message PlanAction {
         // linked resources, this should match the order the resources are specified in the schema.
         repeated LinkedResource linked_resources = 2;
         // config of the action, based on the schema of the actual action
-        DynamicValue config = 6;
+        DynamicValue config = 3;
         // metadata
-        ClientCapabilities client_capabilities = 8;
+        ClientCapabilities client_capabilities = 4;
     }
 
     message Response {

internal/addrs/action.go

@@ -333,25 +333,6 @@ type configActionKey string
 
 func (k configActionKey) uniqueKeySigil() {}
 
-// AbsActionInvocationInstance describes the invocation of an action as part of a plan / apply.
-type AbsActionInvocationInstance struct {
-	TriggeringResource AbsResourceInstance
-	Action             AbsActionInstance
-	TriggerIndex       int
-
-	// TriggerBlockSourceRange is the location of the action_trigger block
-	// within the resources lifecycle block that triggered this action.
-	TriggerBlockSourceRange *tfdiags.SourceRange
-
-	// ActionReferenceSourceRange is the location of the action reference
-	// in the actions list within the action_trigger block.
-	ActionReferenceSourceRange *tfdiags.SourceRange
-}
-
-func (a AbsActionInvocationInstance) String() string {
-	return fmt.Sprintf("%s.%d.%s", a.TriggeringResource.String(), a.TriggerIndex, a.Action.String())
-}
-
 // ParseAbsActionInstanceStr is a helper wrapper around
 // ParseAbsActionInstance that takes a string and parses it with the HCL
 // native syntax traversal parser before interpreting it.

internal/addrs/action_test.go

@@ -109,15 +109,15 @@ func TestActionInstanceEqual(t *testing.T) {
 func TestAbsActionInstanceEqual(t *testing.T) {
 	actions := []AbsActionInstance{
 		{
-			RootModuleInstance,
-			ActionInstance{
+			Module: RootModuleInstance,
+			Action: ActionInstance{
 				Action: Action{Type: "foo", Name: "bar"},
 				Key:    NoKey,
 			},
 		},
 		{
-			mustParseModuleInstanceStr("module.child"),
-			ActionInstance{
+			Module: mustParseModuleInstanceStr("module.child"),
+			Action: ActionInstance{
 				Action: Action{Type: "the", Name: "bloop"},
 				Key:    StringKey("fish"),
 			},
@@ -139,15 +139,15 @@ func TestAbsActionInstanceEqual(t *testing.T) {
 	}{
 		{ // different keys
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    NoKey,
 				},
 			},
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    IntKey(1),
 				},
@@ -156,15 +156,15 @@ func TestAbsActionInstanceEqual(t *testing.T) {
 
 		{ // different module
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    NoKey,
 				},
 			},
 			AbsActionInstance{
-				mustParseModuleInstanceStr("module.child[1]"),
-				ActionInstance{
+				Module: mustParseModuleInstanceStr("module.child[1]"),
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    NoKey,
 				},
@@ -173,15 +173,15 @@ func TestAbsActionInstanceEqual(t *testing.T) {
 
 		{ // totally different
 			AbsActionInstance{
-				RootModuleInstance,
-				ActionInstance{
+				Module: RootModuleInstance,
+				Action: ActionInstance{
 					Action: Action{Type: "oof", Name: "rab"},
 					Key:    NoKey,
 				},
 			},
 			AbsActionInstance{
-				mustParseModuleInstanceStr("module.foo"),
-				ActionInstance{
+				Module: mustParseModuleInstanceStr("module.foo"),
+				Action: ActionInstance{
 					Action: Action{Type: "foo", Name: "bar"},
 					Key:    IntKey(11),
 				},

internal/addrs/map.go

@@ -3,6 +3,8 @@
 
 package addrs
 
+import "iter"
+
 // Map represents a mapping whose keys are address types that implement
 // UniqueKeyer.
 //
@@ -135,3 +137,13 @@ func (m Map[K, V]) Values() []V {
 	}
 	return ret
 }
+
+func (m Map[K, V]) Iter() iter.Seq2[K, V] {
+	return func(yield func(K, V) bool) {
+		for _, elem := range m.Elements() {
+			if !yield(elem.Key, elem.Value) {
+				return
+			}
+		}
+	}
+}

internal/command/jsonplan/plan.go

@@ -239,7 +239,7 @@ func MarshalForRenderer(
 		return nil, nil, nil, nil, nil, err
 	}
 
-	if output.ActionInvocations, err = MarshalActionInvocations(p.ActionInvocations); err != nil {
+	if output.ActionInvocations, err = MarshalActionInvocations(p.Changes.ActionInvocations); err != nil {
 		return nil, nil, nil, nil, nil, err
 	}
 
@@ -336,9 +336,9 @@ func Marshal(
 		return nil, fmt.Errorf("error marshaling config: %s", err)
 	}
 
-	// output.ActionInvocations
-	if p.ActionInvocations != nil {
-		if output.ActionInvocations, err = MarshalActionInvocations(p.ActionInvocations); err != nil {
+	// output.Changes.ActionInvocations
+	if p.Changes.ActionInvocations != nil {
+		if output.ActionInvocations, err = MarshalActionInvocations(p.Changes.ActionInvocations); err != nil {
 			return nil, fmt.Errorf("error marshaling action invocations: %s", err)
 		}
 	}

internal/command/views/hook_json_test.go

@@ -30,11 +30,12 @@ func testJSONHookResourceID(addr addrs.AbsResourceInstance) terraform.HookResour
 	}
 }
 
-func testJSONHookActionID(addr addrs.AbsActionInvocationInstance) terraform.HookActionIdentity {
-	return addrs.AbsActionInvocationInstance{
-		TriggeringResource: addr.TriggeringResource,
-		Action:             addr.Action,
-		TriggerIndex:       addr.TriggerIndex,
+func testJSONHookActionID(actionAddr addrs.AbsActionInstance, triggeringResourceAddr addrs.AbsResourceInstance, actionTriggerIndex int, actionsListIndex int) terraform.HookActionIdentity {
+	return terraform.HookActionIdentity{
+		Addr:                    actionAddr,
+		TriggeringResourceAddr:  triggeringResourceAddr,
+		ActionTriggerBlockIndex: actionTriggerIndex,
+		ActionsListIndex:        actionsListIndex,
 	}
 }
 
@@ -593,12 +594,6 @@ func TestJSONHook_actions(t *testing.T) {
 		Name: "boop",
 	}.Instance(addrs.NoKey).Absolute(addrs.RootModuleInstance)
 
-	invocationA := addrs.AbsActionInvocationInstance{
-		TriggeringResource: resourceA,
-		Action:             actionA,
-		TriggerIndex:       23,
-	}
-
 	subModule := addrs.RootModuleInstance.Child("childMod", addrs.StringKey("infra"))
 	actionB := addrs.AbsActionInstance{
 		Module: subModule,
@@ -614,33 +609,31 @@ func TestJSONHook_actions(t *testing.T) {
 		Name: "boop",
 	}.Instance(addrs.NoKey).Absolute(subModule)
 
-	invocationB := addrs.AbsActionInvocationInstance{
-		TriggeringResource: resourceB,
-		Action:             actionB,
-		TriggerIndex:       0,
-	}
-	action, err := hook.StartAction(testJSONHookActionID(invocationA))
+	actionAHookId := testJSONHookActionID(actionA, resourceA, 0, 1)
+	actionBHookId := testJSONHookActionID(actionB, resourceB, 2, 3)
+
+	action, err := hook.StartAction(actionAHookId)
 	testHookReturnValues(t, action, err)
 
-	action, err = hook.ProgressAction(testJSONHookActionID(invocationA), "Hello world from the lambda function")
+	action, err = hook.ProgressAction(actionAHookId, "Hello world from the lambda function")
 	testHookReturnValues(t, action, err)
 
-	action, err = hook.StartAction(testJSONHookActionID(invocationB))
+	action, err = hook.StartAction(actionBHookId)
 	testHookReturnValues(t, action, err)
 
-	action, err = hook.ProgressAction(testJSONHookActionID(invocationB), "TASK: [hello]\n ok: [localhost] => (item=Hello world from the ansible playbook]")
+	action, err = hook.ProgressAction(actionBHookId, "TASK: [hello]\n ok: [localhost] => (item=Hello world from the ansible playbook]")
 	testHookReturnValues(t, action, err)
 
-	action, err = hook.CompleteAction(testJSONHookActionID(invocationB), nil)
+	action, err = hook.CompleteAction(actionBHookId, nil)
 	testHookReturnValues(t, action, err)
 
-	action, err = hook.CompleteAction(testJSONHookActionID(invocationA), errors.New("lambda terminated with exit code 1"))
+	action, err = hook.CompleteAction(actionAHookId, errors.New("lambda terminated with exit code 1"))
 	testHookReturnValues(t, action, err)
 
 	want := []map[string]interface{}{
 		{
 			"@level":   "info",
-			"@message": "test_instance.boop.trigger[23]: Action Started: action.aws_lambda_invocation.notify_slack[42]",
+			"@message": "test_instance.boop.trigger[0]: Action Started: action.aws_lambda_invocation.notify_slack[42]",
 			"@module":  "terraform.ui",
 			"type":     "action_start",
 			"hook": map[string]interface{}{
@@ -653,6 +646,7 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "notify_slack",
 					"resource_type":    "aws_lambda_invocation",
 				},
+				"actions_index": float64(1),
 				"resource": map[string]interface{}{
 					"addr":             "test_instance.boop",
 					"implied_provider": "test",
@@ -662,12 +656,12 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "boop",
 					"resource_type":    "test_instance",
 				},
-				"trigger_index": float64(23),
+				"trigger_index": float64(0),
 			},
 		},
 		{
 			"@level":   "info",
-			"@message": "test_instance.boop (23): action.aws_lambda_invocation.notify_slack[42] - Hello world from the lambda function",
+			"@message": "test_instance.boop (0): action.aws_lambda_invocation.notify_slack[42] - Hello world from the lambda function",
 			"@module":  "terraform.ui",
 			"type":     "action_progress",
 			"hook": map[string]interface{}{
@@ -680,7 +674,8 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "notify_slack",
 					"resource_type":    "aws_lambda_invocation",
 				},
-				"message": "Hello world from the lambda function",
+				"actions_index": float64(1),
+				"message":       "Hello world from the lambda function",
 				"resource": map[string]interface{}{
 					"addr":             "test_instance.boop",
 					"implied_provider": "test",
@@ -690,12 +685,12 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "boop",
 					"resource_type":    "test_instance",
 				},
-				"trigger_index": float64(23),
+				"trigger_index": float64(0),
 			},
 		},
 		{
 			"@level":   "info",
-			"@message": "module.childMod[\"infra\"].test_instance.boop.trigger[0]: Action Started: module.childMod[\"infra\"].action.ansible_playbook.webserver",
+			"@message": "module.childMod[\"infra\"].test_instance.boop.trigger[2]: Action Started: module.childMod[\"infra\"].action.ansible_playbook.webserver",
 			"@module":  "terraform.ui",
 			"type":     "action_start",
 			"hook": map[string]interface{}{
@@ -708,6 +703,7 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "webserver",
 					"resource_type":    "ansible_playbook",
 				},
+				"actions_index": float64(3),
 				"resource": map[string]interface{}{
 					"addr":             "module.childMod[\"infra\"].test_instance.boop",
 					"implied_provider": "test",
@@ -717,12 +713,12 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "boop",
 					"resource_type":    "test_instance",
 				},
-				"trigger_index": float64(0),
+				"trigger_index": float64(2),
 			},
 		},
 		{
 			"@level":   "info",
-			"@message": "module.childMod[\"infra\"].test_instance.boop (0): module.childMod[\"infra\"].action.ansible_playbook.webserver - TASK: [hello]\n ok: [localhost] => (item=Hello world from the ansible playbook]",
+			"@message": "module.childMod[\"infra\"].test_instance.boop (2): module.childMod[\"infra\"].action.ansible_playbook.webserver - TASK: [hello]\n ok: [localhost] => (item=Hello world from the ansible playbook]",
 			"@module":  "terraform.ui",
 			"type":     "action_progress",
 			"hook": map[string]interface{}{
@@ -735,7 +731,8 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "webserver",
 					"resource_type":    "ansible_playbook",
 				},
-				"message": "TASK: [hello]\n ok: [localhost] => (item=Hello world from the ansible playbook]",
+				"actions_index": float64(3),
+				"message":       "TASK: [hello]\n ok: [localhost] => (item=Hello world from the ansible playbook]",
 				"resource": map[string]interface{}{
 					"addr":             "module.childMod[\"infra\"].test_instance.boop",
 					"implied_provider": "test",
@@ -745,12 +742,12 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "boop",
 					"resource_type":    "test_instance",
 				},
-				"trigger_index": float64(0),
+				"trigger_index": float64(2),
 			},
 		},
 		{
 			"@level":   "info",
-			"@message": "module.childMod[\"infra\"].test_instance.boop (0): Action Complete: module.childMod[\"infra\"].action.ansible_playbook.webserver",
+			"@message": "module.childMod[\"infra\"].test_instance.boop (2): Action Complete: module.childMod[\"infra\"].action.ansible_playbook.webserver",
 			"@module":  "terraform.ui",
 			"type":     "action_complete",
 			"hook": map[string]interface{}{
@@ -763,6 +760,7 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "webserver",
 					"resource_type":    "ansible_playbook",
 				},
+				"actions_index": float64(3),
 				"resource": map[string]interface{}{
 					"addr":             "module.childMod[\"infra\"].test_instance.boop",
 					"implied_provider": "test",
@@ -772,12 +770,12 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "boop",
 					"resource_type":    "test_instance",
 				},
-				"trigger_index": float64(0),
+				"trigger_index": float64(2),
 			},
 		},
 		{
 			"@level":   "info",
-			"@message": "test_instance.boop (23): Action Errored: action.aws_lambda_invocation.notify_slack[42] - lambda terminated with exit code 1",
+			"@message": "test_instance.boop (0): Action Errored: action.aws_lambda_invocation.notify_slack[42] - lambda terminated with exit code 1",
 			"@module":  "terraform.ui",
 			"type":     "action_errored",
 			"hook": map[string]interface{}{
@@ -790,7 +788,8 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "notify_slack",
 					"resource_type":    "aws_lambda_invocation",
 				},
-				"error": "lambda terminated with exit code 1",
+				"actions_index": float64(1),
+				"error":         "lambda terminated with exit code 1",
 				"resource": map[string]interface{}{
 					"addr":             "test_instance.boop",
 					"implied_provider": "test",
@@ -800,7 +799,7 @@ func TestJSONHook_actions(t *testing.T) {
 					"resource_name":    "boop",
 					"resource_type":    "test_instance",
 				},
-				"trigger_index": float64(23),
+				"trigger_index": float64(0),
 			},
 		},
 	}