glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-12 15:17:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

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

4
go.mod
View file

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

4
internal/encoding/yaml/codec.go
View file

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

44
internal/encoding/yaml/codec_test.go
View file

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

48
viper_test.go
View file

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