Fix ordering of secrets plugins

hashicorp · Sep 28, 2022 · 1c6a3d1 · 1c6a3d1
1 parent cf76ca3
commit 1c6a3d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/vault/logical_system.go b/vault/logical_system.go
@@ -426,7 +426,7 @@ func (b *SystemBackend) handlePluginCatalogUntypedList(ctx context.Context, _ *l
 		}
 
 		// Sort for consistent ordering
-		sortVersionedPlugins(versionedPlugins)
+		sortVersionedPlugins(versioned)
 
 		versionedPlugins = append(versionedPlugins, versioned...)
 	}

diff --git a/vault/logical_system_test.go b/vault/logical_system_test.go
@@ -5086,7 +5086,7 @@ func TestSortVersionedPlugins(t *testing.T) {
 		// Include differing versions twice so we can test out equality too.
 		"differing types, names and versions": append(differingTypes,
 			append(differingNames,
-				append(differingVersions, differingVersions...)...)...),
+				append(differingVersions, differingTypes...)...)...),
 		"mix of unversioned, versioned, and builtin": versionedUnversionedAndBuiltin,
 	} {
 		t.Run(name, func(t *testing.T) {