Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: add version checking to CLI #2643

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 18 commits into from
Jun 29, 2022
Merged

feat: add version checking to CLI #2643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fe44291
feat: add version checking to CLI
sreya Jun 24, 2022
a9b4796
stuff
sreya Jun 24, 2022
19224b0
add more plumbing
sreya Jun 24, 2022
ff7d39e
remove some test code
sreya Jun 24, 2022
aa1ee2f
remove unnecessary type cast
sreya Jun 24, 2022
2b52169
prevent duplicates
sreya Jun 24, 2022
5435418
make gen
sreya Jun 24, 2022
9a9bae1
use semver
sreya Jun 24, 2022
cc6baed
Revert "use semver"
sreya Jun 24, 2022
6e8c3c0
use install script link
sreya Jun 24, 2022
fc3fbb5
Merge branch 'main' into jon/version
sreya Jun 27, 2022
67966e7
some merge woes
sreya Jun 27, 2022
d855172
some stuff
sreya Jun 27, 2022
54cb664
more stuff
sreya Jun 28, 2022
51301d9
fix versions
sreya Jun 28, 2022
636d5db
remove race condition
sreya Jun 28, 2022
d36e134
make gen
sreya Jun 28, 2022
b07de24
pr comments
sreya Jun 29, 2022
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
Prev Previous commit
Next Next commit
remove some test code
  • Loading branch information
@sreya
sreya committed Jun 24, 2022
commit ff7d39e5cfc0ee23d0d0bceed5a45b6b248b1c9c
2 changes: 1 addition & 1 deletion buildinfo/buildinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func Version() string {
version += revision
}
})
return "v1.5.0"
return version
}

// VersionsMatch compares the two versions. It assumes the versions match if
Expand Down
22 changes: 11 additions & 11 deletions cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const (

var (
errUnauthenticated = xerrors.New(notLoggedInMessage)
varNoVersionCheck = false
varSuppressVersion = false
)

func init() {
Expand All @@ -66,7 +66,7 @@ func Root() *cobra.Command {
Long: `Coder — A tool for provisioning self-hosted development environments.
`,
PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
if varNoVersionCheck {
if varSuppressVersion {
return nil
}

Expand Down Expand Up @@ -121,7 +121,7 @@ func Root() *cobra.Command {

cmd.PersistentFlags().String(varURL, "", "Specify the URL to your deployment.")
cmd.PersistentFlags().String(varToken, "", "Specify an authentication token.")
cliflag.BoolVarP(cmd.PersistentFlags(), &varNoVersionCheck, "no-version-warning", "", envNoVersionCheck, false, "Suppress warning when client and server versions do not match.")
cliflag.BoolVarP(cmd.PersistentFlags(), &varSuppressVersion, "no-version-warning", "", envNoVersionCheck, false, "Suppress warning when client and server versions do not match.")
cliflag.String(cmd.PersistentFlags(), varAgentToken, "", "CODER_AGENT_TOKEN", "", "Specify an agent authentication token.")
_ = cmd.PersistentFlags().MarkHidden(varAgentToken)
cliflag.String(cmd.PersistentFlags(), varAgentURL, "", "CODER_AGENT_URL", "", "Specify the URL for an agent to access your deployment.")
Expand Down Expand Up @@ -364,16 +364,16 @@ func checkVersions(cmd *cobra.Command, client *codersdk.Client) error {
return xerrors.Errorf("build info: %w", err)
}

fmtWarningText := `client/server versions do not match
client version: %s
server version: %s
download the appropriate version from https://github.com/coder/coder/releases/tag/%s
`

if !buildinfo.VersionsMatch(clientVersion, info.Version) {
warn := cliui.Styles.Warn.Copy().Align(lipgloss.Left)
_, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render("client/server versions do not match"))
fmt.Println()
_, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render("client version: %s"), clientVersion)
fmt.Println()
_, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render("server version: %s"), info.Version)
fmt.Println()
_, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render("download the appropriate version from https://github.com/coder/coder/releases/tag/%s"), info.TrimmedVersion())
fmt.Println()
_, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render(fmtWarningText), clientVersion, info.Version, info.TrimmedVersion())
_, _ = fmt.Fprintln(cmd.OutOrStdout())
}

return nil
Expand Down