Skip to content

Commit 0525dfa

Browse files
author
Enda Phelan
committed
feat: rename debug flag to verbose
BREAKING: The `debug` flag is now `verbose`. There is no longer any shorthand for `version`.
1 parent f17f3b4 commit 0525dfa

48 files changed

Lines changed: 474 additions & 102 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cmd/rhoas/main.go

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@ package main
22

33
import (
44
"context"
5-
"encoding/json"
65
"fmt"
76
"os"
87

9-
"github.com/redhat-developer/app-services-cli/pkg/api/kas"
108
"github.com/redhat-developer/app-services-cli/pkg/doc"
11-
"github.com/redhat-developer/app-services-cli/pkg/dump"
129
"github.com/redhat-developer/app-services-cli/pkg/localize"
1310
"github.com/redhat-developer/app-services-cli/pkg/localize/goi18n"
1411

15-
"github.com/redhat-developer/app-services-cli/pkg/cmdutil"
16-
1712
"github.com/redhat-developer/app-services-cli/internal/build"
1813

1914
"github.com/redhat-developer/app-services-cli/internal/config"
@@ -57,24 +52,16 @@ func main() {
5752
}
5853

5954
err = rootCmd.Execute()
60-
if debug.Enabled() {
61-
build.CheckForUpdate(context.Background(), logger, localizer)
62-
}
6355
if err == nil {
64-
return
65-
}
66-
67-
if e, ok := kas.GetAPIError(err); ok {
68-
logger.Error("Error:", e.GetReason())
6956
if debug.Enabled() {
70-
errJSON, _ := json.Marshal(e)
71-
_ = dump.JSON(cmdFactory.IOStreams.ErrOut, errJSON)
57+
build.CheckForUpdate(context.Background(), logger, localizer)
7258
}
73-
os.Exit(1)
59+
return
7460
}
7561

76-
if err = cmdutil.CheckSurveyError(err); err != nil {
77-
logger.Error("Error:", err)
62+
if err != nil {
63+
logger.Error(wrapErrorf(err, localizer))
64+
build.CheckForUpdate(context.Background(), logger, localizer)
7865
os.Exit(1)
7966
}
8067
}
@@ -131,3 +118,7 @@ func initConfig(f *factory.Factory) error {
131118
}
132119
return nil
133120
}
121+
122+
func wrapErrorf(err error, localizer localize.Localizer) error {
123+
return fmt.Errorf("Error: %w. %v", err, localizer.MustLocalize("common.log.error.verboseModeHint"))
124+
}

docs/commands/rhoas.adoc

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_cluster.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_cluster_bind.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_cluster_connect.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_cluster_status.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_completion.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_completion_bash.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_completion_fish.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/rhoas_completion_zsh.adoc

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)