containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to use gopkg.in/yaml.v3 

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2022-06-17 11:00:21 -04:00
parent 04de0dabce
commit 948866e8a0
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -71,7 +71,7 @@ require (
golang.org/x/text v0.3.7 golang.org/x/text v0.3.7
google.golang.org/protobuf v1.28.0 google.golang.org/protobuf v1.28.0
gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1
) )
require github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316 // indirect require github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316 // indirect

6
pkg/domain/infra/abi/play.go
View File

@ -31,7 +31,7 @@ import (
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
yamlv2 "gopkg.in/yaml.v2" yamlv3 "gopkg.in/yaml.v3"
) )
// createServiceContainer creates a container that can later on // createServiceContainer creates a container that can later on
@ -790,7 +790,7 @@ func readConfigMapFromFile(r io.Reader) (v1.ConfigMap, error) {
func splitMultiDocYAML(yamlContent []byte) ([][]byte, error) { func splitMultiDocYAML(yamlContent []byte) ([][]byte, error) {
var documentList [][]byte var documentList [][]byte
d := yamlv2.NewDecoder(bytes.NewReader(yamlContent)) d := yamlv3.NewDecoder(bytes.NewReader(yamlContent))
for { for {
var o interface{} var o interface{}
// read individual document // read individual document
@ -804,7 +804,7 @@ func splitMultiDocYAML(yamlContent []byte) ([][]byte, error) {
if o != nil { if o != nil {
// back to bytes // back to bytes
document, err := yamlv2.Marshal(o) document, err := yamlv3.Marshal(o)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "individual doc yaml could not be marshalled") return nil, errors.Wrapf(err, "individual doc yaml could not be marshalled")
} }

2
vendor/modules.txt vendored
View File

@ -863,9 +863,9 @@ gopkg.in/square/go-jose.v2/json
# gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 # gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
gopkg.in/tomb.v1 gopkg.in/tomb.v1
# gopkg.in/yaml.v2 v2.4.0 # gopkg.in/yaml.v2 v2.4.0
## explicit
gopkg.in/yaml.v2 gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.1 # gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3 gopkg.in/yaml.v3
# sigs.k8s.io/yaml v1.3.0 # sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml sigs.k8s.io/yaml