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

normalize all objects read from the provider

Browse Source 
Use objchange.NormalizeObjectFromLegacySDK to ensure that all objects
returned from the provider match what is expected based on the
configuration according to the schemas.
This commit is contained in:
James Bardin 2019-03-06 14:09:01 -05:00
parent fe9a5592bc
commit 209a0a460a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helper/plugin/grpc_provider.go
View File

@ -9,6 +9,8 @@ import (
"strconv"
"strings"
"github.com/hashicorp/terraform/plans/objchange"
"github.com/zclconf/go-cty/cty"
ctyconvert "github.com/zclconf/go-cty/cty/convert"
"github.com/zclconf/go-cty/cty/msgpack"
@ -458,6 +460,7 @@ func (s *GRPCProviderServer) ReadResource(_ context.Context, req *proto.ReadReso
}
newStateVal = copyTimeoutValues(newStateVal, stateVal)
newStateVal = objchange.NormalizeObjectFromLegacySDK(newStateVal, block)
newStateMP, err := msgpack.Marshal(newStateVal, block.ImpliedType())
if err != nil {
@ -594,6 +597,7 @@ func (s *GRPCProviderServer) PlanResourceChange(_ context.Context, req *proto.Pl
}
plannedStateVal = copyTimeoutValues(plannedStateVal, proposedNewStateVal)
plannedStateVal = objchange.NormalizeObjectFromLegacySDK(plannedStateVal, block)
// The old SDK code has some imprecisions that cause it to sometimes
// generate differences that the SDK itself does not consider significant
@ -832,6 +836,7 @@ func (s *GRPCProviderServer) ApplyResourceChange(_ context.Context, req *proto.A
newStateVal = normalizeNullValues(newStateVal, plannedStateVal, false)
newStateVal = copyTimeoutValues(newStateVal, plannedStateVal)
newStateVal = objchange.NormalizeObjectFromLegacySDK(newStateVal, block)
newStateMP, err := msgpack.Marshal(newStateVal, block.ImpliedType())
if err != nil {
@ -955,6 +960,7 @@ func (s *GRPCProviderServer) ReadDataSource(_ context.Context, req *proto.ReadDa
}
newStateVal = copyTimeoutValues(newStateVal, configVal)
newStateVal = objchange.NormalizeObjectFromLegacySDK(newStateVal, block)
newStateMP, err := msgpack.Marshal(newStateVal, block.ImpliedType())
if err != nil {