Skip to content

Commit c2cbb9f

Browse files
Merge pull request #205 from mikelolasagasti/yamlv3
Update dependency to gopkg.in/yaml.v3
2 parents d912c25 + dff53c6 commit c2cbb9f

5 files changed

Lines changed: 23 additions & 23 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/mitchellh/go-homedir v1.1.0
77
golang.org/x/sys v0.19.0
88
golang.org/x/text v0.14.0
9-
gopkg.in/yaml.v2 v2.4.0
9+
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

1212
go 1.21.6

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1010
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
1111
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1212
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
13-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
14-
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
13+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
14+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

openstack/clientconfig/requests.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/gophercloud/utils/v2/internal"
1717

1818
"github.com/hashicorp/go-uuid"
19-
yaml "gopkg.in/yaml.v2"
19+
yaml "gopkg.in/yaml.v3"
2020
)
2121

2222
// AuthType respresents a valid method of authentication.

openstack/clientconfig/testing/requests_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/gophercloud/utils/v2/openstack/clientconfig"
1111

1212
th "github.com/gophercloud/gophercloud/v2/testhelper"
13-
yaml "gopkg.in/yaml.v2"
13+
yaml "gopkg.in/yaml.v3"
1414
)
1515

1616
func TestGetCloudFromYAML(t *testing.T) {

openstack/clientconfig/testing/results_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@ import (
66
"github.com/gophercloud/utils/v2/openstack/clientconfig"
77

88
th "github.com/gophercloud/gophercloud/v2/testhelper"
9-
yaml "gopkg.in/yaml.v2"
9+
yaml "gopkg.in/yaml.v3"
1010
)
1111

1212
var VirginiaExpected = `clouds:
13-
virginia:
14-
auth:
15-
auth_url: https://va.example.com:5000/v3
16-
application_credential_id: app-cred-id
17-
application_credential_secret: secret
18-
auth_type: v3applicationcredential
19-
region_name: VA
20-
verify: true
13+
virginia:
14+
auth:
15+
auth_url: https://va.example.com:5000/v3
16+
application_credential_id: app-cred-id
17+
application_credential_secret: secret
18+
auth_type: v3applicationcredential
19+
region_name: VA
20+
verify: true
2121
`
2222

2323
var HawaiiExpected = `clouds:
24-
hawaii:
25-
auth:
26-
auth_url: https://hi.example.com:5000/v3
27-
username: jdoe
28-
password: password
29-
project_name: Some Project
30-
domain_name: default
31-
region_name: HNL
32-
verify: true
24+
hawaii:
25+
auth:
26+
auth_url: https://hi.example.com:5000/v3
27+
username: jdoe
28+
password: password
29+
project_name: Some Project
30+
domain_name: default
31+
region_name: HNL
32+
verify: true
3333
`
3434

3535
func TestMarshallCloudToYaml(t *testing.T) {

0 commit comments

Comments
 (0)