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

core: Use values from plan only if object marked as planned 

This inverts the previous logic so that it's the status of an object in
the state that decides whether we'll use its value from the plan. This
fixes the problem that otherwise after we've actually applied the change
the partial planned object will continue to shadow the final object in
state.
This commit is contained in:
Martin Atkins 2018-09-19 11:24:04 -07:00
parent a63c408e84
commit d40b6c128d
1 changed files with 64 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
terraform/evaluate.go
View File

@ -562,6 +562,7 @@ func (d *evaluationStateData) getResourceInstanceSingle(addr addrs.ResourceInsta
return cty.UnknownVal(ty), diags
}
if is.Current.Status == states.ObjectPlanned {
// If there's a pending change for this instance in our plan, we'll prefer
// that. This is important because the state can't represent unknown values
// and so its data is inaccurate when changes are pending.
@ -577,9 +578,7 @@ func (d *evaluationStateData) getResourceInstanceSingle(addr addrs.ResourceInsta
return cty.UnknownVal(ty), diags
}
return val, diags
}
if is.Current.Status == states.ObjectPlanned {
} else {
// If the object is in planned status then we should not
// get here, since we should've found a pending value
// in the plan above instead.
@ -591,6 +590,7 @@ func (d *evaluationStateData) getResourceInstanceSingle(addr addrs.ResourceInsta
})
return cty.UnknownVal(ty), diags
}
}
ios, err := is.Current.Decode(ty)
if err != nil {
@ -648,6 +648,7 @@ func (d *evaluationStateData) getResourceInstancesAll(addr addrs.Resource, rng t
// Prefer pending value in plan if present. See getResourceInstanceSingle
// comment for the rationale.
if is.Current.Status == states.ObjectPlanned {
if change := d.Evaluator.Changes.GetResourceInstanceChange(instAddr, states.CurrentGen); change != nil {
val, err := change.After.Decode(ty)
if err != nil {
@ -661,9 +662,7 @@ func (d *evaluationStateData) getResourceInstancesAll(addr addrs.Resource, rng t
}
vals[i] = val
continue
}
if is.Current.Status == states.ObjectPlanned {
} else {
// If the object is in planned status then we should not
// get here, since we should've found a pending value
// in the plan above instead.
@ -675,6 +674,7 @@ func (d *evaluationStateData) getResourceInstancesAll(addr addrs.Resource, rng t
})
continue
}
}
ios, err := is.Current.Decode(ty)
if err != nil {
@ -713,6 +713,9 @@ func (d *evaluationStateData) getResourceInstancesAll(addr addrs.Resource, rng t
// Prefer pending value in plan if present. See getResourceInstanceSingle
// comment for the rationale.
// Prefer pending value in plan if present. See getResourceInstanceSingle
// comment for the rationale.
if is.Current.Status == states.ObjectPlanned {
if change := d.Evaluator.Changes.GetResourceInstanceChange(instAddr, states.CurrentGen); change != nil {
val, err := change.After.Decode(ty)
if err != nil {
@ -726,6 +729,18 @@ func (d *evaluationStateData) getResourceInstancesAll(addr addrs.Resource, rng t
}
vals[string(sk)] = val
continue
} else {
// If the object is in planned status then we should not
// get here, since we should've found a pending value
// in the plan above instead.
diags = diags.Append(&hcl.Diagnostic{
Severity: hcl.DiagError,
Summary: "Missing pending object in plan",
Detail: fmt.Sprintf("Instance %s is marked as having a change pending but that change is not recorded in the plan. This is a bug in Terraform; please report it.", instAddr),
Subject: &config.DeclRange,
})
continue
}
}
ios, err := is.Current.Decode(ty)