show command usage only if the error is of type ArgumentError

And if it is cobra error (which is hard to detect because it is not
typed).
Trying to allow usage of application errors insead of wrapping all in UserMessage.

cli/cmd/examples/errors_example.go

@@ -3,6 +3,7 @@ package examples
 import (
 	"fmt"
 
+	"github.com/mantil-io/mantil/cli/controller"
 	"github.com/mantil-io/mantil/cli/log"
 	"github.com/mantil-io/mantil/cli/ui"
 	"github.com/spf13/cobra"
@@ -31,7 +32,8 @@ type errStack struct{}
 
 func (e *errStack) run(pero string) error {
 	if pero == "zdero" { // this will show error and command usage!
-		return log.Wrap(fmt.Errorf("pero ne moze biti zdero"))
+		//return log.Wrap(fmt.Errorf("pero ne moze biti zdero"))
+		return log.Wrap(controller.NewArgumentError("pero ne moze biti zdero"))
 	}
 	ui.Info("in run")
 	return e.first()

cli/cmd/root.go

@@ -2,8 +2,9 @@ package cmd
 
 import (
 	"github.com/mantil-io/mantil/cli/build"
-	"github.com/mantil-io/mantil/cli/log"
+	"github.com/mantil-io/mantil/cli/controller"
 	"github.com/mantil-io/mantil/cli/ui"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 )
@@ -14,10 +15,24 @@ func Execute() error {
 		return nil
 	}
 
-	ui.Error(err)              // this will handle UserError case
-	if !log.IsUserError(err) { // show usage for cobar errors, and other usage errors
+	// show usage in case of ArgumentError
+	var ae *controller.ArgumentError
+	if errors.As(err, &ae) {
+		ui.Error(ae)
 		ec.Usage()
+		return err
 	}
+
+	// if the error is not wrapped then it is probably generated by cobra
+	// show usage because that is breaking some arguments constraints
+	if errors.Unwrap(err) == nil {
+		ui.Error(err)
+		ec.Usage()
+		return err
+	}
+
+	// in other cases show error without usage
+	ui.Error(err)
 	return err
 }
 

cli/controller/controller.go

@@ -15,6 +15,19 @@ import (
 	"github.com/mantil-io/mantil/workspace"
 )
 
+type ArgumentError struct {
+	msg string
+}
+
+func (a *ArgumentError) Error() string {
+	return a.msg
+}
+
+func NewArgumentError(format string, v ...interface{}) *ArgumentError {
+	msg := fmt.Sprintf(format, v...)
+	return &ArgumentError{msg: msg}
+}
+
 func AWSClient(account *workspace.Account, project *workspace.Project, stage *workspace.Stage) (*aws.AWS, error) {
 	restEndpoint := account.Endpoints.Rest
 
@@ -80,17 +93,13 @@ func InvokeCallback(stage *workspace.Stage, path, req string, includeHeaders, in
 
 // ensures that workspace and project exists
 func NewStore() (*workspace.FileStore, error) {
-	noProjectFoundMsg := "Mantil project not found"
 	fs, err := workspace.NewSingleDeveloperProjectStore()
 	if err != nil {
-		if err == workspace.ErrProjectNotFound {
-			return nil, log.WithUserMessage(err, noProjectFoundMsg)
-		}
 		return nil, log.Wrap(err)
 	}
 	project := fs.Project()
 	if project == nil {
-		return nil, log.WithUserMessage(nil, noProjectFoundMsg)
+		return nil, workspace.ErrProjectNotFound
 	}
 	return fs, nil
 }

cli/controller/setup_args.go

@@ -1,10 +1,10 @@
 package controller
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/mantil-io/mantil/aws"
+	"github.com/mantil-io/mantil/cli/log"
 	"github.com/mantil-io/mantil/workspace"
 )
 
@@ -46,25 +46,25 @@ func (a *SetupArgs) validate() error {
 	if a.Profile != "" {
 		return nil
 	}
-	return fmt.Errorf("AWS credentials not provided")
+	return log.Wrap(NewArgumentError("AWS credentials not provided"))
 }
 
 func (a *SetupArgs) validateAccessKeys() error {
 	if a.AccessKeyID == "" {
-		return fmt.Errorf("aws-access-key-id not provided, must be used with the aws-secret-access-key and aws-region")
+		return log.Wrap(NewArgumentError("aws-access-key-id not provided, must be used with the aws-secret-access-key and aws-region"))
 	}
 	if a.SecretAccessKey == "" {
-		return fmt.Errorf("aws-secret-access-key not provided, must be used with the aws-access-key-id and aws-region")
+		return log.Wrap(NewArgumentError("aws-secret-access-key not provided, must be used with the aws-access-key-id and aws-region"))
 	}
 	if a.Region == "" {
-		return fmt.Errorf("aws-region not provided, must be used with aws-access-key-id and aws-secret-access-key")
+		return log.Wrap(NewArgumentError("aws-region not provided, must be used with aws-access-key-id and aws-secret-access-key"))
 	}
 	return nil
 }
 
 func (a *SetupArgs) readFromEnv() error {
 	errf := func(env string) error {
-		return fmt.Errorf("%s environment variable not provided", env)
+		return NewArgumentError("%s environment variable not provided", env)
 	}
 	a.AccessKeyID, _ = os.LookupEnv(accessKeyIDEnv)
 	if a.AccessKeyID == "" {

cli/ui/ui.go

@@ -91,7 +91,7 @@ func (u *Logger) Error(err error) {
 	}
 	msg := err.Error()
 	log.PrintfWithCallDepth(2, "[cli.Error] %s", msg)
-	u.Errorf(msg)
+	u.Errorf("Error: %s", msg)
 }
 
 func (u *Logger) Errorf(format string, v ...interface{}) {