Adds Vault version prerelease and metadata to logical.PluginEnvironme…

…nt (#14851)
hashicorp · Apr 27, 2022 · 028d14f · 028d14f
1 parent fc7f7b4
commit 028d14f
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 28 deletions.
diff --git a/helper/forwarding/types.pb.go b/helper/forwarding/types.pb.go
diff --git a/helper/identity/mfa/types.pb.go b/helper/identity/mfa/types.pb.go
diff --git a/helper/identity/types.pb.go b/helper/identity/types.pb.go
diff --git a/helper/storagepacker/types.pb.go b/helper/storagepacker/types.pb.go
diff --git a/physical/raft/types.pb.go b/physical/raft/types.pb.go
diff --git a/sdk/database/dbplugin/database.pb.go b/sdk/database/dbplugin/database.pb.go
diff --git a/sdk/database/dbplugin/v5/proto/database.pb.go b/sdk/database/dbplugin/v5/proto/database.pb.go
diff --git a/sdk/helper/pluginutil/multiplexing.pb.go b/sdk/helper/pluginutil/multiplexing.pb.go
diff --git a/sdk/logical/identity.pb.go b/sdk/logical/identity.pb.go
diff --git a/sdk/logical/plugin.pb.go b/sdk/logical/plugin.pb.go
diff --git a/sdk/logical/plugin.proto b/sdk/logical/plugin.proto
@@ -7,4 +7,10 @@ package logical;
 message PluginEnvironment {
 	// VaultVersion is the version of the Vault server
 	string vault_version = 1;
+
+	// VaultVersionPrerelease is the prerelease information of the Vault server
+	string vault_version_prerelease = 2;
+
+	// VaultVersionMetadata is the version metadata of the Vault server
+	string vault_version_metadata = 3;
 }
diff --git a/sdk/plugin/grpc_system_test.go b/sdk/plugin/grpc_system_test.go
@@ -213,7 +213,9 @@ func TestSystem_GRPC_groupsForEntity(t *testing.T) {
 func TestSystem_GRPC_pluginEnv(t *testing.T) {
 	sys := logical.TestSystemView()
 	sys.PluginEnvironment = &logical.PluginEnvironment{
-		VaultVersion: "0.10.42",
+		VaultVersion:           "0.10.42",
+		VaultVersionPrerelease: "dev",
+		VaultVersionMetadata:   "prem",
 	}
 	client, _ := plugin.TestGRPCConn(t, func(s *grpc.Server) {
 		pb.RegisterSystemViewServer(s, &gRPCSystemViewServer{

diff --git a/sdk/plugin/pb/backend.pb.go b/sdk/plugin/pb/backend.pb.go
diff --git a/vault/activity/activity_log.pb.go b/vault/activity/activity_log.pb.go
diff --git a/vault/dynamic_system_view.go b/vault/dynamic_system_view.go
@@ -350,8 +350,11 @@ func (d dynamicSystemView) GroupsForEntity(entityID string) ([]*logical.Group, e
 }
 
 func (d dynamicSystemView) PluginEnv(_ context.Context) (*logical.PluginEnvironment, error) {
+	v := version.GetVersion()
 	return &logical.PluginEnvironment{
-		VaultVersion: version.GetVersion().Version,
+		VaultVersion:           v.Version,
+		VaultVersionPrerelease: v.VersionPrerelease,
+		VaultVersionMetadata:   v.VersionMetadata,
 	}, nil
 }
 

diff --git a/vault/request_forwarding_service.pb.go b/vault/request_forwarding_service.pb.go
diff --git a/vault/tokens/token.pb.go b/vault/tokens/token.pb.go