commit facff44674f0375ec2c1a26535d61691b6a7e055
author Brian Flad <bflad417@gmail.com> Mon Mar 28 10:13:59 2022 -0400
committer GitHub <noreply@github.com> Mon Mar 28 10:13:59 2022 -0400
tree d0676e17fdc516197fb26feb7cac984aa5cd208e
parent d99f0b308119841f6a4e6b1b9b60eeca77d43774

deps: Remove direct dependency on github.com/sergi/go-diff (#287)

It was only being used for "pretty" text differences in 3 tests. It is still an indirect dependency due to hc-install.

```console
$ go mod why -m github.com/sergi/go-diff
# github.com/sergi/go-diff
github.com/hashicorp/terraform-exec/tfexec/internal/testutil
github.com/hashicorp/hc-install/build
github.com/go-git/go-git/v5
github.com/sergi/go-diff/diffmatchpatch
```

go.mod

diff --git a/go.mod b/go.mod
index ccc5399..03262ea 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,6 @@
 	github.com/hashicorp/go-version v1.4.0
 	github.com/hashicorp/hc-install v0.3.1
 	github.com/hashicorp/terraform-json v0.13.0
-	github.com/sergi/go-diff v1.2.0
 	github.com/zclconf/go-cty v1.10.0
 	github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b
 )
@@ -26,6 +25,7 @@
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
 	golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect

tfexec/internal/e2etest/show_test.go

diff --git a/tfexec/internal/e2etest/show_test.go b/tfexec/internal/e2etest/show_test.go
index 547fa43..5556e64 100644
--- a/tfexec/internal/e2etest/show_test.go
+++ b/tfexec/internal/e2etest/show_test.go
@@ -10,9 +10,9 @@
 	"testing"
 
 	"github.com/andybalholm/crlf"
+	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/go-version"
 	tfjson "github.com/hashicorp/terraform-json"
-	"github.com/sergi/go-diff/diffmatchpatch"
 
 	"github.com/hashicorp/terraform-exec/tfexec"
 	"github.com/hashicorp/terraform-exec/tfexec/internal/testutil"
@@ -609,10 +609,8 @@
 			t.Fatal(err)
 		}
 
-		if strings.TrimSpace(actual) != strings.TrimSpace(string(expected)) {
-			dmp := diffmatchpatch.New()
-			diffs := dmp.DiffMain(strings.TrimSpace(actual), strings.TrimSpace(string(expected)), false)
-			t.Fatalf("actual:\n\n%s\n\nexpected:\n\n%s\n\ndiff:\n\n%s", actual, string(expected), dmp.DiffPrettyText(diffs))
+		if diff := cmp.Diff(strings.TrimSpace(actual), strings.TrimSpace(string(expected))); diff != "" {
+			t.Fatalf("unexpected difference: %s", diff)
 		}
 	})
 }
@@ -640,10 +638,8 @@
 			t.Fatal(err)
 		}
 
-		if strings.TrimSpace(actual) != strings.TrimSpace(string(expected)) {
-			dmp := diffmatchpatch.New()
-			diffs := dmp.DiffMain(strings.TrimSpace(actual), strings.TrimSpace(string(expected)), false)
-			t.Fatalf("actual:\n\n%s\n\nexpected:\n\n%s\n\ndiff:\n\n%s", actual, string(expected), dmp.DiffPrettyText(diffs))
+		if diff := cmp.Diff(strings.TrimSpace(actual), strings.TrimSpace(string(expected))); diff != "" {
+			t.Fatalf("unexpected difference: %s", diff)
 		}
 	})
 }
@@ -670,10 +666,8 @@
 		if err != nil {
 			t.Fatal(err)
 		}
-		if strings.TrimSpace(actual) != strings.TrimSpace(string(expected)) {
-			dmp := diffmatchpatch.New()
-			diffs := dmp.DiffMain(strings.TrimSpace(actual), strings.TrimSpace(string(expected)), false)
-			t.Fatalf("actual:\n\n%s\n\nexpected:\n\n%s\n\ndiff:\n\n%s", actual, string(expected), dmp.DiffPrettyText(diffs))
+		if diff := cmp.Diff(strings.TrimSpace(actual), strings.TrimSpace(string(expected))); diff != "" {
+			t.Fatalf("unexpected difference: %s", diff)
 		}
 	})
 }