Commita910e93

authored

chore: improve error message around gitaskpass failures (#9407)

1 parent2399063 commita910e93Copy full SHA for a910e93

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,13 @@ func (r RootCmd) gitAskpass() clibase.Cmd {`
`44`	`44`	`iferrors.As(err,&apiError)&&apiError.StatusCode()==http.StatusNotFound {`
`45`	`45`	`// This prevents the "Run 'coder --help' for usage"`
`46`	`46`	`// message from occurring.`
`47`		`-cliui.Errorf(inv.Stderr,"%s\n",apiError.Message)`
	`47`	`+lines:= []string{apiError.Message}`
	`48`	`+ifapiError.Detail!="" {`
	`49`	`+lines=append(lines,apiError.Detail)`
	`50`	`+}`
	`51`	`+cliui.Warn(inv.Stderr,"Coder was unable to handle this git request. The default git behavior will be used instead.",`
	`52`	`+lines...,`
	`53`	`+)`
`48`	`54`	`returncliui.Canceled`
`49`	`55`	`}`
`50`	`56`	`returnxerrors.Errorf("get git token: %w",err)`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1996,8 +1996,17 @@ func (api API) workspaceAgentsGitAuth(rw http.ResponseWriter, r http.Request)`
`1996`	`1996`	`gitAuthConfig=gitAuth`
`1997`	`1997`	`}`
`1998`	`1998`	`ifgitAuthConfig==nil {`
	`1999`	`+detail:="No git providers are configured."`
	`2000`	`+iflen(api.GitAuthConfigs)>0 {`
	`2001`	`+regexURLs:=make([]string,0,len(api.GitAuthConfigs))`
	`2002`	`+for_,gitAuth:=rangeapi.GitAuthConfigs {`
	`2003`	`+regexURLs=append(regexURLs,fmt.Sprintf("%s=%q",gitAuth.ID,gitAuth.Regex.String()))`
	`2004`	`+}`
	`2005`	`+detail=fmt.Sprintf("The configured git provider have regex filters that do not match the git url. Provider url regexs: %s",strings.Join(regexURLs,","))`
	`2006`	`+}`
`1999`	`2007`	`httpapi.Write(ctx,rw,http.StatusNotFound, codersdk.Response{`
`2000`		`-Message:fmt.Sprintf("No git provider found for URL %q",gitURL),`
	`2008`	`+Message:fmt.Sprintf("No matching git provider found in Coder for the url %q.",gitURL),`
	`2009`	`+Detail:detail,`
`2001`	`2010`	`})`
`2002`	`2011`	`return`
`2003`	`2012`	`}`

Comments

(0)