selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: output askpass to stderr (#7034) 

This fixes askpass not outputting a prompt.
This commit is contained in:
Kyle Carberry 2023-04-06 11:32:43 -05:00 committed by GitHub
parent 5bd02917ec
commit 3ff2ae1b1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/gitaskpass.go
View File

@ -51,9 +51,9 @@ func (r *RootCmd) gitAskpass() *clibase.Cmd {
}
if token.URL != "" {
if err := openURL(inv, token.URL); err == nil {
cliui.Infof(inv.Stdout, "Your browser has been opened to authenticate with Git:\n\n\t%s\n\n", token.URL)
cliui.Infof(inv.Stderr, "Your browser has been opened to authenticate with Git:\n\n\t%s\n\n", token.URL)
} else {
cliui.Infof(inv.Stdout, "Open the following URL to authenticate with Git:\n\n\t%s\n\n", token.URL)
cliui.Infof(inv.Stderr, "Open the following URL to authenticate with Git:\n\n\t%s\n\n", token.URL)
}
for r := retry.New(250*time.Millisecond, 10*time.Second); r.Wait(ctx); {
@ -61,7 +61,7 @@ func (r *RootCmd) gitAskpass() *clibase.Cmd {
if err != nil {
continue
}
cliui.Infof(inv.Stdout, "You've been authenticated with Git!\n")
cliui.Infof(inv.Stderr, "You've been authenticated with Git!\n")
break
}
}

9
cli/gitaskpass_test.go
View File

@ -86,17 +86,20 @@ func TestGitAskpass(t *testing.T) {
inv, _ := clitest.New(t, "--agent-url", url, "--no-open", "Username for 'https://github.com':")
inv.Environ.Set("GIT_PREFIX", "/")
pty := ptytest.New(t)
inv.Stdout = pty.Output()
stdout := ptytest.New(t)
inv.Stdout = stdout.Output()
stderr := ptytest.New(t)
inv.Stderr = stderr.Output()
go func() {
err := inv.Run()
assert.NoError(t, err)
}()
<-poll
stderr.ExpectMatch("Open the following URL to authenticate")
resp.Store(&agentsdk.GitAuthResponse{
Username: "username",
Password: "password",
})
pty.ExpectMatch("username")
stdout.ExpectMatch("username")
})
}