From b72ef90c2f719e412b7ae1e02bcbf9613441fd57 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 15 Nov 2016 11:53:28 -0800 Subject: [PATCH] Revert "[WIP] core: Log diff mismatch using spew instead of %#v" --- terraform/eval_diff.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/terraform/eval_diff.go b/terraform/eval_diff.go index d454b124b..7152ea6f3 100644 --- a/terraform/eval_diff.go +++ b/terraform/eval_diff.go @@ -5,7 +5,6 @@ import ( "log" "strings" - "github.com/davecgh/go-spew/spew" "github.com/hashicorp/terraform/config" ) @@ -43,11 +42,10 @@ func (n *EvalCompareDiff) Eval(ctx EvalContext) (interface{}, error) { }() if same, reason := one.Same(two); !same { - spew.Config.SortKeys = true log.Printf("[ERROR] %s: diffs didn't match", n.Info.Id) log.Printf("[ERROR] %s: reason: %s", n.Info.Id, reason) - log.Printf("[ERROR] %s: diff one: %s", n.Info.Id, spew.Sdump(one)) - log.Printf("[ERROR] %s: diff two: %s", n.Info.Id, spew.Sdump(two)) + log.Printf("[ERROR] %s: diff one: %#v", n.Info.Id, one) + log.Printf("[ERROR] %s: diff two: %#v", n.Info.Id, two) return nil, fmt.Errorf( "%s: diffs didn't match during apply. This is a bug with "+ "Terraform and should be reported as a GitHub Issue.\n"+ @@ -57,12 +55,12 @@ func (n *EvalCompareDiff) Eval(ctx EvalContext) (interface{}, error) { " Terraform Version: %s\n"+ " Resource ID: %s\n"+ " Mismatch reason: %s\n"+ - " Diff One (usually from plan): %s\n"+ - " Diff Two (usually from apply): %s\n"+ + " Diff One (usually from plan): %#v\n"+ + " Diff Two (usually from apply): %#v\n"+ "\n"+ "Also include as much context as you can about your config, state, "+ "and the steps you performed to trigger this error.\n", - n.Info.Id, Version, n.Info.Id, reason, spew.Sdump(one), spew.Sdump(two)) + n.Info.Id, Version, n.Info.Id, reason, one, two) } return nil, nil