From b2d111c2bd6d64a95f766a622c7c432db6310d55 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Thu, 15 Mar 2018 14:29:15 -0400 Subject: [PATCH] return provisioner Apply errors EvaApplyProvisioners was not returning errors if there was already a multierror stored in the Error field. Always return the error to the caller. --- terraform/eval_apply.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/terraform/eval_apply.go b/terraform/eval_apply.go index 36c98458e..b9b480646 100644 --- a/terraform/eval_apply.go +++ b/terraform/eval_apply.go @@ -227,11 +227,8 @@ func (n *EvalApplyProvisioners) Eval(ctx EvalContext) (interface{}, error) { state.Tainted = true } - if n.Error != nil { - *n.Error = multierror.Append(*n.Error, err) - } else { - return nil, err - } + *n.Error = multierror.Append(*n.Error, err) + return nil, err } {