File tree 2 files changed +6
-6
lines changed
2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ require (
12
12
github.com/icza/dyno v0.0.0-20200205103839-49cb13720835
13
13
github.com/mitchellh/go-homedir v1.1.0
14
14
github.com/mitchellh/mapstructure v1.5.0
15
- github.com/sergi/go-diff v1.3.1
16
15
github.com/stretchr/testify v1.9.0
17
16
github.com/thedevsaddam/gojsonq/v2 v2.5.2
18
17
github.com/zclconf/go-cty v1.15.0
@@ -102,6 +101,7 @@ require (
102
101
github.com/pkg/errors v0.9.1 // indirect
103
102
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
104
103
github.com/russross/blackfriday/v2 v2.1.0 // indirect
104
+ github.com/sergi/go-diff v1.3.1 // indirect
105
105
github.com/spf13/cobra v1.8.1 // indirect
106
106
github.com/spf13/pflag v1.0.5 // indirect
107
107
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ import (
12
12
"strings"
13
13
"time"
14
14
15
- "github.com/sergi/go-diff/diffmatchpatch"
16
15
"k8s.io/cli-runtime/pkg/genericiooptions"
17
16
k8sdelete "k8s.io/kubectl/pkg/cmd/delete"
18
17
@@ -308,10 +307,11 @@ metadata:
308
307
liveStateYaml := d .Get ("live_manifest_incluster" ).(string )
309
308
if stateYaml != liveStateYaml {
310
309
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)
315
315
_ = d .SetNewComputed ("yaml_incluster" )
316
316
}
317
317
You can’t perform that action at this time.
0 commit comments