From a0aba4319f4cfa7d0867b1c103fc9305f707e3c8 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 6 Jul 2022 10:27:55 +0100 Subject: [PATCH] Only define plugin install endpoints when catalog enabled (#51788) (#51789) (cherry picked from commit ba9fc10a745642fe7b0ba6c0a25b0de1a76365b5) Co-authored-by: Will Browne --- pkg/api/api.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 5407314457f..f8b1dcfee25 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -310,10 +310,12 @@ func (hs *HTTPServer) registerRoutes() { apiRoute.Any("/plugins/:pluginId/resources/*", hs.CallResource) apiRoute.Get("/plugins/errors", routing.Wrap(hs.GetPluginErrorsList)) - apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) { - pluginRoute.Post("/:pluginId/install", routing.Wrap(hs.InstallPlugin)) - pluginRoute.Post("/:pluginId/uninstall", routing.Wrap(hs.UninstallPlugin)) - }, reqGrafanaAdmin) + if hs.Cfg.PluginAdminEnabled { + apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) { + pluginRoute.Post("/:pluginId/install", routing.Wrap(hs.InstallPlugin)) + pluginRoute.Post("/:pluginId/uninstall", routing.Wrap(hs.UninstallPlugin)) + }, reqGrafanaAdmin) + } apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) { pluginRoute.Get("/:pluginId/dashboards/", routing.Wrap(hs.GetPluginDashboards))