refactor: using internal stdout util

mainawycliffe · Jan 29, 2020 · ea465d3 · ea465d3
1 parent 9de0aa2
commit ea465d3
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 41 deletions.
diff --git a/cmd/addUser.go b/cmd/addUser.go
@@ -2,10 +2,8 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"os"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/mainawycliffe/kamanda/firebase/auth"
 	"github.com/mainawycliffe/kamanda/utils"
 	"github.com/spf13/cobra"
@@ -38,20 +36,20 @@ var addUserCmd = &cobra.Command{
 		}
 		userRecord, err := auth.NewFirebaseUser(context.Background(), user)
 		if err != nil {
-			fmt.Print(aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+			utils.StdOutError("%s\n", err.Error())
 			os.Exit(1)
 		}
-		fmt.Print(aurora.Sprintf(aurora.Green("✔✔ user added - uid: %s email: %s\n"), userRecord.UID, userRecord.Email))
+		utils.StdOutSuccess("✔✔ user added - uid: %s email: %s\n", userRecord.UID, userRecord.Email)
 		if len(customClaimsInput) == 0 {
 			os.Exit(0)
 		}
 		customClaims := utils.ProcessCustomClaimInput(customClaimsInput)
 		err = auth.AddCustomClaimToFirebaseUser(context.Background(), userRecord.UID, customClaims)
 		if err != nil {
-			fmt.Print(aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+			utils.StdOutError("%s\n", err.Error())
 			os.Exit(1)
 		}
-		fmt.Print(aurora.Sprintf(aurora.Green("✔✔ custom claims added\n")))
+		utils.StdOutSuccess("✔✔ custom claims added\n")
 		os.Exit(0)
 	},
 }
@@ -68,11 +66,11 @@ func init() {
 	addUserCmd.Flags().Bool("isDisabled", false, "is the user account disabled")
 	addUserCmd.Flags().StringToStringP("customClaims", "c", nil, "user custom claims i.e. --customClaims \"admin=true\"")
 	if err := addUserCmd.MarkFlagRequired("email"); err != nil {
-		fmt.Print(aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+		utils.StdOutError("%s\n", err.Error())
 		os.Exit(1)
 	}
 	if err := addUserCmd.MarkFlagRequired("password"); err != nil {
-		fmt.Print(aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+		utils.StdOutError("%s\n", err.Error())
 		os.Exit(1)
 	}
 }
diff --git a/cmd/addUsers.go b/cmd/addUsers.go
@@ -2,10 +2,8 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"os"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/mainawycliffe/kamanda/firebase/auth"
 	"github.com/mainawycliffe/kamanda/utils"
 	"github.com/spf13/cobra"
@@ -66,12 +64,12 @@ func init() {
 	authCmd.AddCommand(addUsersCmd)
 	addUsersCmd.Flags().StringP("source", "s", "", "file with list of users to create")
 	if err := addUsersCmd.MarkFlagRequired("source"); err != nil {
-		fmt.Print(aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+		utils.StdOutError("%s\n", err.Error())
 		os.Exit(1)
 	}
 	addUsersCmd.Flags().StringP("extension", "e", "yaml", "Source file type - json or yaml")
 	if err := addUsersCmd.MarkFlagRequired("extension"); err != nil {
-		fmt.Print(aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+		utils.StdOutError("%s\n", err.Error())
 		os.Exit(1)
 	}
 }
diff --git a/cmd/customclaims.go b/cmd/customclaims.go
@@ -2,10 +2,8 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"os"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/mainawycliffe/kamanda/firebase/auth"
 	"github.com/mainawycliffe/kamanda/utils"
 	"github.com/spf13/cobra"
@@ -19,18 +17,18 @@ var customclaimsCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		// args = list of uids
 		if len(args) == 0 {
-			fmt.Print(aurora.Sprintf(aurora.Red("atleast one Firebase user uid is required!")))
+			utils.StdOutError("atleast one Firebase user uid is required!")
 			os.Exit(1)
 		}
 		customClaimsInput, _ := cmd.Flags().GetStringToString("customClaims")
 		customClaims := utils.ProcessCustomClaimInput(customClaimsInput)
 		for _, uid := range args {
 			err := auth.AddCustomClaimToFirebaseUser(context.Background(), uid, customClaims)
 			if err != nil {
-				fmt.Print(aurora.Sprintf(aurora.Red("%s - Failed: %s\n"), uid, err.Error()))
+				utils.StdOutError("%s - Failed: %s\n", uid, err.Error())
 				continue
 			}
-			fmt.Print(aurora.Sprintf(aurora.Green("%s - Added Successfully\n"), uid))
+			utils.StdOutSuccess("%s - Added Successfully\n", uid)
 		}
 		os.Exit(0)
 	},
@@ -40,7 +38,7 @@ func init() {
 	authCmd.AddCommand(customclaimsCmd)
 	customclaimsCmd.Flags().StringToStringP("customClaims", "c", nil, "user custom claims i.e. --customClaims \"admin=true\"")
 	if err := customclaimsCmd.MarkFlagRequired("customClaims"); err != nil {
-		fmt.Print(aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+		utils.StdOutError("%s\n", err.Error())
 		os.Exit(1)
 	}
 }
diff --git a/cmd/deleteUser.go b/cmd/deleteUser.go
@@ -2,11 +2,10 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"os"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/mainawycliffe/kamanda/firebase/auth"
+	"github.com/mainawycliffe/kamanda/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -18,17 +17,17 @@ var deleteUserCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		// args = list of uids
 		if len(args) == 0 {
-			fmt.Printf("atleast one Firebase user uid is required!")
+			utils.StdOutError("atleast one Firebase user uid is required!")
 			os.Exit(1)
 		}
 		// delete all listed user accounts
 		for _, uid := range args {
 			err := auth.DeleteFirebaseUser(context.Background(), uid)
 			if err != nil {
-				fmt.Print(aurora.Sprintf(aurora.Red("%s - Not Deleted: %s\n"), uid, err.Error()))
+				utils.StdOutError("%s - Not Deleted: %s\n", uid, err.Error())
 				continue
 			}
-			fmt.Print(aurora.Sprintf(aurora.Green("%s - Deleted\n"), uid))
+			utils.StdOutSuccess("%s - Deleted\n", uid)
 		}
 		os.Exit(0)
 	},

diff --git a/cmd/login.go b/cmd/login.go
@@ -1,12 +1,11 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/mainawycliffe/kamanda/configs"
 	"github.com/mainawycliffe/kamanda/oauth"
+	"github.com/mainawycliffe/kamanda/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -18,7 +17,7 @@ var loginCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		if viper.IsSet(configs.FirebaseRefreshTokenViperConfigKey) {
 			email := viper.GetString(configs.FirebaseLoggedInUserEmailViperConfigKey)
-			fmt.Fprint(os.Stdout, aurora.Sprintf("Already logged in as %s\n", aurora.Green(email)))
+			utils.StdOutSuccess("Already logged in as %s\n", email)
 			os.Exit(1)
 		}
 		noLocalhostFlag, _ := cmd.Flags().GetBool("no-localhost")
@@ -27,7 +26,7 @@ var loginCmd = &cobra.Command{
 			os.Exit(0)
 		}
 		if err := oauth.LoginWithoutLocalhost(false); err != nil {
-			fmt.Fprint(os.Stdout, aurora.Sprintf(aurora.Red("\n\n%s\n\n"), err.Error()))
+			utils.StdOutError("\n\n%s\n\n", err.Error())
 			os.Exit(1)
 		}
 		os.Exit(0)

diff --git a/cmd/login:ci.go b/cmd/login:ci.go
@@ -1,11 +1,10 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/mainawycliffe/kamanda/oauth"
+	"github.com/mainawycliffe/kamanda/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -20,7 +19,7 @@ var loginCICmd = &cobra.Command{
 			os.Exit(0)
 		}
 		if err := oauth.LoginWithoutLocalhost(true); err != nil {
-			fmt.Fprint(os.Stdout, aurora.Sprintf(aurora.Red("\n\n%s\n\n"), err.Error()))
+			utils.StdOutError("\n\n%s\n\n", err.Error())
 			os.Exit(1)
 		}
 		os.Exit(0)

diff --git a/cmd/logout.go b/cmd/logout.go
@@ -1,12 +1,12 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/logrusorgru/aurora"
 	"github.com/mainawycliffe/kamanda/configs"
 	"github.com/mainawycliffe/kamanda/oauth"
+	"github.com/mainawycliffe/kamanda/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -18,14 +18,14 @@ var logoutCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		email := viper.GetString(configs.FirebaseLoggedInUserEmailViperConfigKey)
 		if !viper.IsSet(configs.FirebaseRefreshTokenViperConfigKey) {
-			fmt.Fprint(os.Stdout, aurora.Sprintf("%s\n", aurora.Red("You are not logged in!")))
+			utils.StdOutError("%s\n", aurora.Red("You are not logged in!"))
 			os.Exit(1)
 		}
 		if err := oauth.RevokeRefreshToken(); err != nil {
-			fmt.Fprint(os.Stdout, aurora.Sprintf(aurora.Red("%s\n"), err.Error()))
+			utils.StdOutError("%s\n", err.Error())
 			os.Exit(1)
 		}
-		fmt.Fprint(os.Stdout, aurora.Sprintf(aurora.Green("Logged out from %s\n\n"), email))
+		utils.StdOutError("Logged out from %s\n\n", email)
 		os.Exit(0)
 	},
 }

diff --git a/cmd/root.go b/cmd/root.go
@@ -2,11 +2,13 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/mainawycliffe/kamanda/configs"
+	"github.com/mainawycliffe/kamanda/utils"
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"os"
 )
 
 // "In this context, the client secret is obviously not treated as a secret"
@@ -34,7 +36,7 @@ var rootCmd = &cobra.Command{
 
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
+		utils.StdOutError("%s", err.Error())
 		os.Exit(1)
 	}
 }
@@ -56,13 +58,13 @@ func initConfig() {
 		// Find home directory.
 		home, err := homedir.Dir()
 		if err != nil {
-			fmt.Println(err)
+			utils.StdOutError("%s", err.Error())
 			os.Exit(1)
 		}
 		configPath := fmt.Sprintf("%s/.kamanda.yaml", home)
 		_, err = os.Stat(configPath)
 		if err != nil && !os.IsNotExist(err) {
-			fmt.Printf("Error checking if config file exists: %s\n", err.Error())
+			utils.StdOutError("Error checking if config file exists: %s\n", err.Error())
 			os.Exit(1)
 		}
 		viper.SetConfigFile(configPath)
@@ -75,15 +77,15 @@ func initConfig() {
 	_ = viper.SafeWriteConfig()
 	// bind token flag to refresh token config, overriding incase token is supplied
 	if err := viper.BindPFlag(configs.FirebaseRefreshTokenViperConfigKey, rootCmd.Flags().Lookup("token")); err != nil {
-		fmt.Printf("Error bind token flag: %s\n", err.Error())
+		utils.StdOutError("Error bind token flag: %s\n", err.Error())
 		os.Exit(1)
 	}
 	if err := viper.BindPFlag("project", rootCmd.Flags().Lookup("project")); err != nil {
-		fmt.Printf("Error bind project flag: %s\n", err.Error())
+		utils.StdOutError("Error bind project flag: %s\n", err.Error())
 		os.Exit(1)
 	}
 	if err := viper.ReadInConfig(); err != nil {
-		fmt.Printf("Error reading configs: %s\n", err.Error())
+		utils.StdOutError("Error reading configs: %s\n", err.Error())
 		os.Exit(1)
 	}
 }