Merge pull request #17342 from mtrmac/mpb

Update to github.com/vbauerster/mpb/v8

vendor/github.com/containers/image/v5/copy/copy.go

@@ -31,7 +31,7 @@ import (
 	digest "github.com/opencontainers/go-digest"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
-	"github.com/vbauerster/mpb/v7"
+	"github.com/vbauerster/mpb/v8"
 	"golang.org/x/sync/semaphore"
 	"golang.org/x/term"
 )

vendor/github.com/containers/image/v5/copy/progress_bars.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/containers/image/v5/internal/private"
 	"github.com/containers/image/v5/types"
-	"github.com/vbauerster/mpb/v7"
-	"github.com/vbauerster/mpb/v7/decor"
+	"github.com/vbauerster/mpb/v8"
+	"github.com/vbauerster/mpb/v8/decor"
 )
 
 // newProgressPool creates a *mpb.Progress.

vendor/github.com/containers/image/v5/docker/registries_d.go

@@ -13,9 +13,9 @@ import (
 	"github.com/containers/image/v5/internal/rootless"
 	"github.com/containers/image/v5/types"
 	"github.com/containers/storage/pkg/homedir"
-	"github.com/ghodss/yaml"
 	"github.com/opencontainers/go-digest"
 	"github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
 )
 
 // systemRegistriesDirPath is the path to registries.d, used for locating lookaside Docker signature storage.
@@ -39,18 +39,18 @@ var defaultDockerDir = "/var/lib/containers/sigstore"
 // registryConfiguration is one of the files in registriesDirPath configuring lookaside locations, or the result of merging them all.
 // NOTE: Keep this in sync with docs/registries.d.md!
 type registryConfiguration struct {
-	DefaultDocker *registryNamespace `json:"default-docker"`
+	DefaultDocker *registryNamespace `yaml:"default-docker"`
 	// The key is a namespace, using fully-expanded Docker reference format or parent namespaces (per dockerReference.PolicyConfiguration*),
-	Docker map[string]registryNamespace `json:"docker"`
+	Docker map[string]registryNamespace `yaml:"docker"`
 }
 
 // registryNamespace defines lookaside locations for a single namespace.
 type registryNamespace struct {
-	Lookaside              string `json:"lookaside"`         // For reading, and if LookasideStaging is not present, for writing.
-	LookasideStaging       string `json:"lookaside-staging"` // For writing only.
-	SigStore               string `json:"sigstore"`          // For compatibility, deprecated in favor of Lookaside.
-	SigStoreStaging        string `json:"sigstore-staging"`  // For compatibility, deprecated in favor of LookasideStaging.
-	UseSigstoreAttachments *bool  `json:"use-sigstore-attachments,omitempty"`
+	Lookaside              string `yaml:"lookaside"`         // For reading, and if LookasideStaging is not present, for writing.
+	LookasideStaging       string `yaml:"lookaside-staging"` // For writing only.
+	SigStore               string `yaml:"sigstore"`          // For compatibility, deprecated in favor of Lookaside.
+	SigStoreStaging        string `yaml:"sigstore-staging"`  // For compatibility, deprecated in favor of LookasideStaging.
+	UseSigstoreAttachments *bool  `yaml:"use-sigstore-attachments,omitempty"`
 }
 
 // lookasideStorageBase is an "opaque" type representing a lookaside Docker signature storage.

vendor/github.com/containers/image/v5/internal/manifest/errors.go

@@ -2,6 +2,10 @@ package manifest
 
 import "fmt"
 
+// FIXME: This is a duplicate of c/image/manifestDockerV2Schema2ConfigMediaType.
+// Deduplicate that, depending on outcome of https://github.com/containers/image/pull/1791 .
+const dockerV2Schema2ConfigMediaType = "application/vnd.docker.container.image.v1+json"
+
 // NonImageArtifactError (detected via errors.As) is used when asking for an image-specific operation
 // on an object which is not a “container image” in the standard sense (e.g. an OCI artifact)
 //
@@ -28,5 +32,9 @@ func NewNonImageArtifactError(mimeType string) error {
 }
 
 func (e NonImageArtifactError) Error() string {
+	// Special-case these invalid mixed images, which show up from time to time:
+	if e.mimeType == dockerV2Schema2ConfigMediaType {
+		return fmt.Sprintf("invalid mixed OCI image with Docker v2s2 config (%q)", e.mimeType)
+	}
 	return fmt.Sprintf("unsupported image-specific operation on artifact with type %q", e.mimeType)
 }

vendor/github.com/containers/image/v5/openshift/openshift-copies.go

@@ -3,7 +3,7 @@ package openshift
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"encoding/json"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"net"
@@ -17,10 +17,10 @@ import (
 	"time"
 
 	"github.com/containers/storage/pkg/homedir"
-	"github.com/ghodss/yaml"
 	"github.com/imdario/mergo"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/http2"
+	"gopkg.in/yaml.v3"
 )
 
 // restTLSClientConfig is a modified copy of k8s.io/kubernetes/pkg/client/restclient.TLSClientConfig.
@@ -672,11 +672,7 @@ func load(data []byte) (*clientcmdConfig, error) {
 		return config, nil
 	}
 	// Note: This does absolutely no kind/version checking or conversions.
-	data, err := yaml.YAMLToJSON(data)
-	if err != nil {
-		return nil, err
-	}
-	if err := json.Unmarshal(data, config); err != nil {
+	if err := yaml.Unmarshal(data, config); err != nil {
 		return nil, err
 	}
 	return config, nil
@@ -1057,20 +1053,20 @@ func (c *restConfig) HasCertAuth() bool {
 // IMPORTANT if you add fields to this struct, please update IsConfigEmpty()
 type clientcmdConfig struct {
 	// Clusters is a map of referenceable names to cluster configs
-	Clusters clustersMap `json:"clusters"`
+	Clusters clustersMap `yaml:"clusters"`
 	// AuthInfos is a map of referenceable names to user configs
-	AuthInfos authInfosMap `json:"users"`
+	AuthInfos authInfosMap `yaml:"users"`
 	// Contexts is a map of referenceable names to context configs
-	Contexts contextsMap `json:"contexts"`
+	Contexts contextsMap `yaml:"contexts"`
 	// CurrentContext is the name of the context that you would like to use by default
-	CurrentContext string `json:"current-context"`
+	CurrentContext string `yaml:"current-context"`
 }
 
 type clustersMap map[string]*clientcmdCluster
 
-func (m *clustersMap) UnmarshalJSON(data []byte) error {
+func (m *clustersMap) UnmarshalYAML(value *yaml.Node) error {
 	var a []v1NamedCluster
-	if err := json.Unmarshal(data, &a); err != nil {
+	if err := value.Decode(&a); err != nil {
 		return err
 	}
 	for _, e := range a {
@@ -1082,9 +1078,9 @@ func (m *clustersMap) UnmarshalJSON(data []byte) error {
 
 type authInfosMap map[string]*clientcmdAuthInfo
 
-func (m *authInfosMap) UnmarshalJSON(data []byte) error {
+func (m *authInfosMap) UnmarshalYAML(value *yaml.Node) error {
 	var a []v1NamedAuthInfo
-	if err := json.Unmarshal(data, &a); err != nil {
+	if err := value.Decode(&a); err != nil {
 		return err
 	}
 	for _, e := range a {
@@ -1096,9 +1092,9 @@ func (m *authInfosMap) UnmarshalJSON(data []byte) error {
 
 type contextsMap map[string]*clientcmdContext
 
-func (m *contextsMap) UnmarshalJSON(data []byte) error {
+func (m *contextsMap) UnmarshalYAML(value *yaml.Node) error {
 	var a []v1NamedContext
-	if err := json.Unmarshal(data, &a); err != nil {
+	if err := value.Decode(&a); err != nil {
 		return err
 	}
 	for _, e := range a {
@@ -1118,19 +1114,32 @@ func clientcmdNewConfig() *clientcmdConfig {
 	}
 }
 
+// yamlBinaryAsBase64String is a []byte that can be stored in yaml as a !!str, not a !!binary
+type yamlBinaryAsBase64String []byte
+
+func (bin *yamlBinaryAsBase64String) UnmarshalText(text []byte) error {
+	res := make([]byte, base64.StdEncoding.DecodedLen(len(text)))
+	n, err := base64.StdEncoding.Decode(res, text)
+	if err != nil {
+		return err
+	}
+	*bin = res[:n]
+	return nil
+}
+
 // clientcmdCluster is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api.Cluster.
 // Cluster contains information about how to communicate with a kubernetes cluster
 type clientcmdCluster struct {
 	// LocationOfOrigin indicates where this object came from.  It is used for round tripping config post-merge, but never serialized.
 	LocationOfOrigin string
 	// Server is the address of the kubernetes cluster (https://hostname:port).
-	Server string `json:"server"`
+	Server string `yaml:"server"`
 	// InsecureSkipTLSVerify skips the validity check for the server's certificate. This will make your HTTPS connections insecure.
-	InsecureSkipTLSVerify bool `json:"insecure-skip-tls-verify,omitempty"`
+	InsecureSkipTLSVerify bool `yaml:"insecure-skip-tls-verify,omitempty"`
 	// CertificateAuthority is the path to a cert file for the certificate authority.
-	CertificateAuthority string `json:"certificate-authority,omitempty"`
+	CertificateAuthority string `yaml:"certificate-authority,omitempty"`
 	// CertificateAuthorityData contains PEM-encoded certificate authority certificates. Overrides CertificateAuthority
-	CertificateAuthorityData []byte `json:"certificate-authority-data,omitempty"`
+	CertificateAuthorityData yamlBinaryAsBase64String `yaml:"certificate-authority-data,omitempty"`
 }
 
 // clientcmdAuthInfo is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api.AuthInfo.
@@ -1139,19 +1148,19 @@ type clientcmdAuthInfo struct {
 	// LocationOfOrigin indicates where this object came from.  It is used for round tripping config post-merge, but never serialized.
 	LocationOfOrigin string
 	// ClientCertificate is the path to a client cert file for TLS.
-	ClientCertificate string `json:"client-certificate,omitempty"`
+	ClientCertificate string `yaml:"client-certificate,omitempty"`
 	// ClientCertificateData contains PEM-encoded data from a client cert file for TLS. Overrides ClientCertificate
-	ClientCertificateData []byte `json:"client-certificate-data,omitempty"`
+	ClientCertificateData yamlBinaryAsBase64String `yaml:"client-certificate-data,omitempty"`
 	// ClientKey is the path to a client key file for TLS.
-	ClientKey string `json:"client-key,omitempty"`
+	ClientKey string `yaml:"client-key,omitempty"`
 	// ClientKeyData contains PEM-encoded data from a client key file for TLS. Overrides ClientKey
-	ClientKeyData []byte `json:"client-key-data,omitempty"`
+	ClientKeyData yamlBinaryAsBase64String `yaml:"client-key-data,omitempty"`
 	// Token is the bearer token for authentication to the kubernetes cluster.
-	Token string `json:"token,omitempty"`
+	Token string `yaml:"token,omitempty"`
 	// Username is the username for basic authentication to the kubernetes cluster.
-	Username string `json:"username,omitempty"`
+	Username string `yaml:"username,omitempty"`
 	// Password is the password for basic authentication to the kubernetes cluster.
-	Password string `json:"password,omitempty"`
+	Password string `yaml:"password,omitempty"`
 }
 
 // clientcmdContext is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api.Context.
@@ -1160,36 +1169,36 @@ type clientcmdContext struct {
 	// LocationOfOrigin indicates where this object came from.  It is used for round tripping config post-merge, but never serialized.
 	LocationOfOrigin string
 	// Cluster is the name of the cluster for this context
-	Cluster string `json:"cluster"`
+	Cluster string `yaml:"cluster"`
 	// AuthInfo is the name of the authInfo for this context
-	AuthInfo string `json:"user"`
+	AuthInfo string `yaml:"user"`
 	// Namespace is the default namespace to use on unspecified requests
-	Namespace string `json:"namespace,omitempty"`
+	Namespace string `yaml:"namespace,omitempty"`
 }
 
 // v1NamedCluster is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api.v1.NamedCluster.
 // NamedCluster relates nicknames to cluster information
 type v1NamedCluster struct {
 	// Name is the nickname for this Cluster
-	Name string `json:"name"`
+	Name string `yaml:"name"`
 	// Cluster holds the cluster information
-	Cluster clientcmdCluster `json:"cluster"`
+	Cluster clientcmdCluster `yaml:"cluster"`
 }
 
 // v1NamedContext is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api.v1.NamedContext.
 // NamedContext relates nicknames to context information
 type v1NamedContext struct {
 	// Name is the nickname for this Context
-	Name string `json:"name"`
+	Name string `yaml:"name"`
 	// Context holds the context information
-	Context clientcmdContext `json:"context"`
+	Context clientcmdContext `yaml:"context"`
 }
 
 // v1NamedAuthInfo is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api.v1.NamedAuthInfo.
 // NamedAuthInfo relates nicknames to auth information
 type v1NamedAuthInfo struct {
 	// Name is the nickname for this AuthInfo
-	Name string `json:"name"`
+	Name string `yaml:"name"`
 	// AuthInfo holds the auth information
-	AuthInfo clientcmdAuthInfo `json:"user"`
+	AuthInfo clientcmdAuthInfo `yaml:"user"`
 }

vendor/github.com/containers/image/v5/version/version.go

@@ -8,10 +8,10 @@ const (
 	// VersionMinor is for functionality in a backwards-compatible manner
 	VersionMinor = 24
 	// VersionPatch is for backwards-compatible bug fixes
-	VersionPatch = 0
+	VersionPatch = 1
 
 	// VersionDev indicates development branch. Releases will be empty string.
-	VersionDev = ""
+	VersionDev = "-dev"
 )
 
 // Version is the specification version that the package types support.