Skip to content

Update module gopkg.in/yaml.v2 to v3 #183

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update module gopkg.in/yaml.v2 to v3 #183

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
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ require (
github.com/go-git/go-git/v5 v5.13.1
github.com/google/go-cmp v0.6.0
github.com/google/go-github/v41 v41.0.0
github.com/hashicorp/go-version v1.7.0
github.com/lmittmann/tint v1.0.7
github.com/stretchr/testify v1.10.0
github.com/urfave/cli v1.22.16
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d
golang.org/x/oauth2 v0.25.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.16.3
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -187,6 +185,7 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/api v0.31.3 // indirect
k8s.io/apiextensions-apiserver v0.31.3 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw=
github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU=
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"github.com/rancher/charts-build-scripts/pkg/validate"
"github.com/rancher/charts-build-scripts/pkg/zip"
"github.com/urfave/cli"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

const (
Expand Down Expand Up @@ -750,7 +750,7 @@
logger.Fatal(ctx, fmt.Errorf("unable to find configuration file: %w", err).Error())
}
chartsScriptOptions := options.ChartsScriptOptions{}
if err := yaml.UnmarshalStrict(configYaml, &chartsScriptOptions); err != nil {

Check failure on line 753 in main.go

View workflow job for this annotation

GitHub Actions / test 

undefined: yaml.UnmarshalStrict

Check failure on line 753 in main.go

View workflow job for this annotation

GitHub Actions / build 

undefined: yaml.UnmarshalStrict
logger.Fatal(ctx, fmt.Errorf("unable to unmarshall configuration file: %w", err).Error())
}
return &chartsScriptOptions
Expand Down
2 changes: 1 addition & 1 deletion pkg/charts/crdchart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/rancher/charts-build-scripts/pkg/filesystem"
"github.com/rancher/charts-build-scripts/pkg/logger"
"github.com/rancher/charts-build-scripts/pkg/path"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// ValidateInstallCRDContentsFmt is the format for the contents of ChartValidateInstallCRDFile
Expand Down
2 changes: 1 addition & 1 deletion pkg/options/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/go-git/go-billy/v5"
"github.com/rancher/charts-build-scripts/pkg/filesystem"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// PackageOptions represent the options presented to users to be able to configure the way a package is built using these scripts
Expand Down
2 changes: 1 addition & 1 deletion pkg/options/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/go-git/go-billy/v5"
"github.com/rancher/charts-build-scripts/pkg/filesystem"
"github.com/rancher/charts-build-scripts/pkg/logger"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// ValidateOptions specify an upstream GitHub repository you would like to validate against
Expand Down
2 changes: 1 addition & 1 deletion pkg/regsync/generateconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/rancher/charts-build-scripts/pkg/logger"
"github.com/rancher/charts-build-scripts/pkg/path"
"golang.org/x/exp/slices"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// SyncEntry represents a single entry in the regsync.yaml file
Expand Down
Loading