Skip to content

Commit 3c27935

Browse files
authored
chore: Upgrade from yaml v2 to v3 everywhere (#9279)
1 parent 4715fda commit 3c27935

14 files changed

Lines changed: 16 additions & 16 deletions

File tree

compose/compose.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/pkg/errors"
2929
"github.com/spf13/cobra"
3030
"github.com/spf13/pflag"
31-
yaml "gopkg.in/yaml.v2"
31+
yaml "gopkg.in/yaml.v3"
3232

3333
"github.com/hypermodeinc/dgraph/v24/x"
3434
)

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ require (
6464
golang.org/x/tools v0.29.0
6565
google.golang.org/grpc v1.70.0
6666
google.golang.org/protobuf v1.36.3
67-
gopkg.in/yaml.v2 v2.4.0
67+
gopkg.in/yaml.v3 v3.0.1
6868
)
6969

7070
require (
@@ -165,7 +165,7 @@ require (
165165
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
166166
gopkg.in/DataDog/dd-trace-go.v1 v1.22.0 // indirect
167167
gopkg.in/ini.v1 v1.67.0 // indirect
168-
gopkg.in/yaml.v3 v3.0.1 // indirect
168+
gopkg.in/yaml.v2 v2.4.0 // indirect
169169
gotest.tools/v3 v3.5.1 // indirect
170170
)
171171

graphql/e2e/common/error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"google.golang.org/grpc"
3333
"google.golang.org/grpc/credentials/insecure"
3434
"google.golang.org/grpc/peer"
35-
"gopkg.in/yaml.v2"
35+
"gopkg.in/yaml.v3"
3636

3737
"github.com/dgraph-io/dgo/v240"
3838
"github.com/dgraph-io/dgo/v240/protos/api"

graphql/e2e/custom_logic/cmd/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ go 1.22.7
44

55
require (
66
github.com/graph-gophers/graphql-go v1.5.0
7-
gopkg.in/yaml.v2 v2.4.0
7+
gopkg.in/yaml.v3 v3.0.1
88
)

graphql/e2e/custom_logic/cmd/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5f
1515
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1616
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1717
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
18-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
19-
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
2018
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
19+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
20+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

graphql/e2e/custom_logic/cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
graphql "github.com/graph-gophers/graphql-go"
3434
"github.com/graph-gophers/graphql-go/relay"
35-
"gopkg.in/yaml.v2"
35+
"gopkg.in/yaml.v3"
3636
)
3737

3838
type expectedRequest struct {

graphql/resolve/auth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/golang-jwt/jwt/v5"
2929
"github.com/stretchr/testify/require"
3030
"google.golang.org/grpc/metadata"
31-
"gopkg.in/yaml.v2"
31+
"gopkg.in/yaml.v3"
3232

3333
dgoapi "github.com/dgraph-io/dgo/v240/protos/api"
3434
_ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules

graphql/resolve/mutation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"testing"
2626

2727
"github.com/stretchr/testify/require"
28-
"gopkg.in/yaml.v2"
28+
"gopkg.in/yaml.v3"
2929

3030
dgoapi "github.com/dgraph-io/dgo/v240/protos/api"
3131
"github.com/hypermodeinc/dgraph/v24/graphql/dgraph"

graphql/resolve/query_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"testing"
2727

2828
"github.com/stretchr/testify/require"
29-
"gopkg.in/yaml.v2"
29+
"gopkg.in/yaml.v3"
3030

3131
_ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules
3232
"github.com/hypermodeinc/dgraph/v24/graphql/dgraph"

graphql/resolve/resolver_error_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/google/go-cmp/cmp"
2727
"github.com/pkg/errors"
2828
"github.com/stretchr/testify/require"
29-
"gopkg.in/yaml.v2"
29+
"gopkg.in/yaml.v3"
3030

3131
dgoapi "github.com/dgraph-io/dgo/v240/protos/api"
3232
"github.com/hypermodeinc/dgraph/v24/graphql/schema"

0 commit comments

Comments
 (0)