Commit7fcfe98

authored

fix: improve API version mismatch error and show after login (#206)

1 parentf492f2d commit7fcfe98Copy full SHA for 7fcfe98

File tree

+21

-11

lines changed

+21

-11

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`// APIVersion parses the coder-version http header from an authenticated request.`
`9`	`9`	`func (cClient)APIVersion(ctx context.Context) (string,error) {`
`10`	`10`	`constcoderVersionHeaderKey="coder-version"`
`11`		`-resp,err:=c.request(ctx,http.MethodGet,"/api/private/users/"+Me,nil)`
	`11`	`+resp,err:=c.request(ctx,http.MethodGet,"/api",nil)`
`12`	`12`	`iferr!=nil {`
`13`	`13`	`return"",err`
`14`	`14`	`}`

Lines changed: 12 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ func newClient(ctx context.Context) (*coder.Client, error) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`apiVersion,err:=c.APIVersion(ctx)`
	`56`	`+ifapiVersion!=""&&!version.VersionsMatch(apiVersion) {`
	`57`	`+logVersionMismatchError(apiVersion)`
	`58`	`+}`
`56`	`59`	`iferr!=nil {`
`57`	`60`	`varhe*coder.HTTPError`
`58`	`61`	`ifxerrors.As(err,&he) {`
`@@ -63,14 +66,14 @@ func newClient(ctx context.Context) (*coder.Client, error) {`
`63`	`66`	`returnnil,err`
`64`	`67`	`}`
`65`	`68`
`66`		`-if!version.VersionsMatch(apiVersion) {`
`67`		`-clog.LogWarn(`
`68`		`-"version mismatch detected",`
`69`		`-fmt.Sprintf("coder-cli version: %s",version.Version),`
`70`		`-fmt.Sprintf("Coder API version: %s",apiVersion),clog.BlankLine,`
`71`		`-clog.Tipf("download the appropriate version here: https://github.com/cdr/coder-cli/releases"),`
`72`		`-)`
`73`		`-}`
`74`		`-`
`75`	`69`	`returnc,nil`
`76`	`70`	`}`
	`71`	`+`
	`72`	`+funclogVersionMismatchError(apiVersionstring) {`
	`73`	`+clog.LogWarn(`
	`74`	`+"version mismatch detected",`
	`75`	`+fmt.Sprintf("Coder CLI version: %s",version.Version),`
	`76`	`+fmt.Sprintf("Coder API version: %s",apiVersion),clog.BlankLine,`
	`77`	`+clog.Tipf("download the appropriate version here: https://github.com/cdr/coder-cli/releases"),`
	`78`	`+)`
	`79`	`+}`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"cdr.dev/coder-cli/coder-sdk"`
`12`	`12`	`"cdr.dev/coder-cli/internal/config"`
`13`	`13`	`"cdr.dev/coder-cli/internal/loginsrv"`
	`14`	`+"cdr.dev/coder-cli/internal/version"`
`14`	`15`	`"cdr.dev/coder-cli/pkg/clog"`
`15`	`16`	`"github.com/pkg/browser"`
`16`	`17`	`"github.com/spf13/cobra"`
`@@ -64,7 +65,13 @@ func newLocalListener() (net.Listener, error) {`
`64`	`65`	`// Not using the SDK as we want to verify the url/token pair before storing the config files.`
`65`	`66`	`funcpingAPI(ctx context.Context,envURL*url.URL,tokenstring)error {`
`66`	`67`	`client:=&coder.Client{BaseURL:envURL,Token:token}`
`67`		`-if_,err:=client.Me(ctx);err!=nil {`
	`68`	`+ifapiVersion,err:=client.APIVersion(ctx);err==nil {`
	`69`	`+ifapiVersion!=""&&!version.VersionsMatch(apiVersion) {`
	`70`	`+logVersionMismatchError(apiVersion)`
	`71`	`+}`
	`72`	`+}`
	`73`	`+_,err:=client.Me(ctx)`
	`74`	`+iferr!=nil {`
`68`	`75`	`returnxerrors.Errorf("call api: %w",err)`
`69`	`76`	`}`
`70`	`77`	`returnnil`

Comments

(0)