[bug] CLI errors that occur before installation are not printed (#475)

percona · Jul 4, 2024 · 357baf7 · 357baf7
1 parent d6fce8a
commit 357baf7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/commands/install.go b/commands/install.go
@@ -60,7 +60,7 @@ func newInstallCmd(l *zap.SugaredLogger) *cobra.Command {
 			}
 
 			if err := op.Run(cmd.Context()); err != nil {
-				output.PrintError(err, l)
+				output.PrintError(err, l, !enableLogging)
 				os.Exit(1)
 			}
 		},

diff --git a/commands/settings/oidc/configure.go b/commands/settings/oidc/configure.go
@@ -48,7 +48,7 @@ func NewConfigureCommand(l *zap.SugaredLogger) *cobra.Command {
 			}
 
 			if err := op.Run(cmd.Context()); err != nil {
-				output.PrintError(err, l)
+				output.PrintError(err, l, false)
 				os.Exit(1)
 			}
 		},

diff --git a/commands/uninstall.go b/commands/uninstall.go
@@ -53,7 +53,7 @@ func newUninstallCmd(l *zap.SugaredLogger) *cobra.Command {
 			}
 
 			if err := op.Run(cmd.Context()); err != nil {
-				output.PrintError(err, l)
+				output.PrintError(err, l, !enableLogging)
 				os.Exit(1)
 			}
 		},

diff --git a/commands/upgrade.go b/commands/upgrade.go
@@ -59,7 +59,7 @@ func newUpgradeCmd(l *zap.SugaredLogger) *cobra.Command {
 			}
 
 			if err := op.Run(cmd.Context()); err != nil {
-				output.PrintError(err, l)
+				output.PrintError(err, l, !enableLogging)
 				os.Exit(1)
 			}
 		},

diff --git a/pkg/output/command.go b/pkg/output/command.go
@@ -52,7 +52,7 @@ func PrintOutput(cmd *cobra.Command, l *zap.SugaredLogger, output interface{}) {
 }
 
 // PrintError formats and prints an error to logger.
-func PrintError(err error, l *zap.SugaredLogger) {
+func PrintError(err error, l *zap.SugaredLogger, prettyPrint bool) {
 	if errors.Is(err, common.ErrExitWithError) {
 		return
 	}
@@ -62,6 +62,9 @@ func PrintError(err error, l *zap.SugaredLogger) {
 	}
 
 	l.Error(err)
+	if prettyPrint {
+		fmt.Print(Failure("%s", err)) //nolint:forbidigo
+	}
 }
 
 //nolint:gochecknoglobals