clean out diff a little more before checking
Check if there wasn't any real diff attributes first, before returning the original state in PlanResourceChange.
This commit is contained in:
parent
4f691c5988
commit
286cb0a39d
|
@ -513,7 +513,17 @@ func (s *GRPCProviderServer) PlanResourceChange(_ context.Context, req *proto.Pl
|
|||
return resp, nil
|
||||
}
|
||||
|
||||
if diff == nil {
|
||||
if diff != nil {
|
||||
// strip out non-diffs
|
||||
for k, v := range diff.Attributes {
|
||||
if v.New == v.Old && !v.NewComputed {
|
||||
delete(diff.Attributes, k)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if diff == nil || len(diff.Attributes) == 0 {
|
||||
// schema.Provider.Diff returns nil if it ends up making a diff with no
|
||||
// changes, but our new interface wants us to return an actual change
|
||||
// description that _shows_ there are no changes. This is usually the
|
||||
|
@ -527,13 +537,6 @@ func (s *GRPCProviderServer) PlanResourceChange(_ context.Context, req *proto.Pl
|
|||
return resp, nil
|
||||
}
|
||||
|
||||
// strip out non-diffs
|
||||
for k, v := range diff.Attributes {
|
||||
if v.New == v.Old && !v.NewComputed {
|
||||
delete(diff.Attributes, k)
|
||||
}
|
||||
}
|
||||
|
||||
if priorState == nil {
|
||||
priorState = &terraform.InstanceState{}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue