style: add/remove logging

Author: dnitsch

cmd/root.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/dnitsch/aws-cli-auth/internal/config"
+	"github.com/dnitsch/aws-cli-auth/internal/util"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -14,6 +15,7 @@ var (
 	cfgFile            string
 	storeInProfile     bool
 	killHangingProcess bool
+	verbose            bool
 	rootCmd            = &cobra.Command{
 		Use:   "aws-cli-auth",
 		Short: "CLI tool for retrieving AWS temporary credentials",
@@ -25,7 +27,7 @@ Stores them under the $HOME/.aws/credentials file under a specified path or retu
 
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Errorf(err.Error())
+		util.Exit(err)
 	}
 }
 
@@ -34,7 +36,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&role, "role", "r", "", "Set the role you want to assume when SAML or OIDC process completes")
 	rootCmd.PersistentFlags().StringVarP(&cfgSectionName, "cfg-section", "", "", "config section name in the yaml config file")
 	rootCmd.PersistentFlags().BoolVarP(&storeInProfile, "store-profile", "s", false, "By default the credentials are returned to stdout to be used by the credential_process. Set this flag to instead store the credentials under a named profile section")
-	// rootCmd.PersistentFlags().BoolVarP(&killHangingProcess, "kill-rod", "k", false, "If aws-cli-auth exited improprely in a previous run there is a chance that there could be hanging processes left over - this will clean them up forcefully")
+	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Verbose output")
 }
 
 func initConfig() {
@@ -54,7 +56,10 @@ func initConfig() {
 
 	viper.AutomaticEnv()
 	viper.WriteConfig()
+
+	util.IsTraceEnabled = verbose
+
 	if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
+		util.Traceln("Using config file:", viper.ConfigFileUsed())
 	}
 }

internal/auth/saml.go

@@ -1,9 +1,7 @@
 package auth
 
 import (
-	"fmt"
 	"os/user"
-	"runtime"
 
 	"github.com/dnitsch/aws-cli-auth/internal/config"
 	"github.com/dnitsch/aws-cli-auth/internal/util"
@@ -20,9 +18,6 @@ func GetSamlCreds(conf config.SamlConfig) {
 	var awsCreds *util.AWSCredentials
 	var err error
 
-	os := runtime.GOOS
-	util.Writeln("Is OS: %s\nAnd conf.BaseConfig.StoreInProfile: %v", os, conf.BaseConfig.StoreInProfile)
-
 	// Try to reuse stored credential in secret
 	if !conf.BaseConfig.StoreInProfile {
 		awsCreds, err = util.AWSCredential(conf.BaseConfig.Role)
@@ -43,7 +38,7 @@ func GetSamlCreds(conf config.SamlConfig) {
 
 		awsCreds, err = LoginStsSaml(t, roleObj)
 		if err != nil {
-			fmt.Printf("%v", err)
+			util.Writeln("%v", err)
 			util.Exit(err)
 		}
 

internal/util/helper.go

@@ -31,7 +31,7 @@ func SetCredentials(creds *AWSCredentials, config config.SamlConfig) {
 
 	if config.BaseConfig.StoreInProfile {
 		if err := storeCredentialsInProfile(*creds, config.BaseConfig.CfgSectionName); err != nil {
-			fmt.Printf("Error: %s", err.Error())
+			Traceln("Error: %s", err.Error())
 		}
 		return
 	}
@@ -54,8 +54,8 @@ func storeCredentialsInProfile(creds AWSCredentials, configSection string) error
 
 	cfg, err := ini.Load(awsConfPath)
 	if err != nil {
-		fmt.Printf("Fail to read file: %v", err)
-		os.Exit(1)
+		Writeln("Fail to read file: %v", err)
+		Exit(err)
 	}
 	cfg.Section(configSection).Key("aws_access_key_id").SetValue(creds.AWSAccessKey)
 	cfg.Section(configSection).Key("aws_secret_access_key").SetValue(creds.AWSSecretKey)
@@ -88,4 +88,3 @@ func GetWebIdTokenFileContents() (string, error) {
 	}
 	return string(content), nil
 }
-

internal/web/web.go

@@ -105,7 +105,7 @@ func checkRodProcess() error {
 		}
 	}
 	for _, pid := range pids {
-		fmt.Printf("Process to be killed as part of clean up: %d", pid)
+		util.Traceln("Process to be killed as part of clean up: %d", pid)
 		if proc, _ := os.FindProcess(pid); proc != nil {
 			proc.Kill()
 		}