ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore the prior tainted status on failed apply

This commit is contained in:
James Bardin 2019-11-07 08:55:50 -05:00
parent 84b5de9ae4
commit cbd64c0d3c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
terraform/eval_apply.go
View File

@ -253,6 +253,8 @@ func (n *EvalApply) Eval(ctx EvalContext) (interface{}, error) {
} }
} }
newStatus := states.ObjectReady
// Sometimes providers return a null value when an operation fails for some // Sometimes providers return a null value when an operation fails for some
// reason, but we'd rather keep the prior state so that the error can be // reason, but we'd rather keep the prior state so that the error can be
// corrected on a subsequent run. We must only do this for null new value // corrected on a subsequent run. We must only do this for null new value
@ -265,12 +267,18 @@ func (n *EvalApply) Eval(ctx EvalContext) (interface{}, error) {
// If change.Action is Create then change.Before will also be null, // If change.Action is Create then change.Before will also be null,
// which is fine. // which is fine.
newVal = change.Before newVal = change.Before
// If we're recovering the previous state, we also want to restore the
// the tainted status of the object.
if state.Status == states.ObjectTainted {
newStatus = states.ObjectTainted
}
} }
var newState *states.ResourceInstanceObject var newState *states.ResourceInstanceObject
if !newVal.IsNull() { // null value indicates that the object is deleted, so we won't set a new state in that case if !newVal.IsNull() { // null value indicates that the object is deleted, so we won't set a new state in that case
newState = &states.ResourceInstanceObject{ newState = &states.ResourceInstanceObject{
Status: states.ObjectReady, Status: newStatus,
Value: newVal, Value: newVal,
Private: resp.Private, Private: resp.Private,
} }