|
|
|
@ -3,6 +3,7 @@ package cli
|
|
|
|
|
import (
|
|
|
|
|
"flag"
|
|
|
|
|
"fmt"
|
|
|
|
|
"io/ioutil"
|
|
|
|
|
"reflect"
|
|
|
|
|
"runtime"
|
|
|
|
|
"strconv"
|
|
|
|
@ -120,15 +121,9 @@ func (f GenericFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
// provided by the user for parsing by the flag
|
|
|
|
|
func (f GenericFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
val := f.Value
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.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)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -171,21 +166,15 @@ func (f StringSliceFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f StringSliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
newVal := &StringSlice{}
|
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
|
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 envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
newVal := &StringSlice{}
|
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -234,21 +223,15 @@ func (f IntSliceFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f IntSliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
newVal := &IntSlice{}
|
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
|
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 envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
newVal := &IntSlice{}
|
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -297,21 +280,15 @@ func (f Int64SliceFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f Int64SliceFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
newVal := &Int64Slice{}
|
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
|
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 envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
newVal := &Int64Slice{}
|
|
|
|
|
for _, s := range strings.Split(envVal, ",") {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -332,23 +309,15 @@ func (f BoolFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f BoolFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
val := false
|
|
|
|
|
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 err != nil {
|
|
|
|
|
return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val = envValBool
|
|
|
|
|
break
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
if envVal == "" {
|
|
|
|
|
val = false
|
|
|
|
|
} else {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -372,23 +341,16 @@ func (f BoolTFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f BoolTFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
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 err != nil {
|
|
|
|
|
return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
val = envValBool
|
|
|
|
|
break
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
if envVal == "" {
|
|
|
|
|
val = false
|
|
|
|
|
} else {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -411,14 +373,8 @@ func (f StringFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f StringFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
f.Value = envVal
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
f.Value = envVal
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -440,18 +396,12 @@ func (f IntFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f IntFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
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)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -473,19 +423,13 @@ func (f Int64Flag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f Int64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -507,19 +451,13 @@ func (f UintFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f UintFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
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)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -541,19 +479,13 @@ func (f Uint64Flag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f Uint64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
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)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -575,19 +507,13 @@ func (f DurationFlag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f DurationFlag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -609,19 +535,13 @@ func (f Float64Flag) Apply(set *flag.FlagSet) {
|
|
|
|
|
|
|
|
|
|
// ApplyWithError populates the flag given the flag set and environment
|
|
|
|
|
func (f Float64Flag) ApplyWithError(set *flag.FlagSet) error {
|
|
|
|
|
if f.EnvVar != "" {
|
|
|
|
|
for _, envVar := range strings.Split(f.EnvVar, ",") {
|
|
|
|
|
envVar = strings.TrimSpace(envVar)
|
|
|
|
|
if envVal, ok := syscall.Getenv(envVar); ok {
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
if envVal, ok := flagFromFileEnv(f.FilePath, f.EnvVar); ok {
|
|
|
|
|
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)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eachName(f.Name, func(name string) {
|
|
|
|
@ -805,3 +725,18 @@ func stringifySliceFlag(usage, name string, defaultVals []string) string {
|
|
|
|
|
usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultVal))
|
|
|
|
|
return fmt.Sprintf("%s\t%s", FlagNamePrefixer(name, placeholder), 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
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if filePath != "" {
|
|
|
|
|
if data, err := ioutil.ReadFile(filePath); err == nil {
|
|
|
|
|
return string(data), true
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|