upgrade gopkg.in/yaml.v2 to gopkg.in/yaml.v3

This commit is contained in:
Inteon 2021-12-15 23:13:53 +01:00
parent 04d3a0cb02
commit 8317acfc14
No known key found for this signature in database
GPG key ID: BD5DCF7303C7C1A7
5 changed files with 58 additions and 56 deletions

View file

@ -195,12 +195,12 @@ var yamlExample = []byte(`
Hacker: true
name: steve
hobbies:
- skateboarding
- snowboarding
- go
- skateboarding
- snowboarding
- go
clothing:
jacket: leather
trousers: denim
jacket: leather
trousers: denim
age: 35
eyes : brown
beard: true
@ -794,8 +794,8 @@ You can use your favorite format's marshaller with the config returned by `AllSe
```go
import (
yaml "gopkg.in/yaml.v2"
// ...
yaml "gopkg.in/yaml.v3"
// ...
)
func yamlStringSettings() string {

4
go.mod
View file

@ -16,7 +16,7 @@ require (
github.com/stretchr/testify v1.7.0
github.com/subosito/gotenv v1.2.0
gopkg.in/ini.v1 v1.66.2
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)
require (
@ -65,5 +65,5 @@ require (
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.43.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

View file

@ -1,6 +1,8 @@
package yaml
import "gopkg.in/yaml.v2"
import (
"gopkg.in/yaml.v3"
)
// Codec implements the encoding.Encoder and encoding.Decoder interfaces for YAML encoding.
type Codec struct{}

View file

@ -9,38 +9,38 @@ import (
const original = `# key-value pair
key: value
list:
- item1
- item2
- item3
- item1
- item2
- item3
map:
key: value
key: value
# nested
# map
nested_map:
map:
key: value
list:
- item1
- item2
- item3
map:
key: value
list:
- item1
- item2
- item3
`
// encoded form of the data
const encoded = `key: value
list:
- item1
- item2
- item3
map:
key: value
nested_map:
map:
key: value
list:
- item1
- item2
- item3
map:
key: value
nested_map:
map:
key: value
list:
- item1
- item2
- item3
`
// decoded form of the data
@ -54,11 +54,11 @@ var decoded = map[string]interface{}{
"item2",
"item3",
},
"map": map[interface{}]interface{}{
"map": map[string]interface{}{
"key": "value",
},
"nested_map": map[interface{}]interface{}{
"map": map[interface{}]interface{}{
"nested_map": map[string]interface{}{
"map": map[string]interface{}{
"key": "value",
"list": []interface{}{
"item1",

View file

@ -36,14 +36,14 @@ import (
var yamlExample = []byte(`Hacker: true
name: steve
hobbies:
- skateboarding
- snowboarding
- go
- skateboarding
- snowboarding
- go
clothing:
jacket: leather
trousers: denim
pants:
size: large
jacket: leather
trousers: denim
pants:
size: large
age: 35
eyes : brown
beard: true
@ -1561,16 +1561,16 @@ p_batters.batter.type = Regular
var yamlWriteExpected = []byte(`age: 35
beard: true
clothing:
jacket: leather
pants:
size: large
trousers: denim
jacket: leather
pants:
size: large
trousers: denim
eyes: brown
hacker: true
hobbies:
- skateboarding
- snowboarding
- go
- skateboarding
- snowboarding
- go
name: steve
`)
@ -2413,21 +2413,21 @@ func TestUnmarshal_DotSeparatorBackwardCompatibility(t *testing.T) {
var yamlExampleWithDot = []byte(`Hacker: true
name: steve
hobbies:
- skateboarding
- snowboarding
- go
- skateboarding
- snowboarding
- go
clothing:
jacket: leather
trousers: denim
pants:
size: large
jacket: leather
trousers: denim
pants:
size: large
age: 35
eyes : brown
beard: true
emails:
steve@hacker.com:
created: 01/02/03
active: true
steve@hacker.com:
created: 01/02/03
active: true
`)
func TestKeyDelimiter(t *testing.T) {