Skip to content

fix: don't check buildinfo or entitlements in agent #3956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2022
Merged

fix: don't check buildinfo or entitlements in agent #3956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: don't check buildinfo or entitlements in agent
  • Loading branch information
@deansheather
deansheather committed Sep 8, 2022
commit 2fd9d6a43f9bb60e5a8d730c67d7ed5f5b3067bb
46 changes: 35 additions & 11 deletions cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cli

import (
"context"
"flag"
"fmt"
"net/url"
Expand Down Expand Up @@ -110,10 +111,17 @@ func Root(subcommands []*cobra.Command) *cobra.Command {
return
}

// Login handles checking the versions itself since it
// has a handle to an unauthenticated client.
// Server is skipped for obvious reasons.
if cmd.Name() == "login" || cmd.Name() == "server" || cmd.Name() == "gitssh" {
// login handles checking the versions itself since it has a handle
// to an unauthenticated client.
//
// server is skipped for obvious reasons.
//
// agent is skipped because these checks use the global coder config
// and not the agent URL and token from the environment.
//
// gitssh is skipped because it's usually not called by users
// directly.
if cmd.Name() == "login" || cmd.Name() == "server" || cmd.Name() == "agent" || cmd.Name() == "gitssh" {
return
}

Expand All @@ -123,6 +131,7 @@ func Root(subcommands []*cobra.Command) *cobra.Command {
if err != nil {
return
}

err = checkVersions(cmd, client)
if err != nil {
// Just log the error here. We never want to fail a command
Expand All @@ -131,7 +140,14 @@ func Root(subcommands []*cobra.Command) *cobra.Command {
cliui.Styles.Warn.Render("check versions error: %s"), err)
_, _ = fmt.Fprintln(cmd.ErrOrStderr())
}
checkWarnings(cmd, client)

err = checkWarnings(cmd, client)
if err != nil {
// Same as above
_, _ = fmt.Fprintf(cmd.ErrOrStderr(),
cliui.Styles.Warn.Render("check entitlement warnings error: %s"), err)
_, _ = fmt.Fprintln(cmd.ErrOrStderr())
}
},
Example: formatExamples(
example{
Expand Down Expand Up @@ -468,9 +484,11 @@ func checkVersions(cmd *cobra.Command, client *codersdk.Client) error {
return nil
}

clientVersion := buildinfo.Version()
ctx, cancel := context.WithTimeout(cmd.Context(), 10*time.Second)
defer cancel()

info, err := client.BuildInfo(cmd.Context())
clientVersion := buildinfo.Version()
info, err := client.BuildInfo(ctx)
// Avoid printing errors that are connection-related.
if codersdk.IsConnectionErr(err) {
return nil
Expand All @@ -494,15 +512,21 @@ download the server version with: 'curl -L https://coder.com/install.sh | sh -s
return nil
}

func checkWarnings(cmd *cobra.Command, client *codersdk.Client) {
func checkWarnings(cmd *cobra.Command, client *codersdk.Client) error {
if cliflag.IsSetBool(cmd, varNoFeatureWarning) {
return
return nil
}
entitlements, err := client.Entitlements(cmd.Context())

ctx, cancel := context.WithTimeout(cmd.Context(), 10*time.Second)
defer cancel()

entitlements, err := client.Entitlements(ctx)
if err != nil {
return
return xerrors.Errorf("get entitlements to show warnings: %w", err)
}
for _, w := range entitlements.Warnings {
_, _ = fmt.Fprintln(cmd.ErrOrStderr(), cliui.Styles.Warn.Render(w))
}

return nil
}