|
|
|
@ -3,6 +3,7 @@ package cli
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"flag"
|
|
|
|
"flag"
|
|
|
|
"fmt"
|
|
|
|
"fmt"
|
|
|
|
|
|
|
|
"io/ioutil"
|
|
|
|
"reflect"
|
|
|
|
"reflect"
|
|
|
|
"runtime"
|
|
|
|
"runtime"
|
|
|
|
"strconv"
|
|
|
|
"strconv"
|
|
|
|
@ -37,6 +38,18 @@ var HelpFlag Flag = BoolFlag{
|
|
|
|
// to display a flag.
|
|
|
|
// to display a flag.
|
|
|
|
var FlagStringer FlagStringFunc = stringifyFlag
|
|
|
|
var FlagStringer FlagStringFunc = stringifyFlag
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// FlagNamePrefixer converts a full flag name and its placeholder into the help
|
|
|
|
|
|
|
|
// message flag prefix. This is used by the default FlagStringer.
|
|
|
|
|
|
|
|
var FlagNamePrefixer FlagNamePrefixFunc = prefixedNames
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// FlagEnvHinter annotates flag help message with the environment variable
|
|
|
|
|
|
|
|
// details. This is used by the default FlagStringer.
|
|
|
|
|
|
|
|
var FlagEnvHinter FlagEnvHintFunc = withEnvHint
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// FlagFileHinter annotates flag help message with the environment variable
|
|
|
|
|
|
|
|
// details. This is used by the default FlagStringer.
|
|
|
|
|
|
|
|
var FlagFileHinter FlagFileHintFunc = withFileHint
|
|
|
|
|
|
|
|
|
|
|
|
// FlagsByName is a slice of Flag.
|
|
|
|
// FlagsByName is a slice of Flag.
|
|
|
|
type FlagsByName []Flag
|
|
|
|
type FlagsByName []Flag
|
|
|
|
|
|
|
|
|
|
|
|
@ -45,7 +58,7 @@ func (f FlagsByName) Len() int {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (f FlagsByName) Less(i, j int) bool {
|
|
|
|
func (f FlagsByName) Less(i, j int) bool {
|
|
|
|
return f[i].GetName() < f[j].GetName()
|
|
|
|
return lexicographicLess(f[i].GetName(), f[j].GetName())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (f FlagsByName) Swap(i, j int) {
|
|
|
|
func (f FlagsByName) Swap(i, j int) {
|
|
|
|
@ -112,15 +125,9 @@ func (f GenericFlag) Apply(set *flag.FlagSet) {
|
|
|
|
// provided by the user for parsing by the flag
|
|
|
|
// provided by the user for parsing by the flag
|
|
|
|
func (f GenericFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f GenericFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
val := f.Value
|
|
|
|
val := f.Value
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if fileEnvVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
if err := val.Set(fileEnvVal); err != nil {
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
return fmt.Errorf("could not parse %s as value for flag %s: %s", fileEnvVal, f.Name, err)
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
|
|
|
if err := val.Set(envVal); err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -163,21 +170,19 @@ func (f StringSliceFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f StringSliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f StringSliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
newVal := &StringSlice{}
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
s = strings.TrimSpace(s)
|
|
|
|
newVal := &StringSlice{}
|
|
|
|
if err := newVal.Set(s); err != nil {
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
return fmt.Errorf("could not parse %s as string value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
s = strings.TrimSpace(s)
|
|
|
|
|
|
|
|
if err := newVal.Set(s); err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as string value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
f.Value = newVal
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if f.Value == nil {
|
|
|
|
|
|
|
|
f.Value = newVal
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
*f.Value = *newVal
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -226,21 +231,19 @@ func (f IntSliceFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f IntSliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f IntSliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
newVal := &IntSlice{}
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
s = strings.TrimSpace(s)
|
|
|
|
newVal := &IntSlice{}
|
|
|
|
if err := newVal.Set(s); err != nil {
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
return fmt.Errorf("could not parse %s as int slice value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
s = strings.TrimSpace(s)
|
|
|
|
|
|
|
|
if err := newVal.Set(s); err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as int slice value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
f.Value = newVal
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if f.Value == nil {
|
|
|
|
|
|
|
|
f.Value = newVal
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
*f.Value = *newVal
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -289,21 +292,19 @@ func (f Int64SliceFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f Int64SliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f Int64SliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
newVal := &Int64Slice{}
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
s = strings.TrimSpace(s)
|
|
|
|
newVal := &Int64Slice{}
|
|
|
|
if err := newVal.Set(s); err != nil {
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
return fmt.Errorf("could not parse %s as int64 slice value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
s = strings.TrimSpace(s)
|
|
|
|
|
|
|
|
if err := newVal.Set(s); err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as int64 slice value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
f.Value = newVal
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if f.Value == nil {
|
|
|
|
|
|
|
|
f.Value = newVal
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
*f.Value = *newVal
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -324,23 +325,15 @@ func (f BoolFlag) Apply(set *flag.FlagSet) {
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f BoolFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f BoolFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
val := false
|
|
|
|
val := false
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
if envVal == "" {
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
val = false
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
} else {
|
|
|
|
if envVal == "" {
|
|
|
|
envValBool, err := strconv.ParseBool(envVal)
|
|
|
|
val = false
|
|
|
|
if err != nil {
|
|
|
|
break
|
|
|
|
return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
envValBool, err := strconv.ParseBool(envVal)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
val = envValBool
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
val = envValBool
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -364,23 +357,16 @@ func (f BoolTFlag) Apply(set *flag.FlagSet) {
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f BoolTFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f BoolTFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
val := true
|
|
|
|
val := true
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
|
|
|
if envVal == "" {
|
|
|
|
|
|
|
|
val = false
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
envValBool, err := strconv.ParseBool(envVal)
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
if err != nil {
|
|
|
|
if envVal == "" {
|
|
|
|
return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
val = false
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
envValBool, err := strconv.ParseBool(envVal)
|
|
|
|
val = envValBool
|
|
|
|
if err != nil {
|
|
|
|
break
|
|
|
|
return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
val = envValBool
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -403,14 +389,8 @@ func (f StringFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f StringFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f StringFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
f.Value = envVal
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
|
|
|
f.Value = envVal
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -432,18 +412,12 @@ func (f IntFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f IntFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f IntFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
envValInt, err := strconv.ParseInt(envVal, 0, 64)
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
if err != nil {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
return fmt.Errorf("could not parse %s as int value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
envValInt, err := strconv.ParseInt(envVal, 0, 64)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as int value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
f.Value = int(envValInt)
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
f.Value = int(envValInt)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -465,19 +439,13 @@ func (f Int64Flag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f Int64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f Int64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
envValInt, err := strconv.ParseInt(envVal, 0, 64)
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
if err != nil {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
return fmt.Errorf("could not parse %s as int value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
envValInt, err := strconv.ParseInt(envVal, 0, 64)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as int value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = envValInt
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = envValInt
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -499,19 +467,13 @@ func (f UintFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f UintFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f UintFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
envValInt, err := strconv.ParseUint(envVal, 0, 64)
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
if err != nil {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
return fmt.Errorf("could not parse %s as uint value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
envValInt, err := strconv.ParseUint(envVal, 0, 64)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as uint value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = uint(envValInt)
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = uint(envValInt)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -533,19 +495,13 @@ func (f Uint64Flag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f Uint64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f Uint64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
envValInt, err := strconv.ParseUint(envVal, 0, 64)
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
if err != nil {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
return fmt.Errorf("could not parse %s as uint64 value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
envValInt, err := strconv.ParseUint(envVal, 0, 64)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as uint64 value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = uint64(envValInt)
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = uint64(envValInt)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -567,19 +523,13 @@ func (f DurationFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f DurationFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f DurationFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
envValDuration, err := time.ParseDuration(envVal)
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
if err != nil {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
return fmt.Errorf("could not parse %s as duration for flag %s: %s", envVal, f.Name, err)
|
|
|
|
envValDuration, err := time.ParseDuration(envVal)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as duration for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = envValDuration
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = envValDuration
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -601,19 +551,13 @@ func (f Float64Flag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
func (f Float64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
func (f Float64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
envValFloat, err := strconv.ParseFloat(envVal, 10)
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
if err != nil {
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
return fmt.Errorf("could not parse %s as float64 value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
envValFloat, err := strconv.ParseFloat(envVal, 10)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return fmt.Errorf("could not parse %s as float64 value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = float64(envValFloat)
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
f.Value = float64(envValFloat)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -692,11 +636,19 @@ func withEnvHint(envVar, str string) string {
|
|
|
|
suffix = "%"
|
|
|
|
suffix = "%"
|
|
|
|
sep = "%, %"
|
|
|
|
sep = "%, %"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
envText = fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(strings.Split(envVar, ","), sep), suffix)
|
|
|
|
envText = " [" + prefix + strings.Join(strings.Split(envVar, ","), sep) + suffix + "]"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return str + envText
|
|
|
|
return str + envText
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func withFileHint(filePath, str string) string {
|
|
|
|
|
|
|
|
fileText := ""
|
|
|
|
|
|
|
|
if filePath != "" {
|
|
|
|
|
|
|
|
fileText = fmt.Sprintf(" [%s]", filePath)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return str + fileText
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func flagValue(f Flag) reflect.Value {
|
|
|
|
func flagValue(f Flag) reflect.Value {
|
|
|
|
fv := reflect.ValueOf(f)
|
|
|
|
fv := reflect.ValueOf(f)
|
|
|
|
for fv.Kind() == reflect.Ptr {
|
|
|
|
for fv.Kind() == reflect.Ptr {
|
|
|
|
@ -710,14 +662,29 @@ func stringifyFlag(f Flag) string {
|
|
|
|
|
|
|
|
|
|
|
|
switch f.(type) {
|
|
|
|
switch f.(type) {
|
|
|
|
case IntSliceFlag:
|
|
|
|
case IntSliceFlag:
|
|
|
|
return withEnvHint(fv.FieldByName("EnvVar").String(),
|
|
|
|
return FlagFileHinter(
|
|
|
|
stringifyIntSliceFlag(f.(IntSliceFlag)))
|
|
|
|
fv.FieldByName("FilePath").String(),
|
|
|
|
|
|
|
|
FlagEnvHinter(
|
|
|
|
|
|
|
|
fv.FieldByName("EnvVar").String(),
|
|
|
|
|
|
|
|
stringifyIntSliceFlag(f.(IntSliceFlag)),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
)
|
|
|
|
case Int64SliceFlag:
|
|
|
|
case Int64SliceFlag:
|
|
|
|
return withEnvHint(fv.FieldByName("EnvVar").String(),
|
|
|
|
return FlagFileHinter(
|
|
|
|
stringifyInt64SliceFlag(f.(Int64SliceFlag)))
|
|
|
|
fv.FieldByName("FilePath").String(),
|
|
|
|
|
|
|
|
FlagEnvHinter(
|
|
|
|
|
|
|
|
fv.FieldByName("EnvVar").String(),
|
|
|
|
|
|
|
|
stringifyInt64SliceFlag(f.(Int64SliceFlag)),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
)
|
|
|
|
case StringSliceFlag:
|
|
|
|
case StringSliceFlag:
|
|
|
|
return withEnvHint(fv.FieldByName("EnvVar").String(),
|
|
|
|
return FlagFileHinter(
|
|
|
|
stringifyStringSliceFlag(f.(StringSliceFlag)))
|
|
|
|
fv.FieldByName("FilePath").String(),
|
|
|
|
|
|
|
|
FlagEnvHinter(
|
|
|
|
|
|
|
|
fv.FieldByName("EnvVar").String(),
|
|
|
|
|
|
|
|
stringifyStringSliceFlag(f.(StringSliceFlag)),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
placeholder, usage := unquoteUsage(fv.FieldByName("Usage").String())
|
|
|
|
placeholder, usage := unquoteUsage(fv.FieldByName("Usage").String())
|
|
|
|
@ -742,17 +709,22 @@ func stringifyFlag(f Flag) string {
|
|
|
|
placeholder = defaultPlaceholder
|
|
|
|
placeholder = defaultPlaceholder
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultValueString))
|
|
|
|
usageWithDefault := strings.TrimSpace(usage + defaultValueString)
|
|
|
|
|
|
|
|
|
|
|
|
return withEnvHint(fv.FieldByName("EnvVar").String(),
|
|
|
|
return FlagFileHinter(
|
|
|
|
fmt.Sprintf("%s\t%s", prefixedNames(fv.FieldByName("Name").String(), placeholder), usageWithDefault))
|
|
|
|
fv.FieldByName("FilePath").String(),
|
|
|
|
|
|
|
|
FlagEnvHinter(
|
|
|
|
|
|
|
|
fv.FieldByName("EnvVar").String(),
|
|
|
|
|
|
|
|
FlagNamePrefixer(fv.FieldByName("Name").String(), placeholder)+"\t"+usageWithDefault,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func stringifyIntSliceFlag(f IntSliceFlag) string {
|
|
|
|
func stringifyIntSliceFlag(f IntSliceFlag) string {
|
|
|
|
defaultVals := []string{}
|
|
|
|
defaultVals := []string{}
|
|
|
|
if f.Value != nil && len(f.Value.Value()) > 0 {
|
|
|
|
if f.Value != nil && len(f.Value.Value()) > 0 {
|
|
|
|
for _, i := range f.Value.Value() {
|
|
|
|
for _, i := range f.Value.Value() {
|
|
|
|
defaultVals = append(defaultVals, fmt.Sprintf("%d", i))
|
|
|
|
defaultVals = append(defaultVals, strconv.Itoa(i))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -763,7 +735,7 @@ func stringifyInt64SliceFlag(f Int64SliceFlag) string {
|
|
|
|
defaultVals := []string{}
|
|
|
|
defaultVals := []string{}
|
|
|
|
if f.Value != nil && len(f.Value.Value()) > 0 {
|
|
|
|
if f.Value != nil && len(f.Value.Value()) > 0 {
|
|
|
|
for _, i := range f.Value.Value() {
|
|
|
|
for _, i := range f.Value.Value() {
|
|
|
|
defaultVals = append(defaultVals, fmt.Sprintf("%d", i))
|
|
|
|
defaultVals = append(defaultVals, strconv.FormatInt(i, 10))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -775,7 +747,7 @@ func stringifyStringSliceFlag(f StringSliceFlag) string {
|
|
|
|
if f.Value != nil && len(f.Value.Value()) > 0 {
|
|
|
|
if f.Value != nil && len(f.Value.Value()) > 0 {
|
|
|
|
for _, s := range f.Value.Value() {
|
|
|
|
for _, s := range f.Value.Value() {
|
|
|
|
if len(s) > 0 {
|
|
|
|
if len(s) > 0 {
|
|
|
|
defaultVals = append(defaultVals, fmt.Sprintf("%q", s))
|
|
|
|
defaultVals = append(defaultVals, strconv.Quote(s))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -794,6 +766,21 @@ func stringifySliceFlag(usage, name string, defaultVals []string) string {
|
|
|
|
defaultVal = fmt.Sprintf(" (default: %s)", strings.Join(defaultVals, ", "))
|
|
|
|
defaultVal = fmt.Sprintf(" (default: %s)", strings.Join(defaultVals, ", "))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultVal))
|
|
|
|
usageWithDefault := strings.TrimSpace(usage + defaultVal)
|
|
|
|
return fmt.Sprintf("%s\t%s", prefixedNames(name, placeholder), usageWithDefault)
|
|
|
|
return FlagNamePrefixer(name, placeholder) + "\t" + usageWithDefault
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func flagFromFileEnv(filePath, envName string) (val string, ok bool) {
|
|
|
|
|
|
|
|
for _, envVar := range strings.Split(envName, ",") {
|
|
|
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
|
|
|
return envVal, true
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, fileVar := range strings.Split(filePath, ",") {
|
|
|
|
|
|
|
|
if data, err := ioutil.ReadFile(fileVar); err == nil {
|
|
|
|
|
|
|
|
return string(data), true
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return "", false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
GitHub