Refactor to use only gopkg.in/yaml.v3

vektra · Oct 15, 2024 · 7ea7946 · 7ea7946
1 parent 4d3bfa7
commit 7ea7946
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/cmd/showconfig.go b/cmd/showconfig.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vektra/mockery/v2/pkg/config"
 	"github.com/vektra/mockery/v2/pkg/logging"
 	"github.com/vektra/mockery/v2/pkg/stackerr"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 func NewShowConfigCmd() *cobra.Command {
@@ -49,13 +49,14 @@ func showConfig(
 	if err != nil {
 		panic(err)
 	}
-	out, err := yaml.Marshal(cfgMap)
-	if err != nil {
+
+	encoder := yaml.NewEncoder(outputter)
+	encoder.SetIndent(2)
+	if err := encoder.Encode(cfgMap); err != nil {
 		return stackerr.NewStackErrf(err, "failed to marshal yaml")
 	}
 
 	log.Info().Msgf("Using config: %s", config.Config)
 
-	fmt.Fprintf(outputter, "%s", string(out))
 	return nil
 }
diff --git a/go.mod b/go.mod
@@ -18,7 +18,6 @@ require (
 	github.com/stretchr/testify v1.8.2
 	golang.org/x/term v0.5.0
 	golang.org/x/tools v0.17.0
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

diff --git a/go.sum b/go.sum
@@ -514,8 +514,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=