Merge pull request #261 from okta/process_credentials_output

Control stdio for process credentials output
okta · Jan 11, 2025 · e26279e · e26279e
2 parents ed51fe0 + ee05f32
commit e26279e
Show file tree

Hide file tree

Showing 13 changed files with 213 additions and 103 deletions.
diff --git a/cmd/root/debug/debug.go b/cmd/root/debug/debug.go
@@ -17,9 +17,6 @@
 package debug
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/spf13/cobra"
 
 	"github.com/okta/okta-aws-cli/internal/config"
@@ -31,13 +28,13 @@ func NewDebugCommand() *cobra.Command {
 		Use:   "debug",
 		Short: "Simple debug of okta.yaml and exit",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			config, err := config.EvaluateSettings()
+			config, err := config.NewEvaluatedConfig()
 			if err != nil {
 				return err
 			}
 			err = config.RunConfigChecks()
 			// NOTE: still print out the done message, even if there was an error it will get printed as well
-			fmt.Fprintf(os.Stderr, "debugging okta-aws-cli config $HOME/.okta/okta.yaml is complete\n")
+			config.Logger.Warn("debugging okta-aws-cli config $HOME/.okta/okta.yaml is complete\n")
 			if err != nil {
 				return err
 			}

diff --git a/cmd/root/m2m/m2m.go b/cmd/root/m2m/m2m.go
@@ -71,7 +71,7 @@ func NewM2MCommand() *cobra.Command {
 		Use:   "m2m",
 		Short: "Machine to machine / headless authorization",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			config, err := config.EvaluateSettings()
+			config, err := config.NewEvaluatedConfig()
 			if err != nil {
 				return err
 			}

diff --git a/cmd/root/profileslist/profiles-list.go b/cmd/root/profileslist/profiles-list.go
@@ -17,8 +17,6 @@
 package profileslist
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 
 	"github.com/okta/okta-aws-cli/internal/config"
@@ -30,20 +28,20 @@ func NewProfilesListCommand() *cobra.Command {
 		Use:   "list-profiles",
 		Short: "Lists profile names in ~/.okta/okta.yaml",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			config, err := config.EvaluateSettings()
+			config, err := config.NewEvaluatedConfig()
 			if err != nil {
 				return err
 			}
 
-			fmt.Println("Profiles:")
+			config.Logger.Info("Profiles:\n")
 
 			keys, err := config.ReadConfigProfileKeys()
 			if err != nil {
 				return err
 			}
 
 			for _, key := range keys {
-				fmt.Printf(" %s\n", key)
+				config.Logger.Info(" %s\n", key)
 			}
 
 			return nil

diff --git a/cmd/root/web/web.go b/cmd/root/web/web.go
@@ -27,6 +27,11 @@ import (
 	"github.com/okta/okta-aws-cli/internal/webssoauth"
 )
 
+const (
+	// InvalidGrant constant
+	InvalidGrant = "invalid_grant"
+)
+
 var (
 	flags = []cliFlag.Flag{
 		{
@@ -81,12 +86,12 @@ func NewWebCommand() *cobra.Command {
 		Use:   "web",
 		Short: "Human oriented authentication and device authorization",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cfg, err := config.EvaluateSettings()
+			cfg, err := config.NewEvaluatedConfig()
 			if err != nil {
 				return err
 			}
 
-			_, err = config.OktaConfig()
+			_, err = config.NewOktaYamlConfig()
 			if err != nil {
 				if _, pathError := err.(*fs.PathError); !pathError {
 					// Warn if okta.yaml exists and there is an error with it.
@@ -111,7 +116,7 @@ func NewWebCommand() *cobra.Command {
 				err = wsa.EstablishIAMCredentials()
 				apiErr, ok = err.(*okta.APIError)
 				if ok {
-					if apiErr.ErrorType == "invalid_grant" && webssoauth.RemoveCachedAccessToken() {
+					if apiErr.ErrorType == InvalidGrant && webssoauth.RemoveCachedAccessToken() {
 						webssoauth.ConsolePrint(cfg, "Cached access token appears to be stale, removing token and retrying device authorization ...\n\n")
 						continue
 					}
@@ -124,7 +129,7 @@ func NewWebCommand() *cobra.Command {
 			}
 
 			if err != nil {
-				if apiErr != nil && apiErr.ErrorType == "invalid_grant" {
+				if apiErr != nil && apiErr.ErrorType == InvalidGrant {
 					webssoauth.ConsolePrint(cfg, "Authentication failed after multiple attempts. Please log out of Okta in your browser and log back in to resolve the issue.\n")
 				}
 				return err