diff --git a/cli/logout_test.go b/cli/logout_test.go index 62c93c2d6f81b..9e7e95c68f211 100644 --- a/cli/logout_test.go +++ b/cli/logout_test.go @@ -1,6 +1,7 @@ package cli_test import ( + "fmt" "os" "runtime" "testing" @@ -89,10 +90,14 @@ func TestLogout(t *testing.T) { logout.Stdin = pty.Input() logout.Stdout = pty.Output() + executable, err := os.Executable() + require.NoError(t, err) + require.NotEqual(t, "", executable) + go func() { defer close(logoutChan) - err := logout.Run() - assert.ErrorContains(t, err, "You are not logged in. Try logging in using 'coder login '.") + err = logout.Run() + assert.Contains(t, err.Error(), fmt.Sprintf("Try logging in using '%s login '.", executable)) }() <-logoutChan diff --git a/cli/root.go b/cli/root.go index 1dba212316c74..8fec1a945b0b3 100644 --- a/cli/root.go +++ b/cli/root.go @@ -72,7 +72,7 @@ const ( varDisableDirect = "disable-direct-connections" varDisableNetworkTelemetry = "disable-network-telemetry" - notLoggedInMessage = "You are not logged in. Try logging in using 'coder login '." + notLoggedInMessage = "You are not logged in. Try logging in using '%s login '." envNoVersionCheck = "CODER_NO_VERSION_WARNING" envNoFeatureWarning = "CODER_NO_FEATURE_WARNING" @@ -534,7 +534,11 @@ func (r *RootCmd) InitClient(client *codersdk.Client) serpent.MiddlewareFunc { rawURL, err := conf.URL().Read() // If the configuration files are absent, the user is logged out if os.IsNotExist(err) { - return xerrors.New(notLoggedInMessage) + binPath, err := os.Executable() + if err != nil { + binPath = "coder" + } + return xerrors.Errorf(notLoggedInMessage, binPath) } if err != nil { return err diff --git a/cli/userlist_test.go b/cli/userlist_test.go index 1a4409bb898ac..2681f0d2a462e 100644 --- a/cli/userlist_test.go +++ b/cli/userlist_test.go @@ -4,6 +4,8 @@ import ( "bytes" "context" "encoding/json" + "fmt" + "os" "testing" "github.com/stretchr/testify/assert" @@ -69,9 +71,12 @@ func TestUserList(t *testing.T) { t.Run("NoURLFileErrorHasHelperText", func(t *testing.T) { t.Parallel() + executable, err := os.Executable() + require.NoError(t, err) + inv, _ := clitest.New(t, "users", "list") - err := inv.Run() - require.Contains(t, err.Error(), "Try logging in using 'coder login '.") + err = inv.Run() + require.Contains(t, err.Error(), fmt.Sprintf("Try logging in using '%s login '.", executable)) }) t.Run("SessionAuthErrorHasHelperText", func(t *testing.T) { t.Parallel()