@@ -22,7 +22,7 @@ import (
2222 "cdr.dev/coder-cli/pkg/clog"
2323 "golang.org/x/xerrors"
2424
25- "github.com/blang /semver/v4 "
25+ "github.com/Masterminds /semver/v3 "
2626 "github.com/manifoldco/promptui"
2727 "github.com/spf13/afero"
2828 "github.com/spf13/cobra"
@@ -116,15 +116,15 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLString string) er
116116 clog .LogInfo (fmt .Sprintf ("Coder instance at %q reports version %s" , coderURL .String (), desiredVersion .String ()))
117117 clog .LogInfo (fmt .Sprintf ("Current version of coder-cli is %s" , version .Version ))
118118
119- if currentVersion , err := semver .Make (u .versionF ()); err == nil {
119+ if currentVersion , err := semver .StrictNewVersion (u .versionF ()); err == nil {
120120 if desiredVersion .Compare (currentVersion ) == 0 {
121121 clog .LogInfo ("Up to date!" )
122122 return nil
123123 }
124124 }
125125
126126 if ! force {
127- label := fmt .Sprintf ("Update coder-cli to version %s" , desiredVersion . FinalizeVersion () )
127+ label := fmt .Sprintf ("Do you want to download version %s instead " , desiredVersion )
128128 if _ , err := u .confirmF (label ); err != nil {
129129 return clog .Fatal ("failed to confirm update" , clog .Tipf (`use "--force" to update without confirmation` ))
130130 }
@@ -188,7 +188,7 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLString string) er
188188 return clog .Fatal ("failed to update coder binary in-place" , clog .Causef (err .Error ()))
189189 }
190190
191- clog .LogSuccess ("Updated coder CLI to version " + desiredVersion .FinalizeVersion ())
191+ clog .LogSuccess ("Updated coder CLI to version " + desiredVersion .String ())
192192 return nil
193193}
194194
@@ -206,7 +206,18 @@ func makeDownloadURL(version *semver.Version, ostype, archtype string) string {
206206 default :
207207 ext = "zip"
208208 }
209- return fmt .Sprintf (template , version , ostype , archetype , ext )
209+ var b bytes.Buffer
210+ fmt .Fprintf (& b , "%d" , version .Major ())
211+ fmt .Fprint (& b , "." )
212+ fmt .Fprintf (& b , "%d" , version .Minor ())
213+ fmt .Fprint (& b , "." )
214+ fmt .Fprintf (& b , "%d" , version .Patch ())
215+ if version .Prerelease () != "" {
216+ fmt .Fprint (& b , "-" )
217+ fmt .Fprint (& b , version .Prerelease ())
218+ }
219+
220+ return fmt .Sprintf (template , b .String (), ostype , archtype , ext )
210221}
211222
212223func extractFromArchive (path string , archive []byte ) ([]byte , error ) {
@@ -295,22 +306,22 @@ func getCoderConfigURL() (*url.URL, error) {
295306
296307// XXX: coder.Client requires an API key, but we may not be logged into the coder instance for which we
297308// want to determine the version. We don't need an API key to sniff the version header.
298- func getAPIVersionUnauthed (client getter , baseURL url.URL ) (semver.Version , error ) {
309+ func getAPIVersionUnauthed (client getter , baseURL url.URL ) (* semver.Version , error ) {
299310 baseURL .Path = path .Join (baseURL .Path , "/api" )
300311 resp , err := client .Get (baseURL .String ())
301312 if err != nil {
302- return semver. Version {} , xerrors .Errorf ("get %s: %w" , baseURL .String (), err )
313+ return nil , xerrors .Errorf ("get %s: %w" , baseURL .String (), err )
303314 }
304315 defer resp .Body .Close ()
305316
306317 versionHdr := resp .Header .Get ("coder-version" )
307318 if versionHdr == "" {
308- return semver. Version {} , xerrors .Errorf ("URL %s response missing coder-version header" , baseURL .String ())
319+ return nil , xerrors .Errorf ("URL %s response missing coder-version header" , baseURL .String ())
309320 }
310321
311- version , err := semver .Parse (versionHdr )
322+ version , err := semver .StrictNewVersion (versionHdr )
312323 if err != nil {
313- return semver. Version {} , xerrors .Errorf ("parsing coder-version header: %w" , err )
324+ return nil , xerrors .Errorf ("parsing coder-version header: %w" , err )
314325 }
315326
316327 return version , nil
0 commit comments