use yamlpath with gopkg.in instead of goccy

Signed-off-by: Chris Randles <[email protected]>

Author: crandles

go.mod

@@ -6,10 +6,11 @@ toolchain go1.23.4
 
 require (
 	github.com/evanphx/json-patch v5.6.0+incompatible
-	github.com/goccy/go-yaml v1.12.0
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
+	github.com/vmware-labs/yaml-jsonpath v0.3.2
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/apiextensions-apiserver v0.32.1
 	k8s.io/apimachinery v0.32.1
 	k8s.io/apiserver v0.32.1
@@ -30,8 +31,8 @@ require (
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/fatih/color v1.10.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -54,8 +55,6 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -90,14 +89,12 @@ require (
 	golang.org/x/term v0.25.0 // indirect
 	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
 	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.32.1 // indirect
 	k8s.io/component-base v0.32.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect

go.sum

@@ -7,9 +7,9 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/goccy/go-yaml"
-	"github.com/goccy/go-yaml/parser"
+	"github.com/vmware-labs/yaml-jsonpath/pkg/yamlpath"
 	"golang.org/x/exp/maps"
+	yamlv3 "gopkg.in/yaml.v3"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -103,20 +103,25 @@ func (e lintError) String() string {
 }
 
 func getPosition(field string, source []byte) (position, error) {
-	path, err := yaml.PathString(fmt.Sprintf("$.%s", field))
+	path, err := yamlpath.NewPath(fmt.Sprintf("$.%s", field))
 	if err != nil {
 		return position{}, err
 	}
-	file, err := parser.ParseBytes([]byte(source), 0)
+	node := yamlv3.Node{}
+	err = yamlv3.Unmarshal(source, &node)
 	if err != nil {
 		return position{}, err
 	}
-	node, err := path.FilterFile(file)
+
+	nodes, err := path.Find(&node)
 	if err != nil {
 		return position{}, err
 	}
+	if len(nodes) == 0 {
+		return position{}, fmt.Errorf("no node found for field %q", field)
+	}
 	return position{
-		Line:   node.GetToken().Position.Line,
-		Column: node.GetToken().Position.Column,
+		Line:   nodes[0].Line,
+		Column: nodes[0].Column,
 	}, nil
 }

pkg/cmd/lint.go

@@ -122,7 +122,7 @@ func TestLintMarshal(t *testing.T) {
 					}},
 				},
 			},
-			expected: `../../testcases/manifests/error_x_list_map_duplicate_key.yaml:51:19: field "spec.containers[0].ports[2]": (reason: "FieldValueDuplicate"; Duplicate value: map[string]interface{}{"key":"value"})`,
+			expected: `../../testcases/manifests/error_x_list_map_duplicate_key.yaml:51:11: field "spec.containers[0].ports[2]": (reason: "FieldValueDuplicate"; Duplicate value: map[string]interface{}{"key":"value"})`,
 		},
 	}
 	for _, tc := range cases {