github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-28 15:47:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1885 from rhatdan/main

Browse Source 
Update module gopkg.in/yaml.v2 to v3
This commit is contained in:
Miloslav Trmač 2023-01-31 17:29:05 +01:00 committed by GitHub
commit e7f4af0651
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/skopeo/sync.go
View File

@ -26,7 +26,7 @@ import (
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v3"
) )
// syncOptions contains information retrieved from the skopeo sync command line. // syncOptions contains information retrieved from the skopeo sync command line.
@ -134,9 +134,9 @@ See skopeo-sync(1) for details.
// method for the tlsVerifyConfig type. // method for the tlsVerifyConfig type.
// It unmarshals the 'tls-verify' YAML key so that, when they key is not // It unmarshals the 'tls-verify' YAML key so that, when they key is not
// specified, tls verification is enforced. // specified, tls verification is enforced.
func (tls *tlsVerifyConfig) UnmarshalYAML(unmarshal func(interface{}) error) error { func (tls *tlsVerifyConfig) UnmarshalYAML(value *yaml.Node) error {
var verify bool var verify bool
if err := unmarshal(&verify); err != nil { if err := value.Decode(&verify); err != nil {
return err return err
} }

2
cmd/skopeo/sync_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/containers/image/v5/types" "github.com/containers/image/v5/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v3"
) )
var _ yaml.Unmarshaler = (*tlsVerifyConfig)(nil) var _ yaml.Unmarshaler = (*tlsVerifyConfig)(nil)

4
go.mod
View File

@ -18,7 +18,7 @@ require (
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
golang.org/x/term v0.4.0 golang.org/x/term v0.4.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1
) )
require ( require (
@ -132,5 +132,5 @@ require (
google.golang.org/grpc v1.51.0 // indirect google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect
) )