fix rebasing errors

Author: DanielMSchmidt

internal/terraform/context_plan_actions_test.go

@@ -2516,15 +2516,14 @@ resource "test_object" "a" {
 			expectPlanActionCalled: false,
 
 			expectPlanDiagnostics: func(m *configs.Config) tfdiags.Diagnostics {
-				// We only expect one diagnostic, as the other condition is valid
 				return tfdiags.Diagnostics{}.Append(&hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Self reference not allowed",
 					Detail:   `The condition expression cannot reference "self".`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 11, Column: 19, Byte: 199},
-						End:      hcl.Pos{Line: 11, Column: 37, Byte: 217},
+						Start:    hcl.Pos{Line: 9, Column: 19, Byte: 197},
+						End:      hcl.Pos{Line: 9, Column: 37, Byte: 215},
 					},
 				})
 			},
@@ -2562,8 +2561,8 @@ resource "test_object" "a" {
 					Detail:   `The condition expression cannot reference "self".`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 11, Column: 19, Byte: 198},
-						End:      hcl.Pos{Line: 11, Column: 37, Byte: 216},
+						Start:    hcl.Pos{Line: 9, Column: 19, Byte: 196},
+						End:      hcl.Pos{Line: 9, Column: 37, Byte: 214},
 					},
 				})
 			},
@@ -2596,17 +2595,17 @@ resource "test_object" "a" {
 					Detail:   `The condition expression cannot reference "each" if the action is run before the resource is applied.`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 12, Column: 19, Byte: 237},
-						End:      hcl.Pos{Line: 12, Column: 36, Byte: 254},
+						Start:    hcl.Pos{Line: 10, Column: 19, Byte: 235},
+						End:      hcl.Pos{Line: 10, Column: 36, Byte: 252},
 					},
 				}).Append(&hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Each reference not allowed",
 					Detail:   `The condition expression cannot reference "each" if the action is run before the resource is applied.`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 12, Column: 19, Byte: 237},
-						End:      hcl.Pos{Line: 12, Column: 36, Byte: 254},
+						Start:    hcl.Pos{Line: 10, Column: 19, Byte: 235},
+						End:      hcl.Pos{Line: 10, Column: 36, Byte: 252},
 					},
 				})
 			},
@@ -2679,26 +2678,26 @@ resource "test_object" "a" {
 					Detail:   `The condition expression cannot reference "count" if the action is run before the resource is applied.`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 11, Column: 19, Byte: 226},
-						End:      hcl.Pos{Line: 11, Column: 35, Byte: 242},
+						Start:    hcl.Pos{Line: 10, Column: 21, Byte: 237},
+						End:      hcl.Pos{Line: 10, Column: 37, Byte: 253},
 					},
 				}).Append(&hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Count reference not allowed",
 					Detail:   `The condition expression cannot reference "count" if the action is run before the resource is applied.`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 11, Column: 19, Byte: 226},
-						End:      hcl.Pos{Line: 11, Column: 35, Byte: 242},
+						Start:    hcl.Pos{Line: 10, Column: 21, Byte: 237},
+						End:      hcl.Pos{Line: 10, Column: 37, Byte: 253},
 					},
 				}).Append(&hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Count reference not allowed",
 					Detail:   `The condition expression cannot reference "count" if the action is run before the resource is applied.`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 11, Column: 19, Byte: 226},
-						End:      hcl.Pos{Line: 11, Column: 35, Byte: 242},
+						Start:    hcl.Pos{Line: 10, Column: 21, Byte: 237},
+						End:      hcl.Pos{Line: 10, Column: 37, Byte: 253},
 					},
 				})
 			},
@@ -2771,17 +2770,17 @@ resource "test_object" "a" {
 					Detail:   `The condition expression cannot reference "each" if the action is run before the resource is applied.`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 11, Column: 19, Byte: 253},
-						End:      hcl.Pos{Line: 11, Column: 41, Byte: 275},
+						Start:    hcl.Pos{Line: 10, Column: 21, Byte: 264},
+						End:      hcl.Pos{Line: 10, Column: 43, Byte: 286},
 					},
 				}).Append(&hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Each reference not allowed",
 					Detail:   `The condition expression cannot reference "each" if the action is run before the resource is applied.`,
 					Subject: &hcl.Range{
 						Filename: filepath.Join(m.Module.SourceDir, "main.tf"),
-						Start:    hcl.Pos{Line: 11, Column: 19, Byte: 253},
-						End:      hcl.Pos{Line: 11, Column: 41, Byte: 275},
+						Start:    hcl.Pos{Line: 10, Column: 21, Byte: 264},
+						End:      hcl.Pos{Line: 10, Column: 43, Byte: 286},
 					},
 				})
 			},

internal/terraform/node_action_trigger_apply.go

@@ -40,7 +40,7 @@ func (n *nodeActionTriggerApply) Execute(ctx EvalContext, wo walkOperation) tfdi
 
 	if n.ConditionExpr != nil {
 		// We know this must be a lifecycle action, otherwise we would have no condition
-		at := actionInvocation.ActionTrigger.(plans.LifecycleActionTrigger)
+		at := actionInvocation.ActionTrigger.(*plans.LifecycleActionTrigger)
 		condition, conditionDiags := evaluateActionCondition(ctx, actionConditionContext{
 			// For applying the triggering event is sufficient, if the condition could not have
 			// been evaluated due to in invalid mix of events we would have caught it durin planning.