Skip to content

Commit

Permalink
deps: Remove direct dependency on github.com/sergi/go-diff (#287)
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
bflad committed Mar 28, 2022
1 parent d99f0b3 commit facff44
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -8,7 +8,6 @@ require (
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
)
Expand All @@ -26,6 +25,7 @@ require (
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
Expand Down
20 changes: 7 additions & 13 deletions tfexec/internal/e2etest/show_test.go
Expand Up @@ -10,9 +10,9 @@ import (
"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"
Expand Down Expand Up @@ -609,10 +609,8 @@ func TestShowPlanFileRaw012_linux(t *testing.T) {
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)
}
})
}
Expand Down Expand Up @@ -640,10 +638,8 @@ func TestShowPlanFileRaw013(t *testing.T) {
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)
}
})
}
Expand All @@ -670,10 +666,8 @@ func TestShowPlanFileRaw014(t *testing.T) {
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)
}
})
}
Expand Down

0 comments on commit facff44

Please sign in to comment.