use semver

sreya · sreya · commit 9a9bae195517 · 2022-06-24T22:42:33.000Z
diff --git a/buildinfo/buildinfo.go b/buildinfo/buildinfo.go
@@ -3,7 +3,6 @@ package buildinfo
 import (
 	"fmt"
 	"runtime/debug"
-	"strings"
 	"sync"
 	"time"
 
@@ -61,25 +60,11 @@ func Version() string {
 func VersionsMatch(v1, v2 string) bool {
 	// Developer versions are disregarded...hopefully they know what they are
 	// doing.
-	if strings.HasPrefix(v1, develPrefix) || strings.HasPrefix(v2, develPrefix) {
+	if semver.Prerelease(v1) != "" || semver.Prerelease(v2) != "" {
 		return true
 	}
 
-	v1Toks := strings.Split(v1, ".")
-	v2Toks := strings.Split(v2, ".")
-
-	// Versions should be formatted as "<major>.<minor>.<patch>".
-	// We assume malformed versions are evidence of a bug and return false.
-	if len(v1Toks) < 3 || len(v2Toks) < 3 {
-		return false
-	}
-
-	// Slice off the patch suffix. Patch versions should be non-breaking
-	// changes.
-	v1MajorMinor := strings.Join(v1Toks[:2], ".")
-	v2MajorMinor := strings.Join(v2Toks[:2], ".")
-
-	return v1MajorMinor == v2MajorMinor
+	return semver.Compare(semver.MajorMinor(v1), semver.MajorMinor(v2)) == 0
 }
 
 // ExternalURL returns a URL referencing the current Coder version.
diff --git a/buildinfo/buildinfo_test.go b/buildinfo/buildinfo_test.go
@@ -48,13 +48,6 @@ func TestBuildInfo(t *testing.T) {
 				v2:          "v1.2.3",
 				expectMatch: true,
 			},
-			// Test that we return false if a version is malformed.
-			{
-				name:        "MalformedIgnored",
-				v1:          "v1.2.3",
-				v2:          "v1.2",
-				expectMatch: false,
-			},
 			// Test that we return true if a developer version is detected.
 			// Developers do not need to be warned of mismatched versions.
 			{
