Fix version warning parse logic (#172)

cmoog · web-flow · commit 416d2379af8a · 2020-11-03T13:28:25.000-06:00
diff --git a/internal/version/version.go b/internal/version/version.go
@@ -13,6 +13,6 @@ func VersionsMatch(apiVersion string) bool {
 	if len(withoutPatchRelease) < 3 {
 		return false
 	}
-	majorMinor := strings.Join(withoutPatchRelease[:len(withoutPatchRelease)-1], ".")
+	majorMinor := strings.Join(withoutPatchRelease[:2], ".")
 	return strings.HasPrefix(strings.TrimPrefix(apiVersion, "v"), strings.TrimPrefix(majorMinor, "v"))
 }
diff --git a/internal/version/version_test.go b/internal/version/version_test.go
@@ -26,4 +26,8 @@ func TestVersion(t *testing.T) {
 	Version = "1.15.4"
 	match = VersionsMatch("v2.15.2")
 	assert.True(t, "versions do not match", !match)
+
+	Version = "1.12.2+cli.rc1"
+	match = VersionsMatch("v1.12.9")
+	assert.True(t, "versions do match", match)
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ func VersionsMatch(apiVersion string) bool {`
`13`	`13`	`if len(withoutPatchRelease) < 3 {`
`14`	`14`	`return false`
`15`	`15`	`}`
`16`		`- majorMinor := strings.Join(withoutPatchRelease[:len(withoutPatchRelease)-1], ".")`
	`16`	`+ majorMinor := strings.Join(withoutPatchRelease[:2], ".")`
`17`	`17`	`return strings.HasPrefix(strings.TrimPrefix(apiVersion, "v"), strings.TrimPrefix(majorMinor, "v"))`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,8 @@ func TestVersion(t *testing.T) {`
`26`	`26`	`Version = "1.15.4"`
`27`	`27`	`match = VersionsMatch("v2.15.2")`
`28`	`28`	`assert.True(t, "versions do not match", !match)`
	`29`	`+`
	`30`	`+ Version = "1.12.2+cli.rc1"`
	`31`	`+ match = VersionsMatch("v1.12.9")`
	`32`	`+ assert.True(t, "versions do match", match)`
`29`	`33`	`}`