From 88a5875cfb773723ec0838f4bf91fc6ab54ce5c3 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 9 May 2025 12:18:49 +0300 Subject: [PATCH] switch yaml package to maintained one Signed-off-by: Vasiliy Tolstov --- codec/codec.go | 6 ++---- codec/frame.go | 6 ++---- go.mod | 3 ++- go.sum | 2 ++ util/time/duration.go | 6 +++--- util/time/duration_test.go | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/codec/codec.go b/codec/codec.go index 5f8cb66b..3929a51e 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -3,8 +3,6 @@ package codec import ( "errors" - - "gopkg.in/yaml.v3" ) var ( @@ -68,10 +66,10 @@ func (m *RawMessage) MarshalYAML() ([]byte, error) { } // 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 { return errors.New("RawMessage UnmarshalYAML on nil pointer") } - *m = append((*m)[0:0], []byte(n.Value)...) + *m = append((*m)[0:0], data...) return nil } diff --git a/codec/frame.go b/codec/frame.go index 4bf0f138..a074989f 100644 --- a/codec/frame.go +++ b/codec/frame.go @@ -1,7 +1,5 @@ package codec -import "gopkg.in/yaml.v3" - // Frame gives us the ability to define raw data to send over the pipes type Frame struct { Data []byte @@ -28,8 +26,8 @@ func (m *Frame) MarshalYAML() ([]byte, error) { } // UnmarshalYAML set frame data -func (m *Frame) UnmarshalYAML(n *yaml.Node) error { - m.Data = []byte(n.Value) +func (m *Frame) UnmarshalYAML(data []byte) error { + m.Data = append((m.Data)[0:0], data...) return nil } diff --git a/go.mod b/go.mod index c47486a4..08d648b6 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( dario.cat/mergo v1.0.1 github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/KimMachineGun/automemlimit v0.7.0 + github.com/goccy/go-yaml v1.17.1 github.com/google/uuid v1.6.0 github.com/matoous/go-nanoid v1.5.1 github.com/patrickmn/go-cache v2.1.0+incompatible @@ -18,7 +19,6 @@ require ( golang.org/x/sync v0.10.0 google.golang.org/grpc v1.69.4 google.golang.org/protobuf v1.36.3 - gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -30,4 +30,5 @@ require ( golang.org/x/sys v0.29.0 // 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/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 6f2b8d02..1cd9dc20 100644 --- a/go.sum +++ b/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/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= 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/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= diff --git a/util/time/duration.go b/util/time/duration.go index 0f679c82..be4346ed 100644 --- a/util/time/duration.go +++ b/util/time/duration.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "gopkg.in/yaml.v3" + "github.com/goccy/go-yaml" ) type Duration int64 @@ -58,9 +58,9 @@ func (d Duration) MarshalYAML() (interface{}, error) { return time.Duration(d).String(), nil } -func (d *Duration) UnmarshalYAML(n *yaml.Node) error { +func (d *Duration) UnmarshalYAML(data []byte) error { var v interface{} - if err := yaml.Unmarshal([]byte(n.Value), &v); err != nil { + if err := yaml.Unmarshal(data, &v); err != nil { return err } switch value := v.(type) { diff --git a/util/time/duration_test.go b/util/time/duration_test.go index 97b3997e..338e9702 100644 --- a/util/time/duration_test.go +++ b/util/time/duration_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "gopkg.in/yaml.v3" + "github.com/goccy/go-yaml" ) func TestMarshalYAML(t *testing.T) {