From 9fe8945005b47071ab3e6b77adfb9711da375765 Mon Sep 17 00:00:00 2001
From: Ben Ash <32777270+benashz@users.noreply.github.com>
Date: Fri, 6 Jun 2025 14:47:39 -0400
Subject: [PATCH] Stub updates for Ent (#30890)

---
 changelog/30890.txt                             |  3 +++
 vault/logical_system.go                         |  2 +-
 vault/logical_system_stubs_oss.go               |  4 ++++
 vault/plugincatalog/plugin_catalog_stubs_oss.go | 16 ++++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 changelog/30890.txt
 create mode 100644 vault/plugincatalog/plugin_catalog_stubs_oss.go

diff --git a/changelog/30890.txt b/changelog/30890.txt
new file mode 100644
index 0000000000..66b8750762
--- /dev/null
+++ b/changelog/30890.txt
@@ -0,0 +1,3 @@
+```release-note:change
+logical/system: add ent stub for plugin catalog handling
+```
diff --git a/vault/logical_system.go b/vault/logical_system.go
index f804a639ce..b7484c4e1e 100644
--- a/vault/logical_system.go
+++ b/vault/logical_system.go
@@ -203,7 +203,7 @@ func NewSystemBackend(core *Core, logger log.Logger, config *logical.BackendConf
 	b.Backend.Paths = append(b.Backend.Paths, b.sealPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.statusPaths()...)
 	b.Backend.Paths = append(b.Backend.Paths, b.pluginsCatalogListPaths()...)
-	b.Backend.Paths = append(b.Backend.Paths, b.pluginsCatalogCRUDPath())
+	b.Backend.Paths = append(b.Backend.Paths, entWrappedPluginsCRUDPath(b)...)
 	b.Backend.Paths = append(b.Backend.Paths, b.pluginsCatalogPinsListPath())
 	b.Backend.Paths = append(b.Backend.Paths, b.pluginsCatalogPinsCRUDPath())
 	b.Backend.Paths = append(b.Backend.Paths, b.pluginsReloadPath())
diff --git a/vault/logical_system_stubs_oss.go b/vault/logical_system_stubs_oss.go
index 8092b65af1..788b8cab4a 100644
--- a/vault/logical_system_stubs_oss.go
+++ b/vault/logical_system_stubs_oss.go
@@ -31,3 +31,7 @@ func (s *SystemBackend) makeSnapshotSource(ctx context.Context, _ *framework.Fie
 	}
 	return snapshots.NewManualSnapshotSource(body), nil
 }
+
+func entWrappedPluginsCRUDPath(b *SystemBackend) []*framework.Path {
+	return []*framework.Path{b.pluginsCatalogCRUDPath()}
+}
diff --git a/vault/plugincatalog/plugin_catalog_stubs_oss.go b/vault/plugincatalog/plugin_catalog_stubs_oss.go
new file mode 100644
index 0000000000..3115eb24e9
--- /dev/null
+++ b/vault/plugincatalog/plugin_catalog_stubs_oss.go
@@ -0,0 +1,16 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+//go:build !enterprise
+
+package plugincatalog
+
+import (
+	"context"
+
+	"github.com/hashicorp/vault/sdk/helper/pluginutil"
+)
+
+func (c *PluginCatalog) entPrepareDownloadedPlugin(ctx context.Context, plugin pluginutil.SetPluginInput) (string, string, error) {
+	return "", "", nil
+}