gopkg/kong
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add support for variable interpolation into env tag key (#234)

Browse Source
This commit is contained in:
Colin
2021-11-18 16:56:39 -05:00
committed by GitHub
parent 5090305bcb
commit 79f896f0c0
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kong.go
+12 -4
View File
@@ -186,16 +186,24 @@ func (k *Kong) interpolateValue(value *Value, vars Vars) (err error) {
if varsContributor, ok := value.Mapper.(VarsContributor); ok { if varsContributor, ok := value.Mapper.(VarsContributor); ok {
vars = vars.CloneWith(varsContributor.Vars(value)) vars = vars.CloneWith(varsContributor.Vars(value))
} }
updatedVars := map[string]string{
"default": value.Default,
"enum": value.Enum,
}
if value.Default, err = interpolate(value.Default, vars, nil); err != nil { if value.Default, err = interpolate(value.Default, vars, nil); err != nil {
return fmt.Errorf("default value for %s: %s", value.Summary(), err) return fmt.Errorf("default value for %s: %s", value.Summary(), err)
} }
if value.Enum, err = interpolate(value.Enum, vars, nil); err != nil { if value.Enum, err = interpolate(value.Enum, vars, nil); err != nil {
return fmt.Errorf("enum value for %s: %s", value.Summary(), err) return fmt.Errorf("enum value for %s: %s", value.Summary(), err)
} }
value.Help, err = interpolate(value.Help, vars, map[string]string{ if value.Flag != nil {
"default": value.Default, if value.Flag.Env, err = interpolate(value.Flag.Env, vars, nil); err != nil {
"enum": value.Enum, return fmt.Errorf("env value for %s: %s", value.Summary(), err)
}) }
updatedVars["env"] = value.Flag.Env
}
value.Help, err = interpolate(value.Help, vars, updatedVars)
if err != nil { if err != nil {
return fmt.Errorf("help for %s: %s", value.Summary(), err) return fmt.Errorf("help for %s: %s", value.Summary(), err)
} }
kong_test.go
+6
View File
@@ -644,6 +644,7 @@ func TestInterpolationIntoModel(t *testing.T) {
var cli struct { var cli struct {
Flag string `default:"${default}" help:"Help, I need ${somebody}" enum:"${enum}"` Flag string `default:"${default}" help:"Help, I need ${somebody}" enum:"${enum}"`
EnumRef string `enum:"a,b" required:"" help:"One of ${enum}"` EnumRef string `enum:"a,b" required:"" help:"One of ${enum}"`
EnvRef string `env:"${env}" help:"God ${env}"`
} }
_, err := kong.New(&cli) _, err := kong.New(&cli)
require.Error(t, err) require.Error(t, err)
@@ -651,14 +652,19 @@ func TestInterpolationIntoModel(t *testing.T) {
"default": "Some default value.", "default": "Some default value.",
"somebody": "chickens!", "somebody": "chickens!",
"enum": "a,b,c,d", "enum": "a,b,c,d",
"env": "SAVE_THE_QUEEN",
}) })
require.NoError(t, err) require.NoError(t, err)
require.Len(t, p.Model.Flags, 4)
flag := p.Model.Flags[1] flag := p.Model.Flags[1]
flag2 := p.Model.Flags[2] flag2 := p.Model.Flags[2]
flag3 := p.Model.Flags[3]
require.Equal(t, "Some default value.", flag.Default) require.Equal(t, "Some default value.", flag.Default)
require.Equal(t, "Help, I need chickens!", flag.Help) require.Equal(t, "Help, I need chickens!", flag.Help)
require.Equal(t, map[string]bool{"a": true, "b": true, "c": true, "d": true}, flag.EnumMap()) require.Equal(t, map[string]bool{"a": true, "b": true, "c": true, "d": true}, flag.EnumMap())
require.Equal(t, "One of a,b", flag2.Help) require.Equal(t, "One of a,b", flag2.Help)
require.Equal(t, "SAVE_THE_QUEEN", flag3.Env)
require.Equal(t, "God SAVE_THE_QUEEN", flag3.Help)
} }
func TestErrorMissingArgs(t *testing.T) { func TestErrorMissingArgs(t *testing.T) {