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

cmoog · web-flow · commit 7fcfe98a6868 · 2020-12-17T15:54:01.000-06:00
diff --git a/coder-sdk/version.go b/coder-sdk/version.go
@@ -8,7 +8,7 @@ import (
 // APIVersion parses the coder-version http header from an authenticated request.
 func (c Client) APIVersion(ctx context.Context) (string, error) {
 	const coderVersionHeaderKey = "coder-version"
-	resp, err := c.request(ctx, http.MethodGet, "/api/private/users/"+Me, nil)
+	resp, err := c.request(ctx, http.MethodGet, "/api", nil)
 	if err != nil {
 		return "", err
 	}
diff --git a/internal/cmd/auth.go b/internal/cmd/auth.go
@@ -53,6 +53,9 @@ func newClient(ctx context.Context) (*coder.Client, error) {
 	}
 
 	apiVersion, err := c.APIVersion(ctx)
+	if apiVersion != "" && !version.VersionsMatch(apiVersion) {
+		logVersionMismatchError(apiVersion)
+	}
 	if err != nil {
 		var he *coder.HTTPError
 		if xerrors.As(err, &he) {
@@ -63,14 +66,14 @@ func newClient(ctx context.Context) (*coder.Client, error) {
 		return nil, err
 	}
 
-	if !version.VersionsMatch(apiVersion) {
-		clog.LogWarn(
-			"version mismatch detected",
-			fmt.Sprintf("coder-cli version: %s", version.Version),
-			fmt.Sprintf("Coder API version: %s", apiVersion), clog.BlankLine,
-			clog.Tipf("download the appropriate version here: https://github.com/cdr/coder-cli/releases"),
-		)
-	}
-
 	return c, nil
 }
+
+func logVersionMismatchError(apiVersion string) {
+	clog.LogWarn(
+		"version mismatch detected",
+		fmt.Sprintf("Coder CLI version: %s", version.Version),
+		fmt.Sprintf("Coder API version: %s", apiVersion), clog.BlankLine,
+		clog.Tipf("download the appropriate version here: https://github.com/cdr/coder-cli/releases"),
+	)
+}
diff --git a/internal/cmd/login.go b/internal/cmd/login.go
@@ -11,6 +11,7 @@ import (
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/config"
 	"cdr.dev/coder-cli/internal/loginsrv"
+	"cdr.dev/coder-cli/internal/version"
 	"cdr.dev/coder-cli/pkg/clog"
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
@@ -64,7 +65,13 @@ func newLocalListener() (net.Listener, error) {
 // Not using the SDK as we want to verify the url/token pair before storing the config files.
 func pingAPI(ctx context.Context, envURL *url.URL, token string) error {
 	client := &coder.Client{BaseURL: envURL, Token: token}
-	if _, err := client.Me(ctx); err != nil {
+	if apiVersion, err := client.APIVersion(ctx); err == nil {
+		if apiVersion != "" && !version.VersionsMatch(apiVersion) {
+			logVersionMismatchError(apiVersion)
+		}
+	}
+	_, err := client.Me(ctx)
+	if err != nil {
 		return xerrors.Errorf("call api: %w", err)
 	}
 	return nil

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 (c Client) APIVersion(ctx context.Context) (string, error) {`
`10`	`10`	`const coderVersionHeaderKey = "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`	`if err != nil {`
`13`	`13`	`return "", err`
`14`	`14`	`}`