Skip to content

Commit

Permalink
use our own fork of go-yaml
Browse files Browse the repository at this point in the history
Change-Id: I87fd9303c9f582efacadad79df00b3b98a696bd0
  • Loading branch information
aojea committed Oct 5, 2024
1 parent 15fac42 commit 83ecba2
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion fieldpath/fromvalue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package fieldpath
import (
"testing"

"gopkg.in/yaml.v2"
"sigs.k8s.io/structured-merge-diff/v4/value"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

func TestFromValue(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion fieldpath/set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"math/rand"
"testing"

"gopkg.in/yaml.v2"
"sigs.k8s.io/structured-merge-diff/v4/schema"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

type randomPathAlphabet []PathElement
Expand Down
5 changes: 2 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
module sigs.k8s.io/structured-merge-diff/v4

require gopkg.in/yaml.v2 v2.2.8

require (
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.5.9
github.com/google/gofuzz v1.0.0
github.com/json-iterator/go v1.1.12
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
sigs.k8s.io/yaml v1.4.0
)

go 1.13
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
2 changes: 1 addition & 1 deletion merge/multiple_appliers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"strings"
"testing"

"gopkg.in/yaml.v2"
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
"sigs.k8s.io/structured-merge-diff/v4/merge"
"sigs.k8s.io/structured-merge-diff/v4/typed"
"sigs.k8s.io/structured-merge-diff/v4/value"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

func TestMultipleAppliersSet(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion typed/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package typed
import (
"fmt"

yaml "gopkg.in/yaml.v2"
"sigs.k8s.io/structured-merge-diff/v4/schema"
"sigs.k8s.io/structured-merge-diff/v4/value"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

// YAMLObject is an object encoded in YAML.
Expand Down
2 changes: 1 addition & 1 deletion typed/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"strings"
"testing"

yaml "gopkg.in/yaml.v2"
"sigs.k8s.io/structured-merge-diff/v4/typed"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

func testdata(file string) string {
Expand Down
2 changes: 1 addition & 1 deletion value/equals_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"path/filepath"
"testing"

"gopkg.in/yaml.v2"
"sigs.k8s.io/structured-merge-diff/v4/value"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

func testdata(file string) string {
Expand Down
2 changes: 1 addition & 1 deletion value/value.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"

jsoniter "github.com/json-iterator/go"
"gopkg.in/yaml.v2"
yaml "sigs.k8s.io/yaml/goyaml.v2"
)

var (
Expand Down

0 comments on commit 83ecba2

Please sign in to comment.