Show simple warning message from the message queue.

Author: mitchell-as

cmd/state-svc/internal/resolver/resolver.go

@@ -24,6 +24,7 @@ import (
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/graph"
+	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
 	configMediator "github.com/ActiveState/cli/internal/mediators/config"
 	msgs "github.com/ActiveState/cli/internal/messages"
@@ -90,7 +91,7 @@ func New(cfg *config.Instance, an *sync.Client, auth *authentication.Auth) (*Res
 				var invalidTokenErr *authentication.ErrInvalidToken
 				if errors.As(err, &invalidTokenErr) {
 					logging.Debug("Queuing invalid API token error")
-					msg.Queue(msgs.TopicErrorAuthToken, "Invalid API token")
+					msg.Queue(msgs.TopicErrorAuthToken, locale.Tl("err_invalid_token_try_again", "Invalid API token. Please check your API token and try again."))
 				} else {
 					logging.Warning("Could not sync authenticated state: %s", err.Error())
 				}

cmd/state/internal/cmdtree/exechandlers/messages/messenger.go

@@ -62,17 +62,7 @@ func (m *Messenger) OnExecStart(_ *captain.Command, _ []string) error {
 }
 
 func (m *Messenger) handleErrorMessages(message *graph.Message) {
-	switch message.Topic {
-	case msgs.TopicErrorAuth:
-		logging.Error("State Service reported an authentication error: %s", message.Message)
-		err := locale.NewError("err_svc_message", "The State Service reported an authentication error: {{.V0}}", message.Message)
-		m.out.Error(err)
-	case msgs.TopicErrorAuthToken:
-		logging.Error("State Service reported an authentication token error: %s", message.Message)
-		err := locale.NewError("err_svc_invalid_token", "", message.Message)
-		m.out.Error(err)
-	default:
-		logging.Error("State Service reported an unknown error: %s", message.Topic)
-		m.out.Error(locale.NewError("err_svc_unknown_message", "The State Service reported an unknown error: {{.V0}}", message.Message))
-	}
+	logging.Error("State Service reported a %s error: %s", message.Topic, message.Message)
+	err := locale.NewError("err_svc_message", "[WARNING]Warning:[/RESET] {{.V0}}", message.Message)
+	m.out.Error(err)
 }

internal/locale/locales/en-us.yaml

@@ -933,7 +933,7 @@ err_read_projectfile:
 err_auth_fail_totp:
   other: A two-factor authentication code is required.
 err_invalid_token:
-  other: Invalid API token
+  other: Invalid API token.
 err_invalid_credentials:
   other: Invalid credentials
 cve_title:
@@ -1593,7 +1593,3 @@ config_set_help:
   other: "To SET the value for a specific config key run '[ACTIONABLE]state config set <key> <value>[/RESET]'"
 err_clean_in_use:
   other: "Could not clean your cache as you appear to have a runtime in use. Please stop any running State Tool processes and project runtime processes and try again."
-err_svc_invalid_token:
-  other: |
-    The State Service reported an invalid API token error: {{.V0}}
-    Please check your API token and try again.

test/integration/auth_int_test.go

@@ -120,8 +120,7 @@ func (suite *AuthIntegrationTestSuite) TestAuth_InvalidToken() {
 
 	cp := ts.SpawnWithOpts(e2e.OptArgs("--version"), e2e.OptAppendEnv(constants.APIKeyEnvVarName+"=bad-token"))
 	// Message is displayed
-	cp.Expect("The State Service reported an invalid API token error: Invalid API token")
-	cp.Expect("Please check your API token and try again.")
+	cp.Expect("Warning: Invalid API token")
 	// The version information is still displayed
 	cp.Expect("ActiveState CLI")
 	cp.Expect("Version")