change usage defaults

cmd/mobile/main.go

@@ -100,6 +100,8 @@ func main() {
 		rootCmd.AddCommand(startCmd)
 	}
 
+	rootCmd.SilenceUsage = true
+
 	if err := rootCmd.Execute(); err != nil {
 		// as using pkg/errors lets allow the full stack to be seen if needed
 		if os.Getenv("MCP_DEBUG") == "true" {

pkg/cmd/clients.go

@@ -92,7 +92,7 @@ Run the "mobile get clients" command from this tool to get the client ID.`,
   oc plugin mobile get client <clientID>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
-				return errors.New("missing argument <clientID>")
+				return cmd.Usage()
 			}
 			clientID := args[0]
 			ns, err := currentNamespace(cmd.Flags())
@@ -140,7 +140,7 @@ When used standalone, a namespace must be specified by providing the --namespace
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) != 3 {
-				return errors.New("expected a name a clientType and a appIdentifier")
+				return cmd.Usage()
 			}
 			name := args[0]
 			clientType := args[1]
@@ -217,7 +217,7 @@ Run the "mobile get clients" command from this tool to get the client ID.`,
 			var ns string
 
 			if len(args) != 1 {
-				return errors.New("expected a clientID argument to be passed " + cmd.Use)
+				return cmd.Usage()
 			}
 			clientID := args[0]
 

pkg/cmd/integration.go

@@ -113,7 +113,7 @@ oc plugin mobile create integration <consuming_service_instance_id> <providing_s
 	`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 2 {
-				return errors.New("missing arguments: " + cmd.Use)
+				return cmd.Usage()
 			}
 			namespace, err := currentNamespace(cmd.Flags())
 			if err != nil {
@@ -185,7 +185,7 @@ oc plugin mobile delete integration <consuming_service_instance_id> <providing_s
 	`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 2 {
-				return errors.New("missing arguments.")
+				return cmd.Usage()
 			}
 			namespace, err := currentNamespace(cmd.Flags())
 			if err != nil {

pkg/cmd/serviceConfig.go

@@ -123,8 +123,7 @@ func (scc *ServiceConfigCmd) GetServiceConfigCmd() *cobra.Command {
 		Short: "get a mobile aware service definition",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				//log.Println(")
-				return errors.Errorf("%v\n%v", "service name is required", cmd.Usage())
+				return cmd.Usage()
 			}
 			serviceName := args[0]
 			if serviceName == "" {

pkg/cmd/services.go

@@ -212,7 +212,7 @@ Run the "mobile get services" command from this tool to see which services are a
   oc plugin mobile create serviceinstance <serviceName>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
-				return errors.New("expected the name of a service to provision")
+				return cmd.Usage()
 			}
 			// find our serviceclass and plan
 			serviceName := args[0]
@@ -392,7 +392,7 @@ Run the "mobile get serviceinstances" command from this tool to see which servic
 			//delete service instance
 			//delete params secret
 			if len(args) != 1 {
-				return errors.New("expected a serviceInstanceID")
+				return cmd.Usage()
 			}
 			ns, err := currentNamespace(cmd.Flags())
 			if err != nil {
@@ -423,7 +423,7 @@ func (sc *ServicesCmd) ListServiceInstCmd() *cobra.Command {
   oc plugin mobile get serviceinstances <serviceName>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
-				return errors.New("no service name passed")
+				return cmd.Usage()
 			}
 			serviceName := args[0]
 			ns, err := currentNamespace(cmd.Flags())