diff --git a/cmd/get.go b/cmd/get.go index 1243695..d7a83b7 100644 --- a/cmd/get.go +++ b/cmd/get.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/lunarway/shuttle/pkg/errors" "github.com/lunarway/shuttle/pkg/templates" diff --git a/go.mod b/go.mod index 47d4ec1..1def4fa 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 - gopkg.in/yaml.v3 v3.0.1 // indirect + gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -21,7 +21,6 @@ require ( github.com/otiai10/copy v1.12.0 golang.org/x/mod v0.12.0 golang.org/x/sync v0.3.0 - gopkg.in/yaml.v2 v2.4.0 ) require ( diff --git a/go.sum b/go.sum index 92ec20a..4e5e999 100644 --- a/go.sum +++ b/go.sum @@ -94,8 +94,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/config/shuttleconfig.go b/pkg/config/shuttleconfig.go index d841f80..448c613 100644 --- a/pkg/config/shuttleconfig.go +++ b/pkg/config/shuttleconfig.go @@ -9,7 +9,7 @@ import ( shuttleerrors "github.com/lunarway/shuttle/pkg/errors" "github.com/lunarway/shuttle/pkg/ui" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) // DynamicYaml are any yaml document diff --git a/pkg/config/shuttleplan.go b/pkg/config/shuttleplan.go index f788c73..6aea241 100644 --- a/pkg/config/shuttleplan.go +++ b/pkg/config/shuttleplan.go @@ -12,7 +12,7 @@ import ( "github.com/lunarway/shuttle/pkg/errors" "github.com/lunarway/shuttle/pkg/git" "github.com/lunarway/shuttle/pkg/ui" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) // ShuttlePlanScript is a ShuttlePlan sub-element diff --git a/pkg/sdk/context.go b/pkg/sdk/context.go index 070f840..52c262a 100644 --- a/pkg/sdk/context.go +++ b/pkg/sdk/context.go @@ -6,7 +6,7 @@ import ( "path" "github.com/lunarway/shuttle/pkg/config" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type ShuttleContext struct { diff --git a/pkg/templates/funcs.go b/pkg/templates/funcs.go index 5ec0054..d4ae7f9 100644 --- a/pkg/templates/funcs.go +++ b/pkg/templates/funcs.go @@ -9,7 +9,7 @@ import ( "text/template" sprig "github.com/Masterminds/sprig/v3" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" ) type KeyValuePair struct { diff --git a/pkg/templates/funcs_test.go b/pkg/templates/funcs_test.go index a7d180c..0581f1d 100644 --- a/pkg/templates/funcs_test.go +++ b/pkg/templates/funcs_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) var (