Merge pull request urfave#2161 from MohitPanchariya/issue-#2145

Invoke OnUsageError when missing required flags

Author: dearchap

command_run.go

@@ -314,7 +314,11 @@ func (cmd *Command) run(ctx context.Context, osArgs []string) (_ context.Context
 
 	if err := cmd.checkAllRequiredFlags(); err != nil {
 		cmd.isInError = true
-		_ = ShowSubcommandHelp(cmd)
+		if cmd.OnUsageError != nil {
+			err = cmd.OnUsageError(ctx, cmd, err, cmd.parent != nil)
+		} else {
+			_ = ShowSubcommandHelp(cmd)
+		}
 		return ctx, err
 	}
 

command_test.go

@@ -4096,6 +4096,21 @@ func TestCheckRequiredFlags(t *testing.T) {
 	}
 }
 
+func TestCheckRequiredFlagsWithOnUsageError(t *testing.T) {
+	expectedError := errors.New("OnUsageError")
+	cmd := &Command{
+		Name: "foo",
+		Flags: []Flag{
+			&StringFlag{Name: "requiredFlag", Required: true},
+		},
+		OnUsageError: func(_ context.Context, _ *Command, _ error, _ bool) error {
+			return expectedError
+		},
+	}
+	actualError := cmd.Run(buildTestContext(t), []string{"requiredFlag"})
+	require.ErrorIs(t, actualError, expectedError)
+}
+
 func TestCommand_ParentCommand_Set(t *testing.T) {
 	cmd := &Command{
 		parent: &Command{