fix: return rc=2 for unsupported commands (#595)

Signed-off-by: Michael Todorovic <[email protected]>

Author: michael-todorovic

cmd/controllers/controller.go

@@ -5,14 +5,19 @@ package controllers
 
 import (
 	"github.com/padok-team/burrito/internal/burrito"
-
+	cmdUtils "github.com/padok-team/burrito/internal/utils/cmd"
 	"github.com/spf13/cobra"
 )
 
 func BuildControllersCmd(app *burrito.App) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "controllers",
 		Short: "cmd to use burrito's controllers",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// If we reach this point, it means no subcommand was matched
+			cmdUtils.UnsupportedCommand(cmd, args)
+			return cmd.Help()
+		},
 	}
 	cmd.AddCommand(buildControllersStartCmd(app))
 	return cmd

cmd/datastore/datastore.go

@@ -5,13 +5,19 @@ package datastore
 
 import (
 	"github.com/padok-team/burrito/internal/burrito"
+	cmdUtils "github.com/padok-team/burrito/internal/utils/cmd"
 	"github.com/spf13/cobra"
 )
 
 func BuildDatastoreCmd(app *burrito.App) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "datastore",
 		Short: "cmd to use burrito's datastore",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// If we reach this point, it means no subcommand was matched
+			cmdUtils.UnsupportedCommand(cmd, args)
+			return cmd.Help()
+		},
 	}
 	cmd.AddCommand(buildDatastoreStartCmd(app))
 	return cmd

cmd/runner/runner.go

@@ -5,13 +5,19 @@ package runner
 
 import (
 	"github.com/padok-team/burrito/internal/burrito"
+	cmdUtils "github.com/padok-team/burrito/internal/utils/cmd"
 	"github.com/spf13/cobra"
 )
 
 func BuildRunnerCmd(app *burrito.App) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "runner",
 		Short: "cmd to use burrito's runner",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// If we reach this point, it means no subcommand was matched
+			cmdUtils.UnsupportedCommand(cmd, args)
+			return cmd.Help()
+		},
 	}
 	cmd.AddCommand(buildRunnerStartCmd(app))
 	return cmd

cmd/server/server.go

@@ -2,13 +2,19 @@ package server
 
 import (
 	"github.com/padok-team/burrito/internal/burrito"
+	cmdUtils "github.com/padok-team/burrito/internal/utils/cmd"
 	"github.com/spf13/cobra"
 )
 
 func BuildServerCmd(app *burrito.App) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "server",
 		Short: "cmd to use burrito's server",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// If we reach this point, it means no subcommand was matched
+			cmdUtils.UnsupportedCommand(cmd, args)
+			return cmd.Help()
+		},
 	}
 	cmd.AddCommand(buildServerStartCmd(app))
 	return cmd

internal/utils/cmd/cmd.go

@@ -1,11 +1,26 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
+
+	"github.com/spf13/cobra"
 )
 
 func Verbose(cmd *exec.Cmd) {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 }
+
+func UnsupportedCommand(cmd *cobra.Command, args []string) {
+	if len(args) > 0 {
+		fmt.Fprintf(os.Stderr, "Error: unknown %s subcommand: %s\n", cmd.Use, args[0])
+	}
+	fmt.Fprintf(os.Stderr, "Run 'burrito %s --help' for usage\n", cmd.Use)
+	if err := cmd.Help(); err != nil {
+		fmt.Fprintf(os.Stderr, "Error displaying help: %v\n", err)
+		os.Exit(1)
+	}
+	os.Exit(2)
+}