From 70ebea73be76b7d17736fe843698af8d4594f2c9 Mon Sep 17 00:00:00 2001 From: natasha41575 Date: Fri, 19 Aug 2022 15:35:22 -0500 Subject: [PATCH] change import paths to forked yaml libs --- bench_test.go | 2 +- go.mod | 2 +- go.sum | 2 -- goyaml.v2/decode_test.go | 2 +- goyaml.v2/encode_test.go | 2 +- goyaml.v2/example_embedded_test.go | 2 +- goyaml.v2/go.mod | 5 ----- goyaml.v2/limit_test.go | 2 +- goyaml.v3/decode_test.go | 2 +- goyaml.v3/encode_test.go | 2 +- goyaml.v3/example_embedded_test.go | 2 +- goyaml.v3/go.mod | 5 ----- goyaml.v3/limit_test.go | 2 +- goyaml.v3/node_test.go | 2 +- yaml.go | 2 +- yaml_test.go | 2 +- 16 files changed, 13 insertions(+), 25 deletions(-) delete mode 100644 goyaml.v2/go.mod delete mode 100644 goyaml.v3/go.mod diff --git a/bench_test.go b/bench_test.go index 107413b..1a715d4 100644 --- a/bench_test.go +++ b/bench_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml/goyaml.v2" ) func newBenchmarkObject() interface{} { diff --git a/go.mod b/go.mod index 5eefbaf..ee7eef6 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.12 require ( github.com/google/go-cmp v0.5.9 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 ) diff --git a/go.sum b/go.sum index 2fb6939..248ef93 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,3 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/goyaml.v2/decode_test.go b/goyaml.v2/decode_test.go index c7d104e..ce3ae0b 100644 --- a/goyaml.v2/decode_test.go +++ b/goyaml.v2/decode_test.go @@ -9,7 +9,7 @@ import ( "time" . "gopkg.in/check.v1" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml/goyaml.v2" ) var unmarshalIntTest = 123 diff --git a/goyaml.v2/encode_test.go b/goyaml.v2/encode_test.go index c8caedc..aeef023 100644 --- a/goyaml.v2/encode_test.go +++ b/goyaml.v2/encode_test.go @@ -12,7 +12,7 @@ import ( "os" . "gopkg.in/check.v1" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml/goyaml.v2" ) type jsonNumberT string diff --git a/goyaml.v2/example_embedded_test.go b/goyaml.v2/example_embedded_test.go index 171c093..fb520fc 100644 --- a/goyaml.v2/example_embedded_test.go +++ b/goyaml.v2/example_embedded_test.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml/goyaml.v2" ) // An example showing how to unmarshal embedded diff --git a/goyaml.v2/go.mod b/goyaml.v2/go.mod deleted file mode 100644 index 2cbb85a..0000000 --- a/goyaml.v2/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module gopkg.in/yaml.v2 - -go 1.15 - -require gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 diff --git a/goyaml.v2/limit_test.go b/goyaml.v2/limit_test.go index 8d8ec2d..e8e7560 100644 --- a/goyaml.v2/limit_test.go +++ b/goyaml.v2/limit_test.go @@ -5,7 +5,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml/goyaml.v2" ) var limitTests = []struct { diff --git a/goyaml.v3/decode_test.go b/goyaml.v3/decode_test.go index 1925c1b..c2f7888 100644 --- a/goyaml.v3/decode_test.go +++ b/goyaml.v3/decode_test.go @@ -26,7 +26,7 @@ import ( "time" . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" + "sigs.k8s.io/yaml/goyaml.v3" ) var unmarshalIntTest = 123 diff --git a/goyaml.v3/encode_test.go b/goyaml.v3/encode_test.go index 4a8bf2e..aa08acd 100644 --- a/goyaml.v3/encode_test.go +++ b/goyaml.v3/encode_test.go @@ -27,7 +27,7 @@ import ( "os" . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" + "sigs.k8s.io/yaml/goyaml.v3" ) var marshalIntTest = 123 diff --git a/goyaml.v3/example_embedded_test.go b/goyaml.v3/example_embedded_test.go index 9d17398..c36649a 100644 --- a/goyaml.v3/example_embedded_test.go +++ b/goyaml.v3/example_embedded_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "gopkg.in/yaml.v3" + "sigs.k8s.io/yaml/goyaml.v3" ) // An example showing how to unmarshal embedded diff --git a/goyaml.v3/go.mod b/goyaml.v3/go.mod deleted file mode 100644 index f407ea3..0000000 --- a/goyaml.v3/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module "gopkg.in/yaml.v3" - -require ( - "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 -) diff --git a/goyaml.v3/limit_test.go b/goyaml.v3/limit_test.go index 07a3cbd..b34f807 100644 --- a/goyaml.v3/limit_test.go +++ b/goyaml.v3/limit_test.go @@ -5,7 +5,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" + "sigs.k8s.io/yaml/goyaml.v3" ) var limitTests = []struct { diff --git a/goyaml.v3/node_test.go b/goyaml.v3/node_test.go index b7d0c9a..a81f679 100644 --- a/goyaml.v3/node_test.go +++ b/goyaml.v3/node_test.go @@ -21,8 +21,8 @@ import ( "os" . "gopkg.in/check.v1" - "gopkg.in/yaml.v3" "io" + "sigs.k8s.io/yaml/goyaml.v3" "strings" ) diff --git a/yaml.go b/yaml.go index 0d1ce19..fc10246 100644 --- a/yaml.go +++ b/yaml.go @@ -24,7 +24,7 @@ import ( "reflect" "strconv" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml/goyaml.v2" ) // Marshal marshals obj into JSON using stdlib json.Marshal, and then converts JSON to YAML using JSONToYAML (see that method for more reference) diff --git a/yaml_test.go b/yaml_test.go index ea44edb..b94689c 100644 --- a/yaml_test.go +++ b/yaml_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - yaml "gopkg.in/yaml.v2" + yaml "sigs.k8s.io/yaml/goyaml.v2" ) /* Test helper functions */