From 2d17d1a83dc5210c409def0cbfd9c8e3283ef454 Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Thu, 21 Sep 2023 21:36:08 +0300 Subject: [PATCH] :heavy_plus_sign: :heavy_minus_sign: Replace `gopkg.in/yaml.v3` with `github.com/goccy/go-yaml` --- config/config.go | 2 +- go.mod | 4 +++- go.sum | 4 ++++ utils/pretty.go | 5 ++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config/config.go b/config/config.go index 69c4e439e..f1b717e5f 100644 --- a/config/config.go +++ b/config/config.go @@ -12,6 +12,7 @@ import ( "strings" "github.com/creasty/defaults" + "github.com/goccy/go-yaml" "github.com/kubeshark/kubeshark/misc" "github.com/kubeshark/kubeshark/misc/version" "github.com/kubeshark/kubeshark/utils" @@ -19,7 +20,6 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/pflag" - "gopkg.in/yaml.v3" ) const ( diff --git a/go.mod b/go.mod index 956183285..6ced97221 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/docker/go-connections v0.4.0 github.com/fsnotify/fsnotify v1.6.0 github.com/gin-gonic/gin v1.9.1 + github.com/goccy/go-yaml v1.11.2 github.com/google/go-github/v37 v37.0.0 github.com/gorilla/websocket v1.4.2 github.com/pkg/errors v0.9.1 @@ -19,7 +20,6 @@ require ( github.com/rs/zerolog v1.28.0 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 - gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.12.0 k8s.io/api v0.27.1 k8s.io/apimachinery v0.27.1 @@ -162,6 +162,7 @@ require ( golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/tools v0.7.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect google.golang.org/grpc v1.53.0 // indirect @@ -169,6 +170,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/sourcemap.v1 v1.0.5 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.27.1 // indirect k8s.io/apiserver v0.27.1 // indirect k8s.io/cli-runtime v0.27.1 // indirect diff --git a/go.sum b/go.sum index 701b22169..017e2a48d 100644 --- a/go.sum +++ b/go.sum @@ -271,6 +271,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-yaml v1.11.2 h1:joq77SxuyIs9zzxEjgyLBugMQ9NEgTWxXfz2wVqwAaQ= +github.com/goccy/go-yaml v1.11.2/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.24.2/go.mod h1:wZv/9vPiUib6tkoDl+AZ/QLf5YZgMravZ7jxH2eQWAE= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -1035,6 +1037,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= diff --git a/utils/pretty.go b/utils/pretty.go index 841291e02..03089a38b 100644 --- a/utils/pretty.go +++ b/utils/pretty.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" - "gopkg.in/yaml.v3" + "github.com/goccy/go-yaml" ) func PrettyYaml(data interface{}) (result string, err error) { @@ -21,8 +21,7 @@ func PrettyYaml(data interface{}) (result string, err error) { } buffer := new(bytes.Buffer) - encoder := yaml.NewEncoder(buffer) - encoder.SetIndent(2) + encoder := yaml.NewEncoder(buffer, yaml.Indent(2)) err = encoder.Encode(unmarshalled) if err != nil {