From 5c09f946952d5c010ca81cae64c4a5f47667da56 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 6 Mar 2019 16:23:56 -0500 Subject: [PATCH] remove eval TODO for NormalizeObjectFromLegacySDK The normalization will take place in the provider shims, locating it with the rest of the code that attempts to match the new and legacy behavior. --- terraform/eval_apply.go | 6 ------ terraform/eval_diff.go | 6 ------ 2 files changed, 12 deletions(-) diff --git a/terraform/eval_apply.go b/terraform/eval_apply.go index 49cfe80f2..1d766cda8 100644 --- a/terraform/eval_apply.go +++ b/terraform/eval_apply.go @@ -203,12 +203,6 @@ func (n *EvalApply) Eval(ctx EvalContext) (interface{}, error) { // on the planned value, and thus get a different result during the // apply phase. This will usually lead to a "Provider produced invalid plan" // error that incorrectly blames the downstream resource for the change. - // - // TODO: Ideally we should use objchange.NormalizeObjectFromLegacySDK - // here so the rest of Terraform is shielded from some of the oddities - // of the legacy SDK, but for the moment we've done that only in - // format.ResourceChange to reduce the risk of unexpected impacts - // elsewhere. } else { for _, err := range errs { diff --git a/terraform/eval_diff.go b/terraform/eval_diff.go index 88a142dfd..461a0b508 100644 --- a/terraform/eval_diff.go +++ b/terraform/eval_diff.go @@ -229,12 +229,6 @@ func (n *EvalDiff) Eval(ctx EvalContext) (interface{}, error) { fmt.Fprintf(&buf, "\n - %s", tfdiags.FormatError(err)) } log.Print(buf.String()) - - // TODO: Ideally we should use objchange.NormalizeObjectFromLegacySDK - // here so the rest of Terraform is shielded from some of the oddities - // of the legacy SDK, but for the moment we've done that only in - // format.ResourceChange to reduce the risk of unexpected impacts - // elsewhere. } else { for _, err := range errs { diags = diags.Append(tfdiags.Sourceless(