Skip to content

Commit 97ed035

Browse files
committed
Removed usage of sergi/go-diff due to a #181
1 parent 8b04321 commit 97ed035

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require (
1212
github.com/icza/dyno v0.0.0-20200205103839-49cb13720835
1313
github.com/mitchellh/go-homedir v1.1.0
1414
github.com/mitchellh/mapstructure v1.5.0
15-
github.com/sergi/go-diff v1.3.1
1615
github.com/stretchr/testify v1.9.0
1716
github.com/thedevsaddam/gojsonq/v2 v2.5.2
1817
github.com/zclconf/go-cty v1.15.0
@@ -102,6 +101,7 @@ require (
102101
github.com/pkg/errors v0.9.1 // indirect
103102
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
104103
github.com/russross/blackfriday/v2 v2.1.0 // indirect
104+
github.com/sergi/go-diff v1.3.1 // indirect
105105
github.com/spf13/cobra v1.8.1 // indirect
106106
github.com/spf13/pflag v1.0.5 // indirect
107107
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect

kubernetes/resource_kubectl_manifest.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/sergi/go-diff/diffmatchpatch"
1615
"k8s.io/cli-runtime/pkg/genericiooptions"
1716
k8sdelete "k8s.io/kubectl/pkg/cmd/delete"
1817

@@ -308,10 +307,11 @@ metadata:
308307
liveStateYaml := d.Get("live_manifest_incluster").(string)
309308
if stateYaml != liveStateYaml {
310309
log.Printf("[TRACE] DETECTED YAML STATE DIFFERENCE %s vs %s", stateYaml, liveStateYaml)
311-
dmp := diffmatchpatch.New()
312-
patches := dmp.PatchMake(stateYaml, liveStateYaml)
313-
patchText := dmp.PatchToText(patches)
314-
log.Printf("[DEBUG] DETECTED YAML INCLUSTER STATE DIFFERENCE. Patch diff: %s", patchText)
310+
// disabled due to a bug in go-diff library. See https://github.com/alekc/terraform-provider-kubectl/issues/181
311+
//dmp := diffmatchpatch.New()
312+
//patches := dmp.PatchMake(stateYaml, liveStateYaml)
313+
//patchText := dmp.PatchToText(patches)
314+
//log.Printf("[DEBUG] DETECTED YAML INCLUSTER STATE DIFFERENCE. Patch diff: %s", patchText)
315315
_ = d.SetNewComputed("yaml_incluster")
316316
}
317317

0 commit comments

Comments
 (0)