move vars to global

Author: umbynos

cli/cli.go

@@ -25,10 +25,10 @@ import (
 
 	"github.com/arduino/arduino-fwuploader/cli/certificates"
 	"github.com/arduino/arduino-fwuploader/cli/common"
+	"github.com/arduino/arduino-fwuploader/cli/feedback"
 	"github.com/arduino/arduino-fwuploader/cli/firmware"
+	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/arduino-fwuploader/cli/version"
-
-	"github.com/arduino/arduino-fwuploader/cli/feedback"
 	v "github.com/arduino/arduino-fwuploader/version"
 	"github.com/mattn/go-colorable"
 	"github.com/rifflock/lfshook"
@@ -38,10 +38,8 @@ import (
 
 var (
 	outputFormat           string
-	verbose                bool
 	logFile                string
 	logFormat              string
-	logLevel               string
 	additionalFirmwareURLs []string
 	additionalPackageURLs  []string
 )
@@ -64,8 +62,8 @@ func NewCommand() *cobra.Command {
 	rootCmd.PersistentFlags().StringVar(&outputFormat, "format", "text", "The output format, can be {text|json}.")
 	rootCmd.PersistentFlags().StringVar(&logFile, "log-file", "", "Path to the file where logs will be written")
 	rootCmd.PersistentFlags().StringVar(&logFormat, "log-format", "", "The output format for the logs, can be {text|json}.")
-	rootCmd.PersistentFlags().StringVar(&logLevel, "log-level", "info", "Messages with this level and above will be logged. Valid levels are: trace, debug, info, warn, error, fatal, panic")
-	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Print the logs on the standard output.")
+	rootCmd.PersistentFlags().StringVar(&globals.LogLevel, "log-level", "info", "Messages with this level and above will be logged. Valid levels are: trace, debug, info, warn, error, fatal, panic")
+	rootCmd.PersistentFlags().BoolVarP(&globals.Verbose, "verbose", "v", false, "Print the logs on the standard output.")
 	rootCmd.PersistentFlags().StringArrayVarP(&additionalFirmwareURLs, "additional-fw-index", "F", nil, "Additional firmwares index URLs (useful for testing purposes)")
 	rootCmd.PersistentFlags().StringArrayVarP(&additionalPackageURLs, "additional-packages-index", "P", nil, "Additional packages index URLs (useful for testing purposes)")
 	return rootCmd
@@ -97,7 +95,7 @@ func preRun(cmd *cobra.Command, args []string) {
 	feedback.SetFormat(format)
 
 	// Prepare logging
-	if verbose {
+	if globals.Verbose {
 		// if we print on stdout, do it in full colors
 		logrus.SetOutput(colorable.NewColorableStdout())
 		logrus.SetFormatter(&logrus.TextFormatter{
@@ -128,8 +126,8 @@ func preRun(cmd *cobra.Command, args []string) {
 	}
 
 	// Configure logging filter
-	if lvl, found := toLogLevel(logLevel); !found {
-		feedback.Fatal(fmt.Sprintf("Invalid option for --log-level: %s", logLevel), feedback.ErrBadArgument)
+	if lvl, found := toLogLevel(globals.LogLevel); !found {
+		feedback.Fatal(fmt.Sprintf("Invalid option for --log-level: %s", globals.LogLevel), feedback.ErrBadArgument)
 	} else {
 		logrus.SetLevel(lvl)
 	}

cli/globals/globals.go

@@ -29,6 +29,8 @@ var (
 	ModuleFirmwareIndexGZURL = "https://downloads.arduino.cc/arduino-fwuploader/boards/module_firmware_index.json.gz"
 	PluginFirmwareIndexGZURL = "https://downloads.arduino.cc/arduino-fwuploader/boards/plugin_firmware_index.json.gz"
 	FwUploaderPath           = paths.TempDir().Join("fwuploader")
+	Verbose                  bool
+	LogLevel                 string
 )
 
 //go:embed keys/*