fix: run error cmds

Author: dnitsch

Makefile

@@ -1,6 +1,6 @@
 OWNER := dnitsch
 NAME := aws-cli-auth
-VERSION := v0.8.1
+VERSION := v0.9.0
 REVISION := $(shell git rev-parse --short HEAD)
 
 LDFLAGS := -ldflags="-s -w -X \"github.com/dnitsch/aws-cli-auth/cmd.Version=$(VERSION)\" -X \"github.com/dnitsch/aws-cli-auth/cmd.Revision=$(REVISION)\" -extldflags -static"

cmd/clear.go

@@ -13,7 +13,7 @@ var (
 	clearCmd = &cobra.Command{
 		Use:   "clear-cache <flags>",
 		Short: "Clears any stored credentials in the OS secret store",
-		Run:   clear,
+		RunE:  clear,
 	}
 )
 
@@ -23,7 +23,7 @@ func init() {
 	rootCmd.AddCommand(clearCmd)
 }
 
-func clear(cmd *cobra.Command, args []string) {
+func clear(cmd *cobra.Command, args []string) error {
 	web := web.New()
 	secretStore := util.NewSecretStore("")
 
@@ -37,8 +37,8 @@ func clear(cmd *cobra.Command, args []string) {
 	secretStore.ClearAll()
 
 	if err := os.Remove(util.ConfigIniFile("")); err != nil {
-		util.Exit(err)
+		return err
 	}
 
-	util.CleanExit()
+	return nil
 }

cmd/root.go

@@ -27,6 +27,7 @@ func Execute() {
 	if err := rootCmd.Execute(); err != nil {
 		util.Exit(err)
 	}
+	util.CleanExit()
 }
 
 func init() {

cmd/saml.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/dnitsch/aws-cli-auth/internal/auth"
 	"github.com/dnitsch/aws-cli-auth/internal/config"
-	"github.com/dnitsch/aws-cli-auth/internal/util"
 	"github.com/spf13/cobra"
 )
 
@@ -20,7 +19,7 @@ var (
 		Use:   "saml <SAML ProviderUrl>",
 		Short: "Get AWS credentials and out to stdout",
 		Long:  `Get AWS credentials and out to stdout through your SAML provider authentication.`,
-		Run:   getSaml,
+		RunE:  getSaml,
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			if reloadBeforeTime != 0 && reloadBeforeTime > duration {
 				return fmt.Errorf("reload-before: %v, must be less than duration (-d): %v", reloadBeforeTime, duration)
@@ -42,7 +41,7 @@ func init() {
 	rootCmd.AddCommand(samlCmd)
 }
 
-func getSaml(cmd *cobra.Command, args []string) {
+func getSaml(cmd *cobra.Command, args []string) error {
 	conf := config.SamlConfig{
 		ProviderUrl:  providerUrl,
 		PrincipalArn: principalArn,
@@ -57,6 +56,8 @@ func getSaml(cmd *cobra.Command, args []string) {
 		},
 	}
 
-	auth.GetSamlCreds(conf)
-	util.CleanExit()
+	if err := auth.GetSamlCreds(conf); err != nil {
+		return err
+	}
+	return nil
 }

cmd/specific.go

@@ -18,7 +18,7 @@ var (
 		Long: `Initiates a specific crednetial provider [WEB_ID] as opposed to relying on the defaultCredentialChain provider.
 This is useful in CI situations where various authentication forms maybe present from AWS_ACCESS_KEY as env vars to metadata of the node.
 Returns the same JSON object as the call to the AWS cli for any of the sts AssumeRole* commands`,
-		Run: specific,
+		RunE: specific,
 	}
 )
 
@@ -27,28 +27,31 @@ func init() {
 	rootCmd.AddCommand(specificCmd)
 }
 
-func specific(cmd *cobra.Command, args []string) {
+func specific(cmd *cobra.Command, args []string) error {
 	var awsCreds *util.AWSCredentials
 	var err error
 	if method != "" {
 		switch method {
 		case "WEB_ID":
 			awsCreds, err = auth.LoginAwsWebToken(os.Getenv("USER")) // TODO: redo this getUser implementation
 			if err != nil {
-				util.Exit(err)
+				return err
 			}
 		default:
-			util.Exit(fmt.Errorf("Unsupported Method: %s", method))
+			return fmt.Errorf("unsupported Method: %s", method)
 		}
 	}
 	config := config.SamlConfig{BaseConfig: config.BaseConfig{StoreInProfile: storeInProfile}}
 
 	if role != "" {
 		awsCreds, err = auth.AssumeRoleWithCreds(awsCreds, os.Getenv("USER"), role)
 		if err != nil {
-			util.Exit(err)
+			return err
 		}
 	}
 
-	util.SetCredentials(awsCreds, config)
+	if err := util.SetCredentials(awsCreds, config); err != nil {
+		return err
+	}
+	return nil
 }

internal/auth/saml.go

@@ -9,7 +9,7 @@ import (
 )
 
 // GetSamlCreds
-func GetSamlCreds(conf config.SamlConfig) {
+func GetSamlCreds(conf config.SamlConfig) error {
 	if conf.BaseConfig.CfgSectionName == "" && conf.BaseConfig.StoreInProfile {
 		util.Writeln("Config-Section name must be provided if store-profile is enabled")
 		util.Exit(nil)
@@ -28,23 +28,24 @@ func GetSamlCreds(conf config.SamlConfig) {
 
 		t, err := webBrowser.GetSamlLogin(conf)
 		if err != nil {
-			util.Exit(err)
+			return err
 		}
 		user, err := user.Current()
 		if err != nil {
-			util.Exit(err)
+			return err
 		}
 
 		roleObj := &util.AWSRole{RoleARN: conf.BaseConfig.Role, PrincipalARN: conf.PrincipalArn, Name: util.SessionName(user.Username, config.SELF_NAME), Duration: conf.Duration}
 
 		awsCreds, err = LoginStsSaml(t, roleObj)
 		if err != nil {
-			util.Exit(err)
+			return err
 		}
 
 		awsCreds.Version = 1
 		secretStore.SaveAWSCredential(awsCreds)
 	}
 
 	util.SetCredentials(awsCreds, conf)
+	return nil
 }

internal/util/helper.go

@@ -43,16 +43,16 @@ func SessionName(username, self_name string) string {
 	return fmt.Sprintf("%s-%s", username, self_name)
 }
 
-func SetCredentials(creds *AWSCredentials, config config.SamlConfig) {
+func SetCredentials(creds *AWSCredentials, config config.SamlConfig) error {
 
 	if config.BaseConfig.StoreInProfile {
 		if err := storeCredentialsInProfile(*creds, config.BaseConfig.CfgSectionName); err != nil {
 			Traceln("Error: %s", err.Error())
-			Exit(err)
+			return err
 		}
-		return
+		return nil
 	}
-	returnStdOutAsJson(*creds)
+	return returnStdOutAsJson(*creds)
 }
 
 func storeCredentialsInProfile(creds AWSCredentials, configSection string) error {
@@ -82,15 +82,16 @@ func storeCredentialsInProfile(creds AWSCredentials, configSection string) error
 	return nil
 }
 
-func returnStdOutAsJson(creds AWSCredentials) {
+func returnStdOutAsJson(creds AWSCredentials) error {
 	creds.Version = 1
 
 	jsonBytes, err := json.Marshal(creds)
 	if err != nil {
 		Writeln("Unexpected AWS credential response")
-		Exit(err)
+		return err
 	}
 	fmt.Println(string(jsonBytes))
+	return nil
 }
 
 func GetWebIdTokenFileContents() (string, error) {