From 074ccd090604a69363b9e6f56b0205bafb79884d Mon Sep 17 00:00:00 2001 From: Mitar Date: Fri, 21 Jul 2023 05:08:56 -0700 Subject: [PATCH] fix: remove showing app name twice in errors (#368) --- context.go | 7 +++++-- kong_test.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/context.go b/context.go index 0ec10f4..dddf796 100644 --- a/context.go +++ b/context.go @@ -201,7 +201,7 @@ func (c *Context) Validate() error { // nolint: gocyclo case *Application: value = node.Target - desc = node.Name + desc = "" case *Node: value = node.Target @@ -209,7 +209,10 @@ func (c *Context) Validate() error { // nolint: gocyclo } if validate := isValidatable(value); validate != nil { if err := validate.Validate(); err != nil { - return fmt.Errorf("%s: %w", desc, err) + if desc != "" { + return fmt.Errorf("%s: %w", desc, err) + } + return err } } } diff --git a/kong_test.go b/kong_test.go index 72c73cf..1ef424e 100644 --- a/kong_test.go +++ b/kong_test.go @@ -1214,7 +1214,7 @@ func TestValidateApp(t *testing.T) { cli := validateCli{} p := mustNew(t, &cli) _, err := p.Parse([]string{}) - assert.EqualError(t, err, "test: app error") + assert.EqualError(t, err, "app error") } func TestValidateCmd(t *testing.T) {