refactor: remove yaml.v2

natesales · natesales · commit 0302d8c6f51d · 2023-01-03T21:33:33.000-08:00
diff --git a/cmd/dump.go b/cmd/dump.go
@@ -2,14 +2,15 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/natesales/pathvector/pkg/process"
-	"github.com/natesales/pathvector/pkg/util"
 	"os"
 	"strings"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
+
+	"github.com/natesales/pathvector/pkg/process"
+	"github.com/natesales/pathvector/pkg/util"
 )
 
 var (
diff --git a/go.mod b/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/mod v0.4.2
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 
diff --git a/go.sum b/go.sum
@@ -599,7 +599,6 @@ gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/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.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
diff --git a/pkg/process/process.go b/pkg/process/process.go
@@ -22,7 +22,6 @@ import (
 	"github.com/creasty/defaults"
 	"github.com/go-playground/validator/v10"
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 
 	"github.com/natesales/pathvector/pkg/config"
 	"github.com/natesales/pathvector/pkg/plugin"
@@ -106,7 +105,7 @@ func Load(configBlob []byte) (*config.Config, error) {
 	c.Init()
 	defaults.MustSet(&c)
 
-	if err := yaml.UnmarshalStrict(configBlob, &c); err != nil {
+	if err := util.YAMLUnmarshalStrict(configBlob, &c); err != nil {
 		return nil, fmt.Errorf("YAML unmarshal: %s", err)
 	}
 
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -1,6 +1,7 @@
 package util
 
 import (
+	"bytes"
 	"io"
 	"os"
 	"path/filepath"
@@ -10,6 +11,7 @@ import (
 
 	"github.com/olekukonko/tablewriter"
 	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
 )
 
 var alphabet = strings.Split("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", "")
@@ -193,3 +195,10 @@ func CopyFileGlob(glob, dest string) error {
 	}
 	return nil
 }
+
+// YAMLUnmarshalStrict unmarshals a YAML file into a struct
+func YAMLUnmarshalStrict(y []byte, v interface{}) error {
+	decoder := yaml.NewDecoder(bytes.NewReader(y))
+	decoder.KnownFields(true)
+	return decoder.Decode(v)
+}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ require (`
`11`	`11`	`github.com/spf13/cobra v1.2.1`
`12`	`12`	`github.com/stretchr/testify v1.7.0`
`13`	`13`	`golang.org/x/mod v0.4.2`
`14`		`- gopkg.in/yaml.v2 v2.4.0`
`15`	`14`	`gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b`
`16`	`15`	`)`
`17`	`16`