Merge pull request #99 from DopplerHQ/tom_debug

Print active configuration when specifying --print-config flag
DopplerHQ · Jun 2, 2020 · 0fa02f2 · 0fa02f2
2 parents f278c8b + 3e718a0
commit 0fa02f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
@@ -44,8 +44,12 @@ var rootCmd = &cobra.Command{
 			if silent {
 				utils.LogWarning("--silent has no effect when used with --debug")
 			}
+		}
 
-			utils.LogDebug("Active configuration")
+		// this output does not honor --silent
+		printConfig := utils.GetBoolFlagIfChanged(cmd, "print-config", false)
+		if printConfig {
+			fmt.Println("Active configuration")
 			printer.ScopedConfigSource(configuration.LocalConfig(cmd), false, true)
 			fmt.Println("")
 		}
@@ -106,14 +110,13 @@ func loadFlags(cmd *cobra.Command) {
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	// catch any panics
+	// catch any panics in non-dev builds
 	defer func() {
-		if version.IsDevelopment() {
-			return
-		}
-		if err := recover(); err != nil {
-			fmt.Fprintf(os.Stderr, fmt.Sprintf("%s %v\n", color.Red.Render("Doppler Exception:"), err))
-			os.Exit(1)
+		if !version.IsDevelopment() {
+			if err := recover(); err != nil {
+				fmt.Fprintf(os.Stderr, fmt.Sprintf("%s %v\n", color.Red.Render("Doppler Exception:"), err))
+				os.Exit(1)
+			}
 		}
 	}()
 
@@ -138,7 +141,8 @@ func init() {
 	rootCmd.PersistentFlags().Bool("no-read-env", false, "do not read enclave config from the environment")
 	rootCmd.PersistentFlags().String("scope", ".", "the directory to scope your config to")
 	rootCmd.PersistentFlags().String("configuration", configuration.UserConfigFile, "config file")
-	rootCmd.PersistentFlags().Bool("json", false, "output json")
-	rootCmd.PersistentFlags().Bool("debug", false, "output additional information when encountering errors")
-	rootCmd.PersistentFlags().Bool("silent", false, "disable output of info messages")
+	rootCmd.PersistentFlags().Bool("json", utils.OutputJSON, "output json")
+	rootCmd.PersistentFlags().Bool("debug", utils.Debug, "output additional information")
+	rootCmd.PersistentFlags().Bool("print-config", false, "output active configuration")
+	rootCmd.PersistentFlags().Bool("silent", utils.Silent, "disable output of info messages")
 }
diff --git a/pkg/utils/log.go b/pkg/utils/log.go
@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"runtime/debug"
 
 	"gopkg.in/gookit/color.v1"
 )
@@ -97,11 +96,6 @@ func ErrExit(e error, exitCode int, messages ...string) {
 		}
 	}
 
-	if Debug {
-		fmt.Fprintln(os.Stderr, color.Red.Render("\nStacktrace:"))
-		debug.PrintStack()
-	}
-
 	os.Exit(exitCode)
 }