fix: remove showing app name twice in errors (#368)

This commit is contained in:
Mitar
2023-07-21 05:08:56 -07:00
committed by GitHub
parent a9be85c4d3
commit 074ccd0906
2 changed files with 6 additions and 3 deletions
+4 -1
View File
@@ -201,7 +201,7 @@ func (c *Context) Validate() error { // nolint: gocyclo
case *Application: case *Application:
value = node.Target value = node.Target
desc = node.Name desc = ""
case *Node: case *Node:
value = node.Target value = node.Target
@@ -209,8 +209,11 @@ func (c *Context) Validate() error { // nolint: gocyclo
} }
if validate := isValidatable(value); validate != nil { if validate := isValidatable(value); validate != nil {
if err := validate.Validate(); err != nil { if err := validate.Validate(); err != nil {
if desc != "" {
return fmt.Errorf("%s: %w", desc, err) return fmt.Errorf("%s: %w", desc, err)
} }
return err
}
} }
} }
for _, resolver := range c.combineResolvers() { for _, resolver := range c.combineResolvers() {
+1 -1
View File
@@ -1214,7 +1214,7 @@ func TestValidateApp(t *testing.T) {
cli := validateCli{} cli := validateCli{}
p := mustNew(t, &cli) p := mustNew(t, &cli)
_, err := p.Parse([]string{}) _, err := p.Parse([]string{})
assert.EqualError(t, err, "test: app error") assert.EqualError(t, err, "app error")
} }
func TestValidateCmd(t *testing.T) { func TestValidateCmd(t *testing.T) {