From e6a5b2fc8abdbcdf9cafe8dc9afe684ac3fc85eb Mon Sep 17 00:00:00 2001
From: Violet Hynes <violet.hynes@hashicorp.com>
Date: Wed, 16 Jul 2025 16:36:59 -0400
Subject: [PATCH] CE Changes for VAULT-38180 (#31296)

* CE Changes for VAULT-38180

* whoopsie

* whoopsie 2
---
 vault/auth.go  | 12 +++++++-----
 vault/mount.go | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/vault/auth.go b/vault/auth.go
index fc9923c3f0..0cb1393adb 100644
--- a/vault/auth.go
+++ b/vault/auth.go
@@ -1052,13 +1052,18 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
 		return nil, err
 	}
 
+	pluginRunningVersion := pluginVersion
+	if pluginRunningVersion == "" && runningSha == "" {
+		pluginRunningVersion = versions.GetBuiltinVersion(consts.PluginTypeCredential, entry.Type)
+	}
+
 	pluginObservationRecorder, err := c.observations.WithPlugin(entry.namespace, &logical.ObservationPluginInfo{
 		MountClass:           consts.PluginTypeCredential.String(),
 		MountAccessor:        entry.Accessor,
 		MountPath:            entry.Path,
 		Plugin:               entry.Type,
 		PluginVersion:        pluginVersion,
-		RunningPluginVersion: entry.RunningVersion,
+		RunningPluginVersion: pluginRunningVersion,
 		Version:              entry.Options["version"],
 		Local:                entry.Local,
 	})
@@ -1081,11 +1086,8 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
 		return nil, err
 	}
 	if backend != nil {
-		entry.RunningVersion = pluginVersion
+		entry.RunningVersion = pluginRunningVersion
 		entry.RunningSha256 = runningSha
-		if entry.RunningVersion == "" && entry.RunningSha256 == "" {
-			entry.RunningVersion = versions.GetBuiltinVersion(consts.PluginTypeCredential, entry.Type)
-		}
 	}
 
 	return backend, nil
diff --git a/vault/mount.go b/vault/mount.go
index 160a130d18..1960918fae 100644
--- a/vault/mount.go
+++ b/vault/mount.go
@@ -1788,13 +1788,18 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
 		return nil, err
 	}
 
+	pluginRunningVersion := pluginVersion
+	if pluginRunningVersion == "" && runningSha == "" {
+		pluginRunningVersion = versions.GetBuiltinVersion(consts.PluginTypeSecrets, entry.Type)
+	}
+
 	pluginObservationRecorder, err := c.observations.WithPlugin(entry.namespace, &logical.ObservationPluginInfo{
 		MountClass:           consts.PluginTypeSecrets.String(),
 		MountAccessor:        entry.Accessor,
 		MountPath:            entry.Path,
 		Plugin:               entry.Type,
 		PluginVersion:        pluginVersion,
-		RunningPluginVersion: entry.RunningVersion,
+		RunningPluginVersion: pluginRunningVersion,
 		Version:              entry.Options["version"],
 		Local:                entry.Local,
 	})
@@ -1822,11 +1827,8 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
 		return nil, fmt.Errorf("nil backend of type %q returned from factory", t)
 	}
 
-	entry.RunningVersion = pluginVersion
+	entry.RunningVersion = pluginRunningVersion
 	entry.RunningSha256 = runningSha
-	if entry.RunningVersion == "" && entry.RunningSha256 == "" {
-		entry.RunningVersion = versions.GetBuiltinVersion(consts.PluginTypeSecrets, entry.Type)
-	}
 	addLicenseCallback(c, backend)
 
 	return backend, nil