mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
![Sebastiaan van Stijn](/assets/img/avatar_default.png)
Use a tagged release of Cobra. All relevant PR's were merged, so the fork is no longer needed. Relevant changes: - spf13/cobra#552 Add a field to disable [flags] in UseLine() - spf13/cobra#567 Add `CalledAs` method to cobra.Command - spf13/cobra#580 Update error message for missing required flags - spf13/cobra#584 Add support for --version flag - spf13/cobra#614 If user has a project in symlink, just use its destination folder and work there - spf13/cobra#649 terminates the flags when -- is found in commandline - spf13/cobra#662 Add support for ignoring parse errors - spf13/cobra#686 doc: hide hidden parent flags Also various improvements were added for generating Bash completion scripts (currently not used by us) Fixes usage output for dockerd; Before this update: dockerd --help Usage: dockerd COMMAND A self-sufficient runtime for containers. After this update: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. Bump spf13/pflag to v1.0.1 Relevant changes: - spf13/pflag#106 allow lookup by shorthand - spf13/pflag#113 Add SortFlags option - spf13/pflag#138 Generate flag error output for errors returned from the parseFunc - spf13/pflag#141 Fixing Count flag usage string - spf13/pflag#143 add int16 flag - spf13/pflag#122 DurationSlice: implementation and tests - spf13/pflag#115 Implement BytesHex type of argument - spf13/pflag#150 Add uintSlice and boolSlice to name prettifier - spf13/pflag#155 Add multiline wrapping support - spf13/pflag#158 doc: clarify difference between string slice vs. array - spf13/pflag#160 add ability to ignore unknown flags - spf13/pflag#163 Allow Users To Show Deprecated Flags Hide [flags] in usage output Hides the [flags] in the usage output of commands (present in newer versions of Cobra), using the `.DisableFlagsInUseLine` option. Before this change: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. After this change: dockerd --help Usage: dockerd [OPTIONS] A self-sufficient runtime for containers. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Â# modified: vendor/github.com/spf13/pflag/string_array.go § Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
105 lines
3.3 KiB
Go
105 lines
3.3 KiB
Go
package pflag
|
|
|
|
import (
|
|
"encoding/hex"
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
// BytesHex adapts []byte for use as a flag. Value of flag is HEX encoded
|
|
type bytesHexValue []byte
|
|
|
|
func (bytesHex bytesHexValue) String() string {
|
|
return fmt.Sprintf("%X", []byte(bytesHex))
|
|
}
|
|
|
|
func (bytesHex *bytesHexValue) Set(value string) error {
|
|
bin, err := hex.DecodeString(strings.TrimSpace(value))
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
*bytesHex = bin
|
|
|
|
return nil
|
|
}
|
|
|
|
func (*bytesHexValue) Type() string {
|
|
return "bytesHex"
|
|
}
|
|
|
|
func newBytesHexValue(val []byte, p *[]byte) *bytesHexValue {
|
|
*p = val
|
|
return (*bytesHexValue)(p)
|
|
}
|
|
|
|
func bytesHexConv(sval string) (interface{}, error) {
|
|
|
|
bin, err := hex.DecodeString(sval)
|
|
|
|
if err == nil {
|
|
return bin, nil
|
|
}
|
|
|
|
return nil, fmt.Errorf("invalid string being converted to Bytes: %s %s", sval, err)
|
|
}
|
|
|
|
// GetBytesHex return the []byte value of a flag with the given name
|
|
func (f *FlagSet) GetBytesHex(name string) ([]byte, error) {
|
|
val, err := f.getFlagType(name, "bytesHex", bytesHexConv)
|
|
|
|
if err != nil {
|
|
return []byte{}, err
|
|
}
|
|
|
|
return val.([]byte), nil
|
|
}
|
|
|
|
// BytesHexVar 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) BytesHexVar(p *[]byte, name string, value []byte, usage string) {
|
|
f.VarP(newBytesHexValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// BytesHexVarP is like BytesHexVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) BytesHexVarP(p *[]byte, name, shorthand string, value []byte, usage string) {
|
|
f.VarP(newBytesHexValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// BytesHexVar 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 BytesHexVar(p *[]byte, name string, value []byte, usage string) {
|
|
CommandLine.VarP(newBytesHexValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// BytesHexVarP is like BytesHexVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func BytesHexVarP(p *[]byte, name, shorthand string, value []byte, usage string) {
|
|
CommandLine.VarP(newBytesHexValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// BytesHex 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) BytesHex(name string, value []byte, usage string) *[]byte {
|
|
p := new([]byte)
|
|
f.BytesHexVarP(p, name, "", value, usage)
|
|
return p
|
|
}
|
|
|
|
// BytesHexP is like BytesHex, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) BytesHexP(name, shorthand string, value []byte, usage string) *[]byte {
|
|
p := new([]byte)
|
|
f.BytesHexVarP(p, name, shorthand, value, usage)
|
|
return p
|
|
}
|
|
|
|
// BytesHex 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 BytesHex(name string, value []byte, usage string) *[]byte {
|
|
return CommandLine.BytesHexP(name, "", value, usage)
|
|
}
|
|
|
|
// BytesHexP is like BytesHex, but accepts a shorthand letter that can be used after a single dash.
|
|
func BytesHexP(name, shorthand string, value []byte, usage string) *[]byte {
|
|
return CommandLine.BytesHexP(name, shorthand, value, usage)
|
|
}
|