Commit578b9ff

authored

fix: enrich thenotLoggedInMessage error message with the full path to the coder (#17715)

---------Signed-off-by: Callum Styan <callumstyan@gmail.com>

1 parent15bd7a3 commit578b9ffCopy full SHA for 578b9ff

File tree

+20

-6

lines changed

+20

-6

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package cli_test`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+"fmt"`
`4`	`5`	`"os"`
`5`	`6`	`"runtime"`
`6`	`7`	`"testing"`
`@@ -89,10 +90,14 @@ func TestLogout(t *testing.T) {`
`89`	`90`	`logout.Stdin=pty.Input()`
`90`	`91`	`logout.Stdout=pty.Output()`
`91`	`92`
	`93`	`+executable,err:=os.Executable()`
	`94`	`+require.NoError(t,err)`
	`95`	`+require.NotEqual(t,"",executable)`
	`96`	`+`
`92`	`97`	`gofunc() {`
`93`	`98`	`deferclose(logoutChan)`
`94`		`-err:=logout.Run()`
`95`		`-assert.ErrorContains(t,err,"You are not logged in.Try logging in using 'coder login <url>'.")`
	`99`	`+err=logout.Run()`
	`100`	`+assert.Contains(t,err.Error(),fmt.Sprintf("Try logging in using '%s login <url>'.",executable))`
`96`	`101`	`}()`
`97`	`102`
`98`	`103`	`<-logoutChan`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ const (`
`72`	`72`	`varDisableDirect="disable-direct-connections"`
`73`	`73`	`varDisableNetworkTelemetry="disable-network-telemetry"`
`74`	`74`
`75`		`-notLoggedInMessage="You are not logged in. Try logging in using 'coder login <url>'."`
	`75`	`+notLoggedInMessage="You are not logged in. Try logging in using '%s login <url>'."`
`76`	`76`
`77`	`77`	`envNoVersionCheck="CODER_NO_VERSION_WARNING"`
`78`	`78`	`envNoFeatureWarning="CODER_NO_FEATURE_WARNING"`
`@@ -534,7 +534,11 @@ func (r RootCmd) InitClient(client codersdk.Client) serpent.MiddlewareFunc {`
`534`	`534`	`rawURL,err:=conf.URL().Read()`
`535`	`535`	`// If the configuration files are absent, the user is logged out`
`536`	`536`	`ifos.IsNotExist(err) {`
`537`		`-returnxerrors.New(notLoggedInMessage)`
	`537`	`+binPath,err:=os.Executable()`
	`538`	`+iferr!=nil {`
	`539`	`+binPath="coder"`
	`540`	`+}`
	`541`	`+returnxerrors.Errorf(notLoggedInMessage,binPath)`
`538`	`542`	`}`
`539`	`543`	`iferr!=nil {`
`540`	`544`	`returnerr`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"context"`
`6`	`6`	`"encoding/json"`
	`7`	`+"fmt"`
	`8`	`+"os"`
`7`	`9`	`"testing"`
`8`	`10`
`9`	`11`	`"github.com/stretchr/testify/assert"`
`@@ -69,9 +71,12 @@ func TestUserList(t *testing.T) {`
`69`	`71`	`t.Run("NoURLFileErrorHasHelperText",func(t*testing.T) {`
`70`	`72`	`t.Parallel()`
`71`	`73`
	`74`	`+executable,err:=os.Executable()`
	`75`	`+require.NoError(t,err)`
	`76`	`+`
`72`	`77`	`inv,_:=clitest.New(t,"users","list")`
`73`		`-err:=inv.Run()`
`74`		`-require.Contains(t,err.Error(),"Try logging in using 'coder login <url>'.")`
	`78`	`+err=inv.Run()`
	`79`	`+require.Contains(t,err.Error(),fmt.Sprintf("Try logging in using '%s login <url>'.",executable))`
`75`	`80`	`})`
`76`	`81`	`t.Run("SessionAuthErrorHasHelperText",func(t*testing.T) {`
`77`	`82`	`t.Parallel()`

Comments

(0)