fix: only return version starting with number when no filter is supplied (#2120)

Author: Stratus3D

internal/versions/versions.go

@@ -253,13 +253,19 @@ func Latest(plugin plugins.Plugin, query string) (version string, err error) {
 		return version, err
 	}
 
-	allVersions, err := AllVersionsFiltered(plugin, query)
+	allVersions, err := AllVersions(plugin)
 	if err != nil {
 		return version, err
 	}
 
-	versions := filterOutByRegex(allVersions, numericStartFilterRegex, true)
-	versions = filterOutByRegex(versions, latestFilterRegex, false)
+	versions := filterByRegex(allVersions, latestFilterRegex, false)
+
+	// If no query specified by user default to selecting version with numeric start
+	if query == "" {
+		versions = filterByRegex(versions, numericStartFilterRegex, true)
+	} else {
+		versions = filterByExactMatch(versions, query)
+	}
 
 	if len(versions) < 1 {
 		return version, errors.New(noLatestVersionErrMsg)
@@ -284,17 +290,6 @@ func AllVersions(plugin plugins.Plugin) (versions []string, err error) {
 	return versions, err
 }
 
-// AllVersionsFiltered returns a list of existing versions that match a regex
-// query provided by the user.
-func AllVersionsFiltered(plugin plugins.Plugin, query string) (versions []string, err error) {
-	all, err := AllVersions(plugin)
-	if err != nil {
-		return versions, err
-	}
-
-	return filterByExactMatch(all, query), err
-}
-
 // Uninstall uninstalls a specific tool version. It invokes pre and
 // post-uninstall hooks if set, and runs the plugin's uninstall callback if
 // defined.
@@ -349,7 +344,7 @@ func filterByExactMatch(allVersions []string, pattern string) (versions []string
 	return versions
 }
 
-func filterOutByRegex(allVersions []string, pattern string, keepMatch bool) (versions []string) {
+func filterByRegex(allVersions []string, pattern string, keepMatch bool) (versions []string) {
 	regex, _ := regexp.Compile(pattern)
 	for _, version := range allVersions {
 		match := regex.MatchString(version)

internal/versions/versions_test.go

@@ -372,6 +372,25 @@ func TestLatest(t *testing.T) {
 		assert.Nil(t, err)
 		assert.Equal(t, "4.0.0", version)
 	})
+
+	t.Run("when given no query returns latest version of plugin starting with number", func(t *testing.T) {
+		pluginName := "no-latest-non-numeric-versions"
+		pluginDir, err := repotest.InstallPlugin("dummy_plugin", conf.DataDir, pluginName)
+		assert.Nil(t, err)
+		plugin := plugins.New(conf, pluginName)
+
+		// Replace list-all script so it returns some non-numeric versions
+		listAllScript := filepath.Join(pluginDir, "bin", "list-all")
+		err = os.WriteFile(listAllScript, []byte("#!/usr/bin/env bash\necho foobar 3.4.5 1.2.3-dev foobar2"), 0o777)
+		assert.Nil(t, err)
+		latestScript := filepath.Join(pluginDir, "bin", "latest-stable")
+		err = os.Remove(latestScript)
+		assert.Nil(t, err)
+
+		version, err := Latest(plugin, "")
+		assert.Nil(t, err)
+		assert.Equal(t, "3.4.5", version)
+	})
 }
 
 func TestLatestWithSamples(t *testing.T) {