maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #734 from pulumi/CheckOldIns

Browse source 
Only pass old inputs to `Check`.
This commit is contained in:
Pat Gavlin 2017-12-15 12:00:17 -08:00 committed by GitHub
parent 67d3e0ef64 9d038c1d88
commit 038f5ae806
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/resource/deploy/plan_apply.go
View file

@ -281,10 +281,10 @@ func (iter *PlanIterator) makeRegisterResouceSteps(e RegisterResourceEvent) ([]S
// Check for an old resource before going any further.
old, hasold := iter.p.Olds()[urn]
var olds resource.PropertyMap
var oldouts resource.PropertyMap
var oldState resource.PropertyMap
if hasold {
olds = old.Inputs
oldouts = old.All()
oldState = old.All()
}
// Fetch the provider for this resource type, assuming it isn't just a logical one.
@ -300,7 +300,7 @@ func (iter *PlanIterator) makeRegisterResouceSteps(e RegisterResourceEvent) ([]S
news, inputs := new.Inputs, new.Inputs
if prov != nil {
var failures []plugin.CheckFailure
inputs, failures, err = prov.Check(urn, oldouts, news)
inputs, failures, err = prov.Check(urn, olds, news)
if err != nil {
return nil, err
} else if iter.issueCheckErrors(new, urn, failures) {
@ -354,7 +354,7 @@ func (iter *PlanIterator) makeRegisterResouceSteps(e RegisterResourceEvent) ([]S
// The properties changed; we need to figure out whether to do an update or replacement.
var diff plugin.DiffResult
if prov != nil {
if diff, err = prov.Diff(urn, old.ID, oldouts, inputs); err != nil {
if diff, err = prov.Diff(urn, old.ID, oldState, inputs); err != nil {
return nil, err
}
}