From 89b2c6f21e39c56dfef4bc20960735cd5ff5b2ea Mon Sep 17 00:00:00 2001 From: James Bardin Date: Fri, 16 Nov 2018 11:24:14 -0500 Subject: [PATCH] comment fixes --- helper/plugin/grpc_provider.go | 1 - terraform/diff.go | 6 ------ 2 files changed, 7 deletions(-) diff --git a/helper/plugin/grpc_provider.go b/helper/plugin/grpc_provider.go index 7cb51035a4..c668e9733b 100644 --- a/helper/plugin/grpc_provider.go +++ b/helper/plugin/grpc_provider.go @@ -610,7 +610,6 @@ func (s *GRPCProviderServer) ApplyResourceChange(_ context.Context, req *proto.A Type: req.TypeName, } - //priorState := terraform.NewInstanceStateShimmedFromValue(priorStateVal, res.SchemaVersion) priorState, err := res.ShimInstanceStateFromValue(priorStateVal) if err != nil { resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err) diff --git a/terraform/diff.go b/terraform/diff.go index fad3e531c6..a28d7e4822 100644 --- a/terraform/diff.go +++ b/terraform/diff.go @@ -450,11 +450,6 @@ func (d *InstanceDiff) Apply(attrs map[string]string, schema *configschema.Block } func (d *InstanceDiff) applyDiff(attrs map[string]string, schema *configschema.Block) (map[string]string, error) { - // We always build a new value here, even if the given diff is "empty", - // because we might be planning to create a new instance that happens - // to have no attributes set, and so we want to produce an empty object - // rather than just echoing back the null old value. - // Rather applying the diff to mutate the attrs, we'll copy new values into // here to avoid the possibility of leaving stale values. result := map[string]string{} @@ -513,7 +508,6 @@ func (d *InstanceDiff) applyAttrDiff(attrName string, oldAttrs map[string]string return result, nil } - // skip "id", as we already handled it if attrName == "id" { if old == "" { result["id"] = config.UnknownVariableValue