redhat-developer · craicoverflow · Jul 28, 2021 · Jul 27, 2021 · Jul 27, 2021 · Jul 27, 2021
diff --git a/cmd/rhoas/main.go b/cmd/rhoas/main.go
@@ -2,18 +2,13 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 
-	"github.com/redhat-developer/app-services-cli/pkg/api/kas"
 	"github.com/redhat-developer/app-services-cli/pkg/doc"
-	"github.com/redhat-developer/app-services-cli/pkg/dump"
 	"github.com/redhat-developer/app-services-cli/pkg/localize"
 	"github.com/redhat-developer/app-services-cli/pkg/localize/goi18n"
 
-	"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
-
 	"github.com/redhat-developer/app-services-cli/internal/build"
 
 	"github.com/redhat-developer/app-services-cli/internal/config"
@@ -57,24 +52,16 @@ func main() {
 	}
 
 	err = rootCmd.Execute()
-	if debug.Enabled() {
-		build.CheckForUpdate(context.Background(), logger, localizer)
-	}
 	if err == nil {
-		return
-	}
-
-	if e, ok := kas.GetAPIError(err); ok {
-		logger.Error("Error:", e.GetReason())
 		if debug.Enabled() {
-			errJSON, _ := json.Marshal(e)
-			_ = dump.JSON(cmdFactory.IOStreams.ErrOut, errJSON)
+			build.CheckForUpdate(context.Background(), logger, localizer)
 		}
-		os.Exit(1)
+		return
 	}
 
-	if err = cmdutil.CheckSurveyError(err); err != nil {
-		logger.Error("Error:", err)
+	if err != nil {
+		logger.Error(wrapErrorf(err, localizer))
+		build.CheckForUpdate(context.Background(), logger, localizer)
 		os.Exit(1)
 	}
 }
@@ -131,3 +118,7 @@ func initConfig(f *factory.Factory) error {
 	}
 	return nil
 }
+
+func wrapErrorf(err error, localizer localize.Localizer) error {
+	return fmt.Errorf("Error: %w. %v", err, localizer.MustLocalize("common.log.error.verboseModeHint"))
+}
diff --git a/docs/commands/rhoas.adoc b/docs/commands/rhoas.adoc
diff --git a/docs/commands/rhoas_cluster.adoc b/docs/commands/rhoas_cluster.adoc
diff --git a/docs/commands/rhoas_cluster_bind.adoc b/docs/commands/rhoas_cluster_bind.adoc
diff --git a/docs/commands/rhoas_cluster_connect.adoc b/docs/commands/rhoas_cluster_connect.adoc
diff --git a/docs/commands/rhoas_cluster_status.adoc b/docs/commands/rhoas_cluster_status.adoc
diff --git a/docs/commands/rhoas_completion.adoc b/docs/commands/rhoas_completion.adoc
diff --git a/docs/commands/rhoas_completion_bash.adoc b/docs/commands/rhoas_completion_bash.adoc
diff --git a/docs/commands/rhoas_completion_fish.adoc b/docs/commands/rhoas_completion_fish.adoc
diff --git a/docs/commands/rhoas_completion_zsh.adoc b/docs/commands/rhoas_completion_zsh.adoc
diff --git a/docs/commands/rhoas_config.adoc b/docs/commands/rhoas_config.adoc
diff --git a/docs/commands/rhoas_config_dev-preview.adoc b/docs/commands/rhoas_config_dev-preview.adoc
diff --git a/docs/commands/rhoas_kafka.adoc b/docs/commands/rhoas_kafka.adoc
diff --git a/docs/commands/rhoas_kafka_consumer-group.adoc b/docs/commands/rhoas_kafka_consumer-group.adoc
diff --git a/docs/commands/rhoas_kafka_consumer-group_delete.adoc b/docs/commands/rhoas_kafka_consumer-group_delete.adoc
diff --git a/docs/commands/rhoas_kafka_consumer-group_describe.adoc b/docs/commands/rhoas_kafka_consumer-group_describe.adoc
diff --git a/docs/commands/rhoas_kafka_consumer-group_list.adoc b/docs/commands/rhoas_kafka_consumer-group_list.adoc
diff --git a/docs/commands/rhoas_kafka_create.adoc b/docs/commands/rhoas_kafka_create.adoc
diff --git a/docs/commands/rhoas_kafka_delete.adoc b/docs/commands/rhoas_kafka_delete.adoc
diff --git a/docs/commands/rhoas_kafka_describe.adoc b/docs/commands/rhoas_kafka_describe.adoc
diff --git a/docs/commands/rhoas_kafka_list.adoc b/docs/commands/rhoas_kafka_list.adoc
diff --git a/docs/commands/rhoas_kafka_topic.adoc b/docs/commands/rhoas_kafka_topic.adoc
diff --git a/docs/commands/rhoas_kafka_topic_create.adoc b/docs/commands/rhoas_kafka_topic_create.adoc
diff --git a/docs/commands/rhoas_kafka_topic_delete.adoc b/docs/commands/rhoas_kafka_topic_delete.adoc
diff --git a/docs/commands/rhoas_kafka_topic_describe.adoc b/docs/commands/rhoas_kafka_topic_describe.adoc
diff --git a/docs/commands/rhoas_kafka_topic_list.adoc b/docs/commands/rhoas_kafka_topic_list.adoc
diff --git a/docs/commands/rhoas_kafka_topic_update.adoc b/docs/commands/rhoas_kafka_topic_update.adoc
diff --git a/docs/commands/rhoas_kafka_use.adoc b/docs/commands/rhoas_kafka_use.adoc
diff --git a/docs/commands/rhoas_login.adoc b/docs/commands/rhoas_login.adoc