switch yaml package to maintained one
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
		| @@ -3,8 +3,6 @@ package codec | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"errors" | 	"errors" | ||||||
|  |  | ||||||
| 	"gopkg.in/yaml.v3" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var ( | var ( | ||||||
| @@ -68,10 +66,10 @@ func (m *RawMessage) MarshalYAML() ([]byte, error) { | |||||||
| } | } | ||||||
|  |  | ||||||
| // UnmarshalYAML sets *m to a copy of data. | // UnmarshalYAML sets *m to a copy of data. | ||||||
| func (m *RawMessage) UnmarshalYAML(n *yaml.Node) error { | func (m *RawMessage) UnmarshalYAML(data []byte) error { | ||||||
| 	if m == nil { | 	if m == nil { | ||||||
| 		return errors.New("RawMessage UnmarshalYAML on nil pointer") | 		return errors.New("RawMessage UnmarshalYAML on nil pointer") | ||||||
| 	} | 	} | ||||||
| 	*m = append((*m)[0:0], []byte(n.Value)...) | 	*m = append((*m)[0:0], data...) | ||||||
| 	return nil | 	return nil | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,7 +1,5 @@ | |||||||
| package codec | package codec | ||||||
|  |  | ||||||
| import "gopkg.in/yaml.v3" |  | ||||||
|  |  | ||||||
| // Frame gives us the ability to define raw data to send over the pipes | // Frame gives us the ability to define raw data to send over the pipes | ||||||
| type Frame struct { | type Frame struct { | ||||||
| 	Data []byte | 	Data []byte | ||||||
| @@ -28,8 +26,8 @@ func (m *Frame) MarshalYAML() ([]byte, error) { | |||||||
| } | } | ||||||
|  |  | ||||||
| // UnmarshalYAML set frame data | // UnmarshalYAML set frame data | ||||||
| func (m *Frame) UnmarshalYAML(n *yaml.Node) error { | func (m *Frame) UnmarshalYAML(data []byte) error { | ||||||
| 	m.Data = []byte(n.Value) | 	m.Data = append((m.Data)[0:0], data...) | ||||||
| 	return nil | 	return nil | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								go.mod
									
									
									
									
									
								
							| @@ -6,6 +6,7 @@ require ( | |||||||
| 	dario.cat/mergo v1.0.1 | 	dario.cat/mergo v1.0.1 | ||||||
| 	github.com/DATA-DOG/go-sqlmock v1.5.2 | 	github.com/DATA-DOG/go-sqlmock v1.5.2 | ||||||
| 	github.com/KimMachineGun/automemlimit v0.7.0 | 	github.com/KimMachineGun/automemlimit v0.7.0 | ||||||
|  | 	github.com/goccy/go-yaml v1.17.1 | ||||||
| 	github.com/google/uuid v1.6.0 | 	github.com/google/uuid v1.6.0 | ||||||
| 	github.com/matoous/go-nanoid v1.5.1 | 	github.com/matoous/go-nanoid v1.5.1 | ||||||
| 	github.com/patrickmn/go-cache v2.1.0+incompatible | 	github.com/patrickmn/go-cache v2.1.0+incompatible | ||||||
| @@ -18,7 +19,6 @@ require ( | |||||||
| 	golang.org/x/sync v0.10.0 | 	golang.org/x/sync v0.10.0 | ||||||
| 	google.golang.org/grpc v1.69.4 | 	google.golang.org/grpc v1.69.4 | ||||||
| 	google.golang.org/protobuf v1.36.3 | 	google.golang.org/protobuf v1.36.3 | ||||||
| 	gopkg.in/yaml.v3 v3.0.1 |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| require ( | require ( | ||||||
| @@ -30,4 +30,5 @@ require ( | |||||||
| 	golang.org/x/sys v0.29.0 // indirect | 	golang.org/x/sys v0.29.0 // indirect | ||||||
| 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect | 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect | ||||||
| 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | ||||||
|  | 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||||
| ) | ) | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								go.sum
									
									
									
									
									
								
							| @@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 | |||||||
| github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
| github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= | github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= | ||||||
| github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= | github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= | ||||||
|  | github.com/goccy/go-yaml v1.17.1 h1:LI34wktB2xEE3ONG/2Ar54+/HJVBriAGJ55PHls4YuY= | ||||||
|  | github.com/goccy/go-yaml v1.17.1/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= | ||||||
| github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= | github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= | ||||||
| github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= | github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= | ||||||
| github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= | github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ import ( | |||||||
| 	"strconv" | 	"strconv" | ||||||
| 	"time" | 	"time" | ||||||
|  |  | ||||||
| 	"gopkg.in/yaml.v3" | 	"github.com/goccy/go-yaml" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| type Duration int64 | type Duration int64 | ||||||
| @@ -58,9 +58,9 @@ func (d Duration) MarshalYAML() (interface{}, error) { | |||||||
| 	return time.Duration(d).String(), nil | 	return time.Duration(d).String(), nil | ||||||
| } | } | ||||||
|  |  | ||||||
| func (d *Duration) UnmarshalYAML(n *yaml.Node) error { | func (d *Duration) UnmarshalYAML(data []byte) error { | ||||||
| 	var v interface{} | 	var v interface{} | ||||||
| 	if err := yaml.Unmarshal([]byte(n.Value), &v); err != nil { | 	if err := yaml.Unmarshal(data, &v); err != nil { | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
| 	switch value := v.(type) { | 	switch value := v.(type) { | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ import ( | |||||||
| 	"testing" | 	"testing" | ||||||
| 	"time" | 	"time" | ||||||
|  |  | ||||||
| 	"gopkg.in/yaml.v3" | 	"github.com/goccy/go-yaml" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| func TestMarshalYAML(t *testing.T) { | func TestMarshalYAML(t *testing.T) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user