From 92cda9d8fe54af51a67a681b54f7be2b00e3ea5a Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Fri, 29 Aug 2025 15:58:02 +0200 Subject: [PATCH] add actions prefix for clarity --- internal/terraform/evaluate_valid.go | 2 +- internal/terraform/node_action_trigger_apply.go | 2 +- internal/terraform/node_action_trigger_instance_plan.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/terraform/evaluate_valid.go b/internal/terraform/evaluate_valid.go index 9b81f23bdf..6c7eb2cb66 100644 --- a/internal/terraform/evaluate_valid.go +++ b/internal/terraform/evaluate_valid.go @@ -64,7 +64,7 @@ func (e *Evaluator) staticValidateReference(ref *addrs.Reference, modCfg *config // this codepath doesn't really "know about". If the "self" // object starts being supported in more contexts later then // we'll need to adjust this message. - Detail: `The "self" object is not available in this context. This object can be used only in resource provisioner, connection, postcondition blocks, and in the action_trigger condition attributes of after_create & after_update actions.`, + Detail: `The "self" object is not available in this context. This object can be used only in resource provisioner, connection and postcondition blocks.`, Subject: ref.SourceRange.ToHCL().Ptr(), }) return diags diff --git a/internal/terraform/node_action_trigger_apply.go b/internal/terraform/node_action_trigger_apply.go index 99d18b3224..25ef998e3a 100644 --- a/internal/terraform/node_action_trigger_apply.go +++ b/internal/terraform/node_action_trigger_apply.go @@ -41,7 +41,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) - condition, conditionDiags := evaluateCondition(ctx, conditionContext{ + 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. events: []configs.ActionTriggerEvent{at.ActionTriggerEvent}, diff --git a/internal/terraform/node_action_trigger_instance_plan.go b/internal/terraform/node_action_trigger_instance_plan.go index 19d1d0bc08..c7cdf9e3ad 100644 --- a/internal/terraform/node_action_trigger_instance_plan.go +++ b/internal/terraform/node_action_trigger_instance_plan.go @@ -118,7 +118,7 @@ func (n *nodeActionTriggerPlanInstance) Execute(ctx EvalContext, operation walkO // Evaluate the condition expression if it exists (otherwise it's true) if n.lifecycleActionTrigger != nil && n.lifecycleActionTrigger.conditionExpr != nil { - condition, conditionDiags := evaluateCondition(ctx, conditionContext{ + condition, conditionDiags := evaluateActionCondition(ctx, actionConditionContext{ events: n.lifecycleActionTrigger.events, conditionExpr: n.lifecycleActionTrigger.conditionExpr, resourceAddress: n.lifecycleActionTrigger.resourceAddress, @@ -207,13 +207,13 @@ func (n *nodeActionTriggerPlanInstance) Path() addrs.ModuleInstance { return n.actionAddress.Module } -type conditionContext struct { +type actionConditionContext struct { events []configs.ActionTriggerEvent conditionExpr hcl.Expression resourceAddress addrs.AbsResourceInstance } -func evaluateCondition(ctx EvalContext, at conditionContext) (bool, tfdiags.Diagnostics) { +func evaluateActionCondition(ctx EvalContext, at actionConditionContext) (bool, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics rd := instances.RepetitionData{}