change import paths to forked yaml libs

natasha41575 · natasha41575 · commit 70ebea73be76 · 2023-10-23T11:03:44.000-05:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"fmt"`
`22`	`22`	`"testing"`
`23`	`23`
`24`		`- "gopkg.in/yaml.v2"`
	`24`	`+ "sigs.k8s.io/yaml/goyaml.v2"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func newBenchmarkObject() interface{} {`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ go 1.12`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/google/go-cmp v0.5.9`
`7`		`- gopkg.in/yaml.v2 v2.4.0`
	`7`	`+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"time"`
`10`	`10`
`11`	`11`	`. "gopkg.in/check.v1"`
`12`		`- "gopkg.in/yaml.v2"`
	`12`	`+ "sigs.k8s.io/yaml/goyaml.v2"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var unmarshalIntTest = 123`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"os"`
`13`	`13`
`14`	`14`	`. "gopkg.in/check.v1"`
`15`		`- "gopkg.in/yaml.v2"`
	`15`	`+ "sigs.k8s.io/yaml/goyaml.v2"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`type jsonNumberT string`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"log"`
`6`	`6`
`7`		`- "gopkg.in/yaml.v2"`
	`7`	`+ "sigs.k8s.io/yaml/goyaml.v2"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// An example showing how to unmarshal embedded`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`. "gopkg.in/check.v1"`
`8`		`- "gopkg.in/yaml.v2"`
	`8`	`+ "sigs.k8s.io/yaml/goyaml.v2"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var limitTests = []struct {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"time"`
`27`	`27`
`28`	`28`	`. "gopkg.in/check.v1"`
`29`		`- "gopkg.in/yaml.v3"`
	`29`	`+ "sigs.k8s.io/yaml/goyaml.v3"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`var unmarshalIntTest = 123`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"os"`
`28`	`28`
`29`	`29`	`. "gopkg.in/check.v1"`
`30`		`- "gopkg.in/yaml.v3"`
	`30`	`+ "sigs.k8s.io/yaml/goyaml.v3"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`var marshalIntTest = 123`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"fmt"`
`20`	`20`	`"log"`
`21`	`21`
`22`		`- "gopkg.in/yaml.v3"`
	`22`	`+ "sigs.k8s.io/yaml/goyaml.v3"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// An example showing how to unmarshal embedded`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import (`
`21`	`21`	`"os"`
`22`	`22`
`23`	`23`	`. "gopkg.in/check.v1"`
`24`		`- "gopkg.in/yaml.v3"`
`25`	`24`	`"io"`
	`25`	`+ "sigs.k8s.io/yaml/goyaml.v3"`
`26`	`26`	`"strings"`
`27`	`27`	`)`
`28`	`28`