Merge branch 'main' into wb/feat-codeowners

Author: burmudar

cmd/src/run_migration_compat.go

@@ -69,19 +69,24 @@ func runMigrated() (int, error) {
 	ctx := context.Background()
 
 	err := migratedRootCommand().Run(ctx, os.Args)
-	if errors.HasType[*cmderrors.UsageError](err) {
-		return 2, nil
-	}
-	if e, ok := err.(*cmderrors.ExitCodeError); ok {
-		if e.HasError() {
-			return e.Code(), e
+	if err != nil {
+		if errors.HasType[*cmderrors.UsageError](err) {
+			return 2, nil
 		}
-		return e.Code(), nil
-	}
-	var exitErr cli.ExitCoder
-	if errors.AsInterface(err, &exitErr) {
-		return exitErr.ExitCode(), err
+		if e, ok := err.(*cmderrors.ExitCodeError); ok {
+			if e.HasError() {
+				return e.Code(), e
+			}
+			return e.Code(), nil
+		}
+		var exitErr cli.ExitCoder
+		if errors.AsInterface(err, &exitErr) {
+			return exitErr.ExitCode(), err
+		}
+
+		return 1, err
 	}
+
 	return 0, err
 }
 

internal/clicompat/help.go

@@ -20,7 +20,13 @@ func Wrap(cmd *cli.Command) *cli.Command {
 	cmd.OnUsageError = OnUsageError
 	if cmd.Action == nil {
 		cmd.Action = func(ctx context.Context, cmd *cli.Command) error {
-			return cli.ShowSubcommandHelp(cmd)
+			if err := cli.ShowSubcommandHelp(cmd); err != nil {
+				return err
+			}
+			if cmd.Args().Len() > 0 {
+				return errors.Newf("Unknown subcommand: %s", cmd.Args().First())
+			}
+			return nil
 		}
 	} else {
 		cmd.Action = wrapWithHelpOnUsageError(cmd.Action)