fix: cmd/update: do not use NewStrictVersion for user-provided version

johnstcn · web-flow · commit d7e206d286a6 · 2021-09-13T15:31:30.000+01:00
* fix: cmd/update: use `semver.NewVersion` instead of `semver.StrictNewVersion` as otherwise users must type the explicit trailing zeros e.g. coder update --version 1.21.0 instead of coder update --version 1.21.
* chore: cmd/update: add unit tests for getDesiredVersion
diff --git a/internal/cmd/update.go b/internal/cmd/update.go
@@ -258,7 +258,7 @@ func getDesiredVersion(httpClient getter, coderURLArg string, versionArg string)
 	}
 
 	if versionArg != "" {
-		desiredVersion, err = semver.StrictNewVersion(versionArg)
+		desiredVersion, err = semver.NewVersion(versionArg)
 		if err != nil {
 			return &semver.Version{}, xerrors.Errorf("parse desired version arg: %w", err)
 		}
diff --git a/internal/cmd/update_test.go b/internal/cmd/update_test.go
@@ -15,6 +15,7 @@ import (
 	"testing"
 
 	"cdr.dev/slog/sloggers/slogtest/assert"
+	"github.com/Masterminds/semver/v3"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/afero"
 	"golang.org/x/xerrors"
@@ -390,6 +391,38 @@ func Test_updater_run(t *testing.T) {
 	}
 }
 
+func Test_getDesiredVersion(t *testing.T) {
+	t.Parallel()
+
+	t.Run("invalid version specified by user", func(t *testing.T) {
+		t.Parallel()
+
+		expected := &semver.Version{}
+		actual, err := getDesiredVersion(nil, "", "not a valid version")
+		assert.ErrorContains(t, "error should be nil", err, "Invalid Semantic Version")
+		assert.Equal(t, "expected should equal actual", expected, actual)
+	})
+
+	t.Run("underspecified version from user", func(t *testing.T) {
+		t.Parallel()
+
+		expected, err := semver.StrictNewVersion("1.23.0")
+		assert.Success(t, "error should be nil", err)
+		actual, err := getDesiredVersion(nil, "", "1.23")
+		assert.Success(t, "error should be nil", err)
+		assert.True(t, "should handle versions without trailing zero", expected.Equal(actual))
+	})
+
+	t.Run("empty coder URL", func(t *testing.T) {
+		t.Parallel()
+
+		expected := &semver.Version{}
+		actual, err := getDesiredVersion(nil, "", "")
+		assert.ErrorContains(t, "error should be nil", err, "get coder url")
+		assert.True(t, "should handle versions without trailing zero", expected.Equal(actual))
+	})
+}
+
 // fakeGetter mocks HTTP requests.
 type fakeGetter struct {
 	M map[string]*fakeGetterResponse

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ func getDesiredVersion(httpClient getter, coderURLArg string, versionArg string)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`if versionArg != "" {`
`261`		`- desiredVersion, err = semver.StrictNewVersion(versionArg)`
	`261`	`+ desiredVersion, err = semver.NewVersion(versionArg)`
`262`	`262`	`if err != nil {`
`263`	`263`	`return &semver.Version{}, xerrors.Errorf("parse desired version arg: %w", err)`
`264`	`264`	`}`