Update mount table and CLI with plugin version for auth (#16856)

command/plugin_test.go

@@ -6,36 +6,12 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/sdk/helper/consts"
 )
 
-// testPluginDir creates a temporary directory suitable for holding plugins.
-// This helper also resolves symlinks to make tests happy on OS X.
-func testPluginDir(tb testing.TB) (string, func(tb testing.TB)) {
-	tb.Helper()
-
-	dir, err := ioutil.TempDir("", "")
-	if err != nil {
-		tb.Fatal(err)
-	}
-
-	// OSX tempdir are /var, but actually symlinked to /private/var
-	dir, err = filepath.EvalSymlinks(dir)
-	if err != nil {
-		tb.Fatal(err)
-	}
-
-	return dir, func(tb testing.TB) {
-		if err := os.RemoveAll(dir); err != nil {
-			tb.Fatal(err)
-		}
-	}
-}
-
 // testPluginCreate creates a sample plugin in a tempdir and returns the shasum
 // and filepath to the plugin.
 func testPluginCreate(tb testing.TB, dir, name string) (string, string) {
@@ -78,3 +54,22 @@ func testPluginCreateAndRegister(tb testing.TB, client *api.Client, dir, name st
 
 	return pth, sha256Sum
 }
+
+// testPluginCreateAndRegisterVersioned creates a versioned plugin and registers it in the catalog.
+func testPluginCreateAndRegisterVersioned(tb testing.TB, client *api.Client, dir, name string, pluginType consts.PluginType) (string, string, string) {
+	tb.Helper()
+
+	pth, sha256Sum := testPluginCreate(tb, dir, name)
+
+	if err := client.Sys().RegisterPlugin(&api.RegisterPluginInput{
+		Name:    name,
+		Type:    pluginType,
+		Command: name,
+		SHA256:  sha256Sum,
+		Version: "v1.0.0",
+	}); err != nil {
+		tb.Fatal(err)
+	}
+
+	return pth, sha256Sum, "v1.0.0"
+}