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

helper/plugin: Don't panic while preparing response in ApplyResourceChange

This commit is contained in:
Martin Atkins 2018-08-27 16:47:27 -07:00
parent 3d86dc51e0
commit c27f900d92
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helper/plugin/grpc_provider.go
View File

@ -5,6 +5,8 @@ import (
"errors" "errors"
"strconv" "strconv"
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/msgpack"
context "golang.org/x/net/context" context "golang.org/x/net/context"
"github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/config/hcl2shim"
@ -13,8 +15,6 @@ import (
"github.com/hashicorp/terraform/plugin/convert" "github.com/hashicorp/terraform/plugin/convert"
"github.com/hashicorp/terraform/plugin/proto" "github.com/hashicorp/terraform/plugin/proto"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/msgpack"
) )
// NewGRPCProviderServerShim wraps a terraform.ResourceProvider in a // NewGRPCProviderServerShim wraps a terraform.ResourceProvider in a
@ -486,7 +486,9 @@ func (s *GRPCProviderServer) ApplyResourceChange(_ context.Context, req *proto.A
resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err) resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err)
return resp, nil return resp, nil
} }
resp.NewState.Msgpack = newStateMP resp.NewState = &proto.DynamicValue{
Msgpack: newStateMP,
}
meta, err := json.Marshal(newInstanceState.Meta) meta, err := json.Marshal(newInstanceState.Meta)
if err != nil { if err != nil {