mirror of
				https://github.com/k8snetworkplumbingwg/multus-cni.git
				synced 2025-11-04 07:51:10 +00:00 
			
		
		
		
	Fixes K8sNetworkPlumbingWG package capitalization
Migrates package to use capitalized name, also cleans up dependencies. Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
		
							
								
								
									
										104
									
								
								vendor/github.com/spf13/pflag/bytes.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										104
									
								
								vendor/github.com/spf13/pflag/bytes.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -1,6 +1,7 @@
 | 
			
		||||
package pflag
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"encoding/base64"
 | 
			
		||||
	"encoding/hex"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"strings"
 | 
			
		||||
@@ -9,10 +10,12 @@ import (
 | 
			
		||||
// BytesHex adapts []byte for use as a flag. Value of flag is HEX encoded
 | 
			
		||||
type bytesHexValue []byte
 | 
			
		||||
 | 
			
		||||
// String implements pflag.Value.String.
 | 
			
		||||
func (bytesHex bytesHexValue) String() string {
 | 
			
		||||
	return fmt.Sprintf("%X", []byte(bytesHex))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Set implements pflag.Value.Set.
 | 
			
		||||
func (bytesHex *bytesHexValue) Set(value string) error {
 | 
			
		||||
	bin, err := hex.DecodeString(strings.TrimSpace(value))
 | 
			
		||||
 | 
			
		||||
@@ -25,6 +28,7 @@ func (bytesHex *bytesHexValue) Set(value string) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Type implements pflag.Value.Type.
 | 
			
		||||
func (*bytesHexValue) Type() string {
 | 
			
		||||
	return "bytesHex"
 | 
			
		||||
}
 | 
			
		||||
@@ -103,3 +107,103 @@ func BytesHex(name string, value []byte, usage string) *[]byte {
 | 
			
		||||
func BytesHexP(name, shorthand string, value []byte, usage string) *[]byte {
 | 
			
		||||
	return CommandLine.BytesHexP(name, shorthand, value, usage)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64 adapts []byte for use as a flag. Value of flag is Base64 encoded
 | 
			
		||||
type bytesBase64Value []byte
 | 
			
		||||
 | 
			
		||||
// String implements pflag.Value.String.
 | 
			
		||||
func (bytesBase64 bytesBase64Value) String() string {
 | 
			
		||||
	return base64.StdEncoding.EncodeToString([]byte(bytesBase64))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Set implements pflag.Value.Set.
 | 
			
		||||
func (bytesBase64 *bytesBase64Value) Set(value string) error {
 | 
			
		||||
	bin, err := base64.StdEncoding.DecodeString(strings.TrimSpace(value))
 | 
			
		||||
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	*bytesBase64 = bin
 | 
			
		||||
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Type implements pflag.Value.Type.
 | 
			
		||||
func (*bytesBase64Value) Type() string {
 | 
			
		||||
	return "bytesBase64"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func newBytesBase64Value(val []byte, p *[]byte) *bytesBase64Value {
 | 
			
		||||
	*p = val
 | 
			
		||||
	return (*bytesBase64Value)(p)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func bytesBase64ValueConv(sval string) (interface{}, error) {
 | 
			
		||||
 | 
			
		||||
	bin, err := base64.StdEncoding.DecodeString(sval)
 | 
			
		||||
	if err == nil {
 | 
			
		||||
		return bin, nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return nil, fmt.Errorf("invalid string being converted to Bytes: %s %s", sval, err)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// GetBytesBase64 return the []byte value of a flag with the given name
 | 
			
		||||
func (f *FlagSet) GetBytesBase64(name string) ([]byte, error) {
 | 
			
		||||
	val, err := f.getFlagType(name, "bytesBase64", bytesBase64ValueConv)
 | 
			
		||||
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return []byte{}, err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return val.([]byte), nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64Var defines an []byte flag with specified name, default value, and usage string.
 | 
			
		||||
// The argument p points to an []byte variable in which to store the value of the flag.
 | 
			
		||||
func (f *FlagSet) BytesBase64Var(p *[]byte, name string, value []byte, usage string) {
 | 
			
		||||
	f.VarP(newBytesBase64Value(value, p), name, "", usage)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64VarP is like BytesBase64Var, but accepts a shorthand letter that can be used after a single dash.
 | 
			
		||||
func (f *FlagSet) BytesBase64VarP(p *[]byte, name, shorthand string, value []byte, usage string) {
 | 
			
		||||
	f.VarP(newBytesBase64Value(value, p), name, shorthand, usage)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64Var defines an []byte flag with specified name, default value, and usage string.
 | 
			
		||||
// The argument p points to an []byte variable in which to store the value of the flag.
 | 
			
		||||
func BytesBase64Var(p *[]byte, name string, value []byte, usage string) {
 | 
			
		||||
	CommandLine.VarP(newBytesBase64Value(value, p), name, "", usage)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64VarP is like BytesBase64Var, but accepts a shorthand letter that can be used after a single dash.
 | 
			
		||||
func BytesBase64VarP(p *[]byte, name, shorthand string, value []byte, usage string) {
 | 
			
		||||
	CommandLine.VarP(newBytesBase64Value(value, p), name, shorthand, usage)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64 defines an []byte flag with specified name, default value, and usage string.
 | 
			
		||||
// The return value is the address of an []byte variable that stores the value of the flag.
 | 
			
		||||
func (f *FlagSet) BytesBase64(name string, value []byte, usage string) *[]byte {
 | 
			
		||||
	p := new([]byte)
 | 
			
		||||
	f.BytesBase64VarP(p, name, "", value, usage)
 | 
			
		||||
	return p
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64P is like BytesBase64, but accepts a shorthand letter that can be used after a single dash.
 | 
			
		||||
func (f *FlagSet) BytesBase64P(name, shorthand string, value []byte, usage string) *[]byte {
 | 
			
		||||
	p := new([]byte)
 | 
			
		||||
	f.BytesBase64VarP(p, name, shorthand, value, usage)
 | 
			
		||||
	return p
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64 defines an []byte flag with specified name, default value, and usage string.
 | 
			
		||||
// The return value is the address of an []byte variable that stores the value of the flag.
 | 
			
		||||
func BytesBase64(name string, value []byte, usage string) *[]byte {
 | 
			
		||||
	return CommandLine.BytesBase64P(name, "", value, usage)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// BytesBase64P is like BytesBase64, but accepts a shorthand letter that can be used after a single dash.
 | 
			
		||||
func BytesBase64P(name, shorthand string, value []byte, usage string) *[]byte {
 | 
			
		||||
	return CommandLine.BytesBase64P(name, shorthand, value, usage)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user