Skip to content
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.

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

Bump gopkg.in/yaml to v3 #2951

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21.6

require (
golang.org/x/crypto v0.20.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)

require golang.org/x/sys v0.17.0 // indirect
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
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.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=
2 changes: 1 addition & 1 deletion openstack/config/clouds/clouds.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"reflect"

"github.com/gophercloud/gophercloud/v2"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// Parse fetches a clouds.yaml file from disk and returns the parsed
Expand Down
2 changes: 1 addition & 1 deletion openstack/container/v1/capsules/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package capsules
import (
"encoding/json"

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

// Template is a structure that represents OpenStack Zun Capsule templates
Expand Down
12 changes: 6 additions & 6 deletions openstack/container/v1/capsules/testing/fixtures_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ var ValidYAMLTemplateParsed = map[string]interface{}{
"app1": "web1",
},
},
"spec": map[interface{}]interface{}{
"spec": map[string]interface{}{
"restartPolicy": "Always",
"containers": []map[interface{}]interface{}{
"containers": []map[string]interface{}{
{
"image": "ubuntu",
"command": []interface{}{
Expand All @@ -153,20 +153,20 @@ var ValidYAMLTemplateParsed = map[string]interface{}{
"imagePullPolicy": "ifnotpresent",
"workDir": "/root",
"ports": []interface{}{
map[interface{}]interface{}{
map[string]interface{}{
"name": "nginx-port",
"containerPort": 80,
"hostPort": 80,
"protocol": "TCP",
},
},
"resources": map[interface{}]interface{}{
"requests": map[interface{}]interface{}{
"resources": map[string]interface{}{
"requests": map[string]interface{}{
"cpu": 1,
"memory": 1024,
},
},
"env": map[interface{}]interface{}{
"env": map[string]interface{}{
"ENV1": "/usr/local/bin",
"ENV2": "/usr/bin",
},
Expand Down
2 changes: 1 addition & 1 deletion openstack/orchestration/v1/stacks/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

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

// Environment is a structure that represents stack environments
Expand Down
2 changes: 1 addition & 1 deletion openstack/orchestration/v1/stacks/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"github.com/gophercloud/gophercloud/v2"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"
)

// Template is a structure that represents OpenStack Heat templates
Expand Down
2 changes: 1 addition & 1 deletion openstack/orchestration/v1/stacks/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"reflect"

"github.com/gophercloud/gophercloud/v2"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"
)

// Client is an interface that expects a Get method similar to http.Get. This
Expand Down
Loading