From 8f4e78c57e8abea2bcb710c3c12faeca1a010cb4 Mon Sep 17 00:00:00 2001
From: Christopher Swenson <christopher.swenson@hashicorp.com>
Date: Wed, 21 Sep 2022 13:32:00 -0700
Subject: [PATCH] Change usages of RunningSha to RunningSha256 (#17266)

Some PRs got crossed and somehow these were missed in the
build checks for #17182.
---
 vault/auth.go                 | 4 ++--
 vault/external_plugin_test.go | 4 ++--
 vault/mount.go                | 4 ++--
 vault/plugin_reload.go        | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vault/auth.go b/vault/auth.go
index 91cca4120d..6353051f24 100644
--- a/vault/auth.go
+++ b/vault/auth.go
@@ -171,7 +171,7 @@ func (c *Core) enableCredentialInternal(ctx context.Context, entry *MountEntry,
 	var backend logical.Backend
 	// Create the new backend
 	sysView := c.mountEntrySysView(entry)
-	backend, entry.RunningSha, err = c.newCredentialBackend(ctx, entry, sysView, view)
+	backend, entry.RunningSha256, err = c.newCredentialBackend(ctx, entry, sysView, view)
 	if err != nil {
 		return err
 	}
@@ -795,7 +795,7 @@ func (c *Core) setupCredentials(ctx context.Context) error {
 		// Initialize the backend
 		sysView := c.mountEntrySysView(entry)
 
-		backend, entry.RunningSha, err = c.newCredentialBackend(ctx, entry, sysView, view)
+		backend, entry.RunningSha256, err = c.newCredentialBackend(ctx, entry, sysView, view)
 		if err != nil {
 			c.logger.Error("failed to create credential entry", "path", entry.Path, "error", err)
 			plug, plugerr := c.pluginCatalog.Get(ctx, entry.Type, consts.PluginTypeCredential, "")
diff --git a/vault/external_plugin_test.go b/vault/external_plugin_test.go
index be45e86f96..bf13010800 100644
--- a/vault/external_plugin_test.go
+++ b/vault/external_plugin_test.go
@@ -277,8 +277,8 @@ func TestCore_EnableExternalPlugin_MultipleVersions(t *testing.T) {
 				t.Errorf("Expected mount to have no running version but got %s", raw.(*routeEntry).mountEntry.RunningVersion)
 			}
 
-			if raw.(*routeEntry).mountEntry.RunningSha == "" {
-				t.Errorf("Expected RunningSha to be present: %+v", raw.(*routeEntry).mountEntry.RunningSha)
+			if raw.(*routeEntry).mountEntry.RunningSha256 == "" {
+				t.Errorf("Expected RunningSha256 to be present: %+v", raw.(*routeEntry).mountEntry.RunningSha256)
 			}
 		})
 	}
diff --git a/vault/mount.go b/vault/mount.go
index ccf78b6fd6..69c8ae5a64 100644
--- a/vault/mount.go
+++ b/vault/mount.go
@@ -609,7 +609,7 @@ func (c *Core) mountInternal(ctx context.Context, entry *MountEntry, updateStora
 	var backend logical.Backend
 	sysView := c.mountEntrySysView(entry)
 
-	backend, entry.RunningSha, err = c.newLogicalBackend(ctx, entry, sysView, view)
+	backend, entry.RunningSha256, err = c.newLogicalBackend(ctx, entry, sysView, view)
 	if err != nil {
 		return err
 	}
@@ -1420,7 +1420,7 @@ func (c *Core) setupMounts(ctx context.Context) error {
 		var backend logical.Backend
 		// Create the new backend
 		sysView := c.mountEntrySysView(entry)
-		backend, entry.RunningSha, err = c.newLogicalBackend(ctx, entry, sysView, view)
+		backend, entry.RunningSha256, err = c.newLogicalBackend(ctx, entry, sysView, view)
 		if err != nil {
 			c.logger.Error("failed to create mount entry", "path", entry.Path, "error", err)
 			if !c.builtinRegistry.Contains(entry.Type, consts.PluginTypeSecrets) {
diff --git a/vault/plugin_reload.go b/vault/plugin_reload.go
index b65e8bf5f2..4ca37251cf 100644
--- a/vault/plugin_reload.go
+++ b/vault/plugin_reload.go
@@ -174,12 +174,12 @@ func (c *Core) reloadBackendCommon(ctx context.Context, entry *MountEntry, isAut
 	}
 
 	var backend logical.Backend
-	oldSha := entry.RunningSha
+	oldSha := entry.RunningSha256
 	if !isAuth {
 		// Dispense a new backend
-		backend, entry.RunningSha, err = c.newLogicalBackend(ctx, entry, sysView, view)
+		backend, entry.RunningSha256, err = c.newLogicalBackend(ctx, entry, sysView, view)
 	} else {
-		backend, entry.RunningSha, err = c.newCredentialBackend(ctx, entry, sysView, view)
+		backend, entry.RunningSha256, err = c.newCredentialBackend(ctx, entry, sysView, view)
 	}
 	if err != nil {
 		return err
@@ -189,7 +189,7 @@ func (c *Core) reloadBackendCommon(ctx context.Context, entry *MountEntry, isAut
 	}
 
 	// update the mount table since we changed the runningSha
-	if oldSha != entry.RunningSha && MountTableUpdateStorage {
+	if oldSha != entry.RunningSha256 && MountTableUpdateStorage {
 		if isAuth {
 			err = c.persistAuth(ctx, c.auth, &entry.Local)
 			if err != nil {