(feat): Ensured errors are logged with logrus ERROR level.

Signed-off-by: Camila Macedo <[email protected]>

cmd/docs.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -34,7 +35,7 @@ func doGenRstDocs(cmd *cobra.Command, args []string) {
 	rootCmd.DisableAutoGenTag = true
 	err := doc.GenReSTTreeCustom(rootCmd, outDir, filePrepender, linkHandler)
 	if err != nil {
-		fmt.Println("ERROR:", err)
+		logrus.Error("ERROR:", err)
 		os.Exit(1)
 	}
 }
@@ -57,7 +58,7 @@ func doGenMdDocs(cmd *cobra.Command, args []string) {
 	rootCmd.DisableAutoGenTag = true
 	err := doc.GenMarkdownTree(rootCmd, outDir)
 	if err != nil {
-		fmt.Println("ERROR:", err)
+		logrus.Error("ERROR:", err)
 		os.Exit(1)
 	}
 }

cmd/root.go

@@ -63,12 +63,13 @@ func Execute() {
 	}
 
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
+		logrus.Error(err)
 		os.Exit(1)
 	}
 }
 
 func init() {
+	logrus.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true})
 	cobra.OnInitialize(initConfig)
 
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file (default is $HOME/.config/fioctl.yaml)")
@@ -103,12 +104,12 @@ func init() {
 func getConfigDir() string {
 	config, err := homedir.Expand("~/.config")
 	if err != nil {
-		fmt.Println(err)
+		logrus.Error(err)
 		os.Exit(1)
 	}
 	if _, err := os.Stat(config); errors.Is(err, fs.ErrNotExist) {
 		if err := os.Mkdir(config, 0755); err != nil {
-			fmt.Println(err)
+			logrus.Error(err)
 			os.Exit(1)
 		}
 	}
@@ -137,7 +138,7 @@ func initConfig() {
 			logrus.Debug("Config file not found")
 		} else {
 			// Config file was found but another error was produced
-			fmt.Println("ERROR: ", err)
+			logrus.Error("ERROR: ", err)
 			os.Exit(1)
 		}
 	}

subcommands/common.go

@@ -138,7 +138,7 @@ func DieNotNil(err error, message ...string) {
 			parts = append(parts, p)
 		}
 		parts = append(parts, err)
-		fmt.Println(parts...)
+		logrus.Error(parts...)
 		for _, w := range onLastWill {
 			w()
 		}
@@ -177,7 +177,7 @@ func AssertWritable(path string) {
 	DieNotNil(err)
 	f, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, st.Mode())
 	if err != nil {
-		fmt.Println("ERROR: File is not writeable:", path)
+		logrus.Error("ERROR: File is not writeable:", path)
 		os.Exit(1)
 	}
 	f.Close()

subcommands/config/wireguard.go

@@ -59,7 +59,7 @@ func (w *WireguardServerConfig) Unmarshall(configVal string) {
 		} else if k == "enabled" {
 			w.Enabled = v != "0"
 		} else {
-			fmt.Println("ERROR: Unexpected client config key: ", k)
+			logrus.Error("ERROR: Unexpected client config key: ", k)
 			os.Exit(1)
 		}
 	}

subcommands/devices/config_wireguard.go

@@ -54,7 +54,7 @@ func (w *WireguardClientConfig) Unmarshall(configVal string) {
 		} else if k == "pubkey" {
 			w.PublicKey = strings.TrimSpace(parts[1])
 		} else {
-			fmt.Println("ERROR: Unexpected client config key: ", k)
+			logrus.Error("ERROR: Unexpected client config key: ", k)
 			os.Exit(1)
 		}
 	}
@@ -105,13 +105,13 @@ func factoryIps(factory string) map[uint32]bool {
 func findVpnAddress(factory string) string {
 	wsc := config.LoadWireguardServerConfig(factory, api)
 	if len(wsc.VpnAddress) == 0 || !wsc.Enabled {
-		fmt.Println("ERROR: A wireguard server has not been configured for this factory")
+		logrus.Error("ERROR: A wireguard server has not been configured for this factory")
 		os.Exit(1)
 	}
 	logrus.Debugf("VPN server address is: %s", wsc.VpnAddress)
 	serverIp, err := ipToUint32(wsc.VpnAddress)
 	if err != nil {
-		fmt.Println("ERROR: Wireguard server has an invalid IP Address: ", wsc.VpnAddress)
+		logrus.Error("ERROR: Wireguard server has an invalid IP Address: ", wsc.VpnAddress)
 		os.Exit(1)
 	}
 
@@ -123,7 +123,7 @@ func findVpnAddress(factory string) string {
 		}
 	}
 
-	fmt.Println("ERROR: Unable to find unique IP address for VPN")
+	logrus.Error("ERROR: Unable to find unique IP address for VPN")
 	os.Exit(1)
 	return ""
 }
@@ -144,7 +144,7 @@ func doConfigWireguard(cmd *cobra.Command, args []string) {
 		}
 		os.Exit(0)
 	} else if args[1] != "enable" && args[1] != "disable" {
-		fmt.Printf("Invalid argument: '%s'. Must be 'enable' or 'disable'\n", args[1])
+		logrus.Errorf("Invalid argument: '%s'. Must be 'enable' or 'disable'\n", args[1])
 		os.Exit(0)
 	}
 
@@ -161,7 +161,7 @@ func doConfigWireguard(cmd *cobra.Command, args []string) {
 
 	if args[1] == "enable" {
 		if len(wcc.PublicKey) == 0 {
-			fmt.Println("ERROR: Device has no public key for VPN")
+			logrus.Error("ERROR: Device has no public key for VPN")
 			os.Exit(1)
 		}
 		wcc.Enabled = true

subcommands/devices/delete.go

@@ -25,7 +25,7 @@ func doDelete(cmd *cobra.Command, args []string) {
 	for _, name := range args {
 		fmt.Printf("Deleting %s .. ", name)
 		if err := api.DeviceDelete(factory, name); err != nil {
-			fmt.Printf("failed\n%s", err)
+			logrus.Errorf("failed\n%s", err)
 			os.Exit(1)
 		} else {
 			fmt.Printf("ok\n")

subcommands/devices/list.go

@@ -185,7 +185,7 @@ func showDeviceList(dl *client.DeviceList, showColumns []string) {
 	var cols = make([]interface{}, len(showColumns))
 	for idx, c := range showColumns {
 		if _, ok := Columns[c]; !ok {
-			fmt.Println("ERROR: Invalid column name:", c)
+			logrus.Error("ERROR: Invalid column name:", c)
 			os.Exit(1)
 		}
 		cols[idx] = strings.ToUpper(c)

subcommands/devices/rename.go

@@ -1,7 +1,6 @@
 package devices
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/sirupsen/logrus"
@@ -23,7 +22,7 @@ func doRename(cmd *cobra.Command, args []string) {
 	logrus.Debugf("Renaming %s -> %s", args[0], args[1])
 
 	if err := api.DeviceRename(factory, args[0], args[1]); err != nil {
-		fmt.Printf("failed\n%s", err)
+		logrus.Errorf("failed\n%s", err)
 		os.Exit(1)
 	}
 }

subcommands/docker/cmd.go

@@ -129,6 +129,7 @@ func RunCredsHelper() int {
 	if subcommands.Config.ClientCredentials.ClientSecret == "" {
 		msg := "ERROR: Your fioctl configuration does not appear to include oauth2 credentials. Please run `fioctl login` to configure and then try again.\n"
 		os.Stderr.WriteString(msg)
+		logrus.Error(msg)
 		os.Exit(1)
 	}
 	subcommands.Login(NewCommand()) // Ensure a fresh oauth2 access token

subcommands/git/cmd.go

@@ -112,6 +112,7 @@ func RunCredsHelper() int {
 	if subcommands.Config.ClientCredentials.ClientSecret == "" {
 		msg := "ERROR: Your fioctl configuration does not appear to include oauth2 credentials. Please run `fioctl login` to configure and then try again.\n"
 		os.Stderr.WriteString(msg)
+		logrus.Error(msg)
 		os.Exit(1)
 	}
 	subcommands.Login(NewCommand()) // Ensure a fresh oauth2 access tokenA

subcommands/keys/ca_create.go

@@ -65,7 +65,7 @@ This is optional.`,
 
 func writeFile(filename, contents string, mode os.FileMode) {
 	if err := os.WriteFile(filename, []byte(contents), mode); err != nil {
-		fmt.Printf("ERROR: Creating %s: %s", filename, err)
+		logrus.Errorf("ERROR: Creating %s: %s", filename, err)
 		os.Exit(1)
 	}
 }
@@ -84,7 +84,7 @@ func doCreateCA(cmd *cobra.Command, args []string) {
 
 	if len(hsmModule) > 0 {
 		if len(hsmPin) == 0 {
-			fmt.Println("ERROR: --hsm-pin is required with --hsm-module")
+			logrus.Error("ERROR: --hsm-pin is required with --hsm-module")
 			os.Exit(1)
 		}
 		os.Setenv("HSM_MODULE", hsmModule)

subcommands/login/cmd.go

@@ -69,7 +69,7 @@ func doLogin(cmd *cobra.Command, args []string) {
 	}
 
 	if creds.Config.ClientId == "" || creds.Config.ClientSecret == "" {
-		fmt.Println("Cannot execute login without client ID or client secret.")
+		logrus.Error("Cannot execute login without client ID or client secret.")
 		os.Exit(1)
 	}
 
@@ -106,7 +106,7 @@ func promptForCreds(credsUrl string) (string, string) {
 	clientSecret := strings.Trim(scanner.Text(), " ")
 
 	if clientId == "" || clientSecret == "" {
-		fmt.Println("Client ID and client credentials are both required.")
+		logrus.Error("ERROR: Client ID and client credentials are both required.")
 		os.Exit(1)
 	}
 

subcommands/secrets/list.go

@@ -1,7 +1,6 @@
 package secrets
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/cheynewallace/tabby"
@@ -34,7 +33,7 @@ func doList(cmd *cobra.Command, args []string) {
 			t.AddLine(secret.Name)
 		}
 	} else if len(triggers) != 0 {
-		fmt.Println("ERROR: Factory configuration issue. Factory has unexpected number of triggers.")
+		logrus.Error("ERROR: Factory configuration issue. Factory has unexpected number of triggers.")
 		os.Exit(1)
 	}
 	t.Print()

subcommands/secrets/update.go

@@ -1,7 +1,6 @@
 package secrets
 
 import (
-	"fmt"
 	"os"
 	"strings"
 
@@ -42,7 +41,7 @@ func doUpdate(cmd *cobra.Command, args []string) {
 	for i, arg := range args {
 		parts := strings.SplitN(arg, "=", 2)
 		if len(parts) != 2 {
-			fmt.Println("ERROR: Invalid key=value argument: ", arg)
+			logrus.Error("ERROR: Invalid key=value argument: ", arg)
 			os.Exit(1)
 		}
 		secrets[i].Name = parts[0]
@@ -67,7 +66,7 @@ func doUpdate(cmd *cobra.Command, args []string) {
 	} else if len(triggers) == 1 {
 		pt = triggers[0]
 	} else {
-		fmt.Println("ERROR: Factory configuration issue. Factory has unexpected number of triggers.")
+		logrus.Error("ERROR: Factory configuration issue. Factory has unexpected number of triggers.")
 		os.Exit(1)
 	}
 

subcommands/targets/artifacts.go

@@ -81,7 +81,7 @@ func (d *DlStatus) Write(p []byte) (int, error) {
 func downloadArtifact(factory string, target int, artifact string) {
 	firstSlash := strings.Index(artifact, "/")
 	if firstSlash < 1 {
-		fmt.Println("ERROR: Invalid artifact path:", artifact)
+		logrus.Error("ERROR: Invalid artifact path:", artifact)
 		os.Exit(1)
 	}
 	run := artifact[0:firstSlash]

subcommands/targets/edit.go

@@ -41,16 +41,16 @@ func doEdit(cmd *cobra.Command, args []string) {
 	// Create temp file to edit with
 	tmpfile, err := os.CreateTemp("", "targets.*.json")
 	if err != nil {
-		fmt.Println("Unable to create tempfile: ", err)
+		logrus.Error("Unable to create tempfile: ", err)
 		os.Exit(1)
 	}
 	defer os.Remove(tmpfile.Name())
 	if _, err := tmpfile.Write(orig); err != nil {
-		fmt.Println("Unable to write tempfile: ", err)
+		logrus.Error("Unable to write tempfile: ", err)
 		os.Exit(1)
 	}
 	if err := tmpfile.Close(); err != nil {
-		fmt.Println("Unable to close tempfile: ", err)
+		logrus.Error("Unable to close tempfile: ", err)
 		os.Exit(1)
 	}
 
@@ -72,7 +72,7 @@ func doEdit(cmd *cobra.Command, args []string) {
 	// Read it and see if its changed
 	content, err := os.ReadFile(tmpfile.Name())
 	if err != nil {
-		fmt.Println("ERROR: Unable to re-read tempfile:", err)
+		logrus.Error("ERROR: Unable to re-read tempfile:", err)
 	}
 	if bytes.Equal(content, orig) {
 		fmt.Println("No changes found, exiting.")
@@ -83,7 +83,7 @@ func doEdit(cmd *cobra.Command, args []string) {
 	var newTargets tuf.Files
 	err = json.Unmarshal(content, &newTargets)
 	if err != nil {
-		fmt.Println("Unable to parse new targets: ", err)
+		logrus.Error("Unable to parse new targets: ", err)
 		os.Exit(1)
 	}
 	type TargetsUp struct {
@@ -92,7 +92,7 @@ func doEdit(cmd *cobra.Command, args []string) {
 	upload := TargetsUp{newTargets}
 	content, err = json.Marshal(upload)
 	if err != nil {
-		fmt.Println("Unable to marshall targets data: ", err)
+		logrus.Error("Unable to marshall targets data: ", err)
 		os.Exit(1)
 	}
 

subcommands/targets/image.go

@@ -41,8 +41,8 @@ func validateAppShortlist() {
 	pattern := `^[a-zA-Z0-9-_,]+$`
 	re := regexp.MustCompile(pattern)
 	if len(appsShortlist) > 0 && !re.MatchString(appsShortlist) {
-		fmt.Println("ERROR: Invalid value for apps:", appsShortlist)
-		fmt.Println("       apps must be ", pattern)
+		logrus.Error("ERROR: Invalid value for apps:", appsShortlist)
+		logrus.Error("       apps must be ", pattern)
 		os.Exit(1)
 	}
 }

subcommands/targets/list.go

@@ -191,7 +191,7 @@ func doList(cmd *cobra.Command, args []string) {
 	var cols = make([]interface{}, len(showColumns))
 	for idx, c := range showColumns {
 		if _, ok := Columns[c]; !ok {
-			fmt.Println("ERROR: Invalid column name:", c)
+			logrus.Error("ERROR: Invalid column name:", c)
 			os.Exit(1)
 		}
 		cols[idx] = strings.ToUpper(c)

subcommands/targets/prune.go

@@ -2,6 +2,7 @@ package targets
 
 import (
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"os"
 	"sort"
 	"strconv"
@@ -98,7 +99,7 @@ func doPrune(cmd *cobra.Command, args []string) {
 			for _, name := range target_names {
 				parts := strings.SplitN(name, "lmp-", 2)
 				if len(parts) != 2 {
-					fmt.Printf("Unable to decode target name: %s\n", name)
+					logrus.Errorf("Unable to decode target name: %s\n", name)
 					os.Exit(1)
 				}
 				custom, _ := api.TargetCustom(targets[name])
@@ -132,7 +133,7 @@ func doPrune(cmd *cobra.Command, args []string) {
 	} else {
 		for _, name := range args {
 			if _, ok := targets[name]; !ok {
-				fmt.Printf("Target(%s) not found in targets.json\n", name)
+				logrus.Errorf("Target(%s) not found in targets.json\n", name)
 				os.Exit(1)
 			}
 		}