Skip to content

Migrate to go.yaml.in/yaml/v3 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrJosh9000 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate to go.yaml.in/yaml/v3 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/gowebpki/jcs v1.0.1
github.com/lestrrat-go/jwx/v2 v2.1.6
github.com/oleiade/reflections v1.1.0
gopkg.in/yaml.v3 v3.0.1
go.yaml.in/yaml/v3 v3.0.4
gotest.tools/v3 v3.5.2
)

Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
Expand Down
2 changes: 1 addition & 1 deletion ordered/map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"

"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

var _ interface {
Expand Down
2 changes: 1 addition & 1 deletion ordered/map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestMapGet(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ordered/unmarshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/buildkite/go-pipeline/warning"

"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

// Errors that can be returned by Unmarshal
Expand Down
2 changes: 1 addition & 1 deletion ordered/unmarshal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/buildkite/go-pipeline/warning"
"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions ordered/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ordered
import (
"fmt"

"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

// DecodeYAML recursively unmarshals n into a generic type (any, []any, or
Expand Down Expand Up @@ -135,7 +135,7 @@ func rangeYAMLMapImpl(merged map[*yaml.Node]bool, n *yaml.Node, f func(key strin

switch n.Kind {
case yaml.MappingNode:
// gopkg.in/yaml.v3 parses mapping node contents as a flat list:
// go.yaml.in/yaml/v3 parses mapping node contents as a flat list:
// key, value, key, value...
if len(n.Content)%2 != 0 {
return fmt.Errorf("line %d, col %d: mapping node has odd content length %d", n.Line, n.Column, len(n.Content))
Expand Down
2 changes: 1 addition & 1 deletion parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/buildkite/go-pipeline/ordered"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

// Options are functional options for creating a new Env.
Expand Down
2 changes: 1 addition & 1 deletion parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/buildkite/go-pipeline/ordered"
"github.com/buildkite/go-pipeline/warning"
"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func ptr[T any](x T) *T { return &x }
Expand Down
2 changes: 1 addition & 1 deletion pipeline_secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/buildkite/go-pipeline/ordered"
"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestPipelineSecretsUnmarshal(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path"
"strings"

"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion plugins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/buildkite/go-pipeline/ordered"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

var _ interface {
Expand Down
2 changes: 1 addition & 1 deletion secret_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/buildkite/interpolate"
"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestSecretMarshalJSON(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/buildkite/go-pipeline/ordered"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

var _ interface {
Expand Down
2 changes: 1 addition & 1 deletion secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/buildkite/go-pipeline/ordered"
"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestSecretsUnmarshalJSON(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion step_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/buildkite/go-pipeline/ordered"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

var _ interface {
Expand Down
2 changes: 1 addition & 1 deletion step_command_matrix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"slices"

"github.com/buildkite/go-pipeline/ordered"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion step_command_secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/buildkite/go-pipeline/ordered"
"github.com/google/go-cmp/cmp"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestCommandStepSecretsStringArrayFormat(t *testing.T) {
Expand Down