-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(encoding): experimental toml v2 support
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
- Loading branch information
1 parent
98c10c3
commit b13f096
Showing
7 changed files
with
141 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| //go:build !viper_toml2 | ||
| // +build !viper_toml2 | ||
|
|
||
| package toml | ||
|
|
||
| import ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| //go:build viper_toml2 | ||
| // +build viper_toml2 | ||
|
|
||
| package toml | ||
|
|
||
| import ( | ||
| "github.com/pelletier/go-toml/v2" | ||
| ) | ||
|
|
||
| // Codec implements the encoding.Encoder and encoding.Decoder interfaces for TOML encoding. | ||
| type Codec struct{} | ||
|
|
||
| func (Codec) Encode(v map[string]interface{}) ([]byte, error) { | ||
| return toml.Marshal(v) | ||
| } | ||
|
|
||
| func (Codec) Decode(b []byte, v map[string]interface{}) error { | ||
| return toml.Unmarshal(b, &v) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| //go:build viper_toml2 | ||
| // +build viper_toml2 | ||
|
|
||
| package toml | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
| ) | ||
|
|
||
| // original form of the data | ||
| const original = `# key-value pair | ||
| key = "value" | ||
| list = ["item1", "item2", "item3"] | ||
| [map] | ||
| key = "value" | ||
| # nested | ||
| # map | ||
| [nested_map] | ||
| [nested_map.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] | ||
| [nested_map.map] | ||
| key = 'value' | ||
| list = ['item1', 'item2', 'item3'] | ||
| ` | ||
|
|
||
| // Viper's internal representation | ||
| var data = map[string]interface{}{ | ||
| "key": "value", | ||
| "list": []interface{}{ | ||
| "item1", | ||
| "item2", | ||
| "item3", | ||
| }, | ||
| "map": map[string]interface{}{ | ||
| "key": "value", | ||
| }, | ||
| "nested_map": map[string]interface{}{ | ||
| "map": map[string]interface{}{ | ||
| "key": "value", | ||
| "list": []interface{}{ | ||
| "item1", | ||
| "item2", | ||
| "item3", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| func TestCodec_Encode(t *testing.T) { | ||
| codec := Codec{} | ||
|
|
||
| b, err := codec.Encode(data) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| if encoded != string(b) { | ||
| t.Fatalf("decoded value does not match the expected one\nactual: %#v\nexpected: %#v", string(b), encoded) | ||
| } | ||
| } | ||
|
|
||
| func TestCodec_Decode(t *testing.T) { | ||
| t.Run("OK", func(t *testing.T) { | ||
| codec := Codec{} | ||
|
|
||
| v := map[string]interface{}{} | ||
|
|
||
| err := codec.Decode([]byte(original), v) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| if !reflect.DeepEqual(data, v) { | ||
| t.Fatalf("decoded value does not match the expected one\nactual: %#v\nexpected: %#v", v, data) | ||
| } | ||
| }) | ||
|
|
||
| t.Run("InvalidData", func(t *testing.T) { | ||
| codec := Codec{} | ||
|
|
||
| v := map[string]interface{}{} | ||
|
|
||
| err := codec.Decode([]byte(`invalid data`), v) | ||
| if err == nil { | ||
| t.Fatal("expected decoding to fail") | ||
| } | ||
|
|
||
| t.Logf("decoding failed as expected: %s", err) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| //go:build !viper_toml2 | ||
| // +build !viper_toml2 | ||
|
|
||
| package toml | ||
|
|
||
| import ( | ||
|
|
||