Fix plugin release sorting to use semantic versioning (#1492)

vcheung-stripe · claude · web-flow · commit 24d524a54743 · 2026-03-17T10:28:12.000-07:00
* Fix plugin release sorting to use semantic versioning

Plugin releases were being sorted lexicographically, causing versions
like 1.10.0 to appear before 1.9.0. Now uses proper semver comparison
to ensure correct ordering.

Co-Authored-By: Claude Sonnet 4.5 &lt;noreply@anthropic.com&gt;
Committed-By-Agent: claude

* make fmt

* go mod tidy

---------

Co-authored-by: Claude Sonnet 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/go.mod b/go.mod
@@ -46,6 +46,7 @@ require (
 	github.com/go-git/go-git/v5 v5.14.0
 	github.com/hashicorp/go-hclog v1.6.3
 	github.com/hashicorp/go-plugin v1.6.3
+	github.com/hashicorp/go-version v1.8.0
 	github.com/joho/godotenv v1.5.1
 )
 
diff --git a/go.sum b/go.sum
@@ -110,6 +110,8 @@ github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB1
 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-plugin v1.6.3 h1:xgHB+ZUSYeuJi96WtxEjzi23uh7YQpznjGh0U0UUrwg=
 github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0=
+github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4=
+github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
diff --git a/pkg/plugins/utilities.go b/pkg/plugins/utilities.go
@@ -19,6 +19,7 @@ import (
 	"github.com/BurntSushi/toml"
 
 	hcplugin "github.com/hashicorp/go-plugin"
+	"github.com/hashicorp/go-version"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 
@@ -274,7 +275,15 @@ func addPluginToList(pluginList *PluginList, pl Plugin) {
 
 		// Other code assumes the releases are sorted with latest version last.
 		sort.Slice(pluginList.Plugins[idx].Releases, func(i, j int) bool {
-			return pluginList.Plugins[idx].Releases[i].Version < pluginList.Plugins[idx].Releases[j].Version
+			vi, errI := version.NewVersion(pluginList.Plugins[idx].Releases[i].Version)
+			vj, errJ := version.NewVersion(pluginList.Plugins[idx].Releases[j].Version)
+
+			// If either version fails to parse, fall back to string comparison
+			if errI != nil || errJ != nil {
+				return pluginList.Plugins[idx].Releases[i].Version < pluginList.Plugins[idx].Releases[j].Version
+			}
+
+			return vi.LessThan(vj)
 		})
 	}
 }
diff --git a/pkg/plugins/utilities_test.go b/pkg/plugins/utilities_test.go
@@ -399,3 +399,45 @@ func TestRefreshPluginSucceedsIfAdditionalManifestNotFound(t *testing.T) {
 	err := RefreshPluginManifest(context.Background(), config, fs, stripeServer.URL)
 	require.Nil(t, err)
 }
+
+func TestAddPluginToListSortsBySemver(t *testing.T) {
+	pluginList := &PluginList{
+		Plugins: []Plugin{
+			{
+				Shortname:        "test-plugin",
+				MagicCookieValue: "TEST-COOKIE-123",
+				Releases: []Release{
+					{Version: "1.0.0", OS: "darwin", Arch: "amd64"},
+					{Version: "1.2.0", OS: "darwin", Arch: "amd64"},
+				},
+			},
+		},
+	}
+
+	// Add a plugin with versions that would be sorted incorrectly by string comparison
+	newPlugin := Plugin{
+		Shortname:        "test-plugin",
+		MagicCookieValue: "TEST-COOKIE-123",
+		Releases: []Release{
+			{Version: "1.10.0", OS: "darwin", Arch: "amd64"}, // String comparison would put this before 1.2.0
+			{Version: "1.9.0", OS: "darwin", Arch: "amd64"},  // Should come after 1.2.0 but before 1.10.0
+			{Version: "2.0.0", OS: "darwin", Arch: "amd64"},
+			{Version: "1.0.1", OS: "darwin", Arch: "amd64"}, // Should come after 1.0.0 but before 1.2.0
+		},
+	}
+
+	addPluginToList(pluginList, newPlugin)
+
+	// Verify the plugin was merged (not added as a new one)
+	require.Equal(t, 1, len(pluginList.Plugins))
+
+	// Verify all releases are present
+	require.Equal(t, 6, len(pluginList.Plugins[0].Releases))
+
+	// Verify they are sorted by semver (not by string comparison)
+	expectedOrder := []string{"1.0.0", "1.0.1", "1.2.0", "1.9.0", "1.10.0", "2.0.0"}
+	for i, release := range pluginList.Plugins[0].Releases {
+		require.Equal(t, expectedOrder[i], release.Version,
+			"Expected release %d to be version %s, but got %s", i, expectedOrder[i], release.Version)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ require (`
`46`	`46`	`github.com/go-git/go-git/v5 v5.14.0`
`47`	`47`	`github.com/hashicorp/go-hclog v1.6.3`
`48`	`48`	`github.com/hashicorp/go-plugin v1.6.3`
	`49`	`+ github.com/hashicorp/go-version v1.8.0`
`49`	`50`	`github.com/joho/godotenv v1.5.1`
`50`	`51`	`)`
`51`	`52`