Merge pull request #20522 from hashicorp/jbardin/sdk-shims
Unexpected empty and computed values
This commit is contained in:
commit
8f7e5b75fc
|
@ -431,7 +431,7 @@ func (s *GRPCProviderServer) ReadResource(_ context.Context, req *proto.ReadReso
|
|||
// here we use the prior state to check for unknown/zero containers values
|
||||
// when normalizing the flatmap.
|
||||
stateAttrs := hcl2shim.FlatmapValueFromHCL2(stateVal)
|
||||
newInstanceState.Attributes = normalizeFlatmapContainers(stateAttrs, newInstanceState.Attributes, true)
|
||||
newInstanceState.Attributes = normalizeFlatmapContainers(stateAttrs, newInstanceState.Attributes, false)
|
||||
}
|
||||
|
||||
if newInstanceState == nil || newInstanceState.ID == "" {
|
||||
|
@ -492,6 +492,8 @@ func (s *GRPCProviderServer) PlanResourceChange(_ context.Context, req *proto.Pl
|
|||
return resp, nil
|
||||
}
|
||||
|
||||
create := priorStateVal.IsNull()
|
||||
|
||||
proposedNewStateVal, err := msgpack.Unmarshal(req.ProposedNewState.Msgpack, block.ImpliedType())
|
||||
if err != nil {
|
||||
resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err)
|
||||
|
@ -533,7 +535,7 @@ func (s *GRPCProviderServer) PlanResourceChange(_ context.Context, req *proto.Pl
|
|||
}
|
||||
|
||||
// if this is a new instance, we need to make sure ID is going to be computed
|
||||
if priorStateVal.IsNull() {
|
||||
if create {
|
||||
if diff == nil {
|
||||
diff = terraform.NewInstanceDiff()
|
||||
}
|
||||
|
@ -556,6 +558,17 @@ func (s *GRPCProviderServer) PlanResourceChange(_ context.Context, req *proto.Pl
|
|||
priorState = &terraform.InstanceState{}
|
||||
}
|
||||
|
||||
// if we're not creating a new resource, remove any new computed fields
|
||||
if !create {
|
||||
for attr, d := range diff.Attributes {
|
||||
// If there's no change, then don't let this go through as NewComputed.
|
||||
// This usually only happens when Old and New are both empty.
|
||||
if d.NewComputed && d.Old == d.New {
|
||||
delete(diff.Attributes, attr)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// now we need to apply the diff to the prior state, so get the planned state
|
||||
plannedAttrs, err := diff.Apply(priorState.Attributes, block)
|
||||
|
||||
|
@ -598,7 +611,7 @@ func (s *GRPCProviderServer) PlanResourceChange(_ context.Context, req *proto.Pl
|
|||
|
||||
// if this was creating the resource, we need to set any remaining computed
|
||||
// fields
|
||||
if priorStateVal.IsNull() {
|
||||
if create {
|
||||
plannedStateVal = SetUnknowns(plannedStateVal, block)
|
||||
}
|
||||
|
||||
|
|
|
@ -709,6 +709,11 @@ func TestNormalizeFlatmapContainers(t *testing.T) {
|
|||
attrs: map[string]string{"map.%": "0", "list.#": "0", "id": "1"},
|
||||
expect: map[string]string{"id": "1", "map.%": "0", "list.#": "0"},
|
||||
},
|
||||
{
|
||||
prior: map[string]string{"list.#": "1", "list.0": "old value"},
|
||||
attrs: map[string]string{"list.#": "0"},
|
||||
expect: map[string]string{},
|
||||
},
|
||||
} {
|
||||
t.Run(strconv.Itoa(i), func(t *testing.T) {
|
||||
got := normalizeFlatmapContainers(tc.prior, tc.attrs, false)
|
||||
|
|
Loading…
Reference in New Issue