Vendor github.com/braydonk/yaml (google#245)

* Vendor github.com/braydonk/yaml

The yaml.v3 package upstream is now archived. This means there is no hope of my patches ever being committed upstream. As such, there is
nothing to gain by maintaining this library in a separate repo.
It will be easier for people to contribute to if it's in this repo.
I will keep github.com/braydonk/yaml alive purely for the select few who pull
the package for the couple of patches that upstream never merged.

* fix test workflows cause the yaml package fails everything

Author: braydonk

.github/workflows/ci.yaml

@@ -53,10 +53,10 @@ jobs:
         run: go mod tidy
 
       - name: Go Vet
-        run: go vet ./...
+        run: make vet
 
       - name: Test
-        run: go test -v ./...
+        run: make test_v
 
       - name: Integration Test
         run: make integrationtest

Makefile

@@ -15,7 +15,12 @@ test:
 
 .PHONY: test_v
 test_v:
-	go test -v ./...
+	@go test -v $$(go list ./... | grep -v "pkg/yaml")
+	@go test ./pkg/yaml/formattest
+
+.PHONY: vet
+vet:
+	go vet $$(go list ./... | grep -v "pkg/yaml")
 
 YAMLFMT_BIN ?= $(shell pwd)/dist/yamlfmt
 .PHONY: integrationtest
@@ -53,10 +58,12 @@ install:
 install_tools:
 	go install github.com/google/addlicense@latest
 
+ADDLICENSE = addlicense -ignore "**/testdata/**" -ignore "**/pkg/yaml/**" -c "Google LLC" -l apache
+
 .PHONY: addlicense
 addlicense:
-	addlicense -ignore "**/testdata/**" -c "Google LLC" -l apache .
+	$(ADDLICENSE) .
 
 .PHONY: addlicense_check
 addlicense_check:
-	addlicense -check -ignore "**/testdata/**" -c "Google LLC" -l apache .
+	$(ADDLICENSE) -check .

cmd/yamlfmt/config.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt"
 	"github.com/google/yamlfmt/command"
 	"github.com/google/yamlfmt/engine"

command/command.go

@@ -23,9 +23,8 @@ import (
 
 	"github.com/google/yamlfmt"
 	"github.com/google/yamlfmt/engine"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/mitchellh/mapstructure"
-
-	"github.com/braydonk/yaml"
 )
 
 type FormatterConfig struct {

docs/config-file.md

@@ -105,5 +105,5 @@ This hotfix is flaky. It is very hard to reconstruct data like this without pars
 
 In addition, while with this feature the `%YAML` directive may work, the formatter very specifically supports only the [YAML 1.2 spec](https://yaml.org/spec/1.2.2/). So the `%YAML:1.0` directive won't have the desired effect when passing a file through `yamlfmt`, and if you have 1.0-only syntax in your document the formatter may end up failing in other ways that will be unfixable.
 
-[1]: https://www.github.com/braydonk/yaml
+[1]: ../pkg/yaml/
 [Specifying Paths]: ./paths.md

formatters/basic/anchors/check.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 )
 
 func Check(n yaml.Node) error {

formatters/basic/anchors/check_test.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt/formatters/basic/anchors"
 )
 

formatters/basic/features.go

@@ -15,7 +15,7 @@
 package basic
 
 import (
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt"
 	"github.com/google/yamlfmt/formatters/basic/anchors"
 	"github.com/google/yamlfmt/internal/features"

formatters/basic/formatter.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt"
 	"github.com/mitchellh/mapstructure"
 )

go.mod

@@ -4,11 +4,11 @@ go 1.21
 
 require (
 	github.com/bmatcuk/doublestar/v4 v4.7.1
-	github.com/braydonk/yaml v0.9.0
 	github.com/google/go-cmp v0.6.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
+	gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
 )
 
 require golang.org/x/text v0.14.0 // indirect