IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Put back in old spot

Browse Source
This commit is contained in:
Pam Selle 2019-09-05 15:58:04 -04:00
parent 96d84da032
commit bafd8ced7c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
terraform/eval_diff.go
View File

@ -214,12 +214,6 @@ func (n *EvalDiff) Eval(ctx EvalContext) (interface{}, error) {
plannedNewVal := resp.PlannedState plannedNewVal := resp.PlannedState
plannedPrivate := resp.PlannedPrivate plannedPrivate := resp.PlannedPrivate
plannedNewVal, ignoreChangeDiags = n.processIgnoreChanges(priorVal, plannedNewVal)
diags = diags.Append(ignoreChangeDiags)
if ignoreChangeDiags.HasErrors() {
return nil, diags.Err()
}
if plannedNewVal == cty.NilVal { if plannedNewVal == cty.NilVal {
// Should never happen. Since real-world providers return via RPC a nil // Should never happen. Since real-world providers return via RPC a nil
// is always a bug in the client-side stub. This is more likely caused // is always a bug in the client-side stub. This is more likely caused
@ -273,6 +267,12 @@ func (n *EvalDiff) Eval(ctx EvalContext) (interface{}, error) {
} }
} }
plannedNewVal, ignoreChangeDiags = n.processIgnoreChanges(priorVal, plannedNewVal)
diags = diags.Append(ignoreChangeDiags)
if ignoreChangeDiags.HasErrors() {
return nil, diags.Err()
}
// The provider produces a list of paths to attributes whose changes mean // The provider produces a list of paths to attributes whose changes mean
// that we must replace rather than update an existing remote object. // that we must replace rather than update an existing remote object.
// However, we only need to do that if the identified attributes _have_ // However, we only need to do that if the identified attributes _have_