Plugins: Remove support for secrets manager plugins (#101467)

* remove secrets manager code

* remove unused struct

* add test toggles back

* rollback golden file changes

* add missing TestMain

* update betterer

pkg/plugins/backendplugin/grpcplugin/client.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
-	"github.com/grafana/grafana/pkg/plugins/backendplugin/secretsmanagerplugin"
 	"github.com/grafana/grafana/pkg/plugins/log"
 )
 
@@ -31,14 +30,13 @@ var handshake = goplugin.HandshakeConfig{
 // pluginSet is list of plugins supported on v2.
 var pluginSet = map[int]goplugin.PluginSet{
 	grpcplugin.ProtocolVersion: {
-		"diagnostics":    &grpcplugin.DiagnosticsGRPCPlugin{},
-		"resource":       &grpcplugin.ResourceGRPCPlugin{},
-		"data":           &grpcplugin.DataGRPCPlugin{},
-		"stream":         &grpcplugin.StreamGRPCPlugin{},
-		"admission":      &grpcplugin.AdmissionGRPCPlugin{},
-		"conversion":     &grpcplugin.ConversionGRPCPlugin{},
-		"renderer":       &pluginextensionv2.RendererGRPCPlugin{},
-		"secretsmanager": &secretsmanagerplugin.SecretsManagerGRPCPlugin{},
+		"diagnostics": &grpcplugin.DiagnosticsGRPCPlugin{},
+		"resource":    &grpcplugin.ResourceGRPCPlugin{},
+		"data":        &grpcplugin.DataGRPCPlugin{},
+		"stream":      &grpcplugin.StreamGRPCPlugin{},
+		"admission":   &grpcplugin.AdmissionGRPCPlugin{},
+		"conversion":  &grpcplugin.ConversionGRPCPlugin{},
+		"renderer":    &pluginextensionv2.RendererGRPCPlugin{},
 	},
 }
 
@@ -84,19 +82,15 @@ func newClientConfig(executablePath string, args []string, env []string, skipHos
 // StartRendererFunc callback function called when a renderer plugin is started.
 type StartRendererFunc func(pluginID string, renderer pluginextensionv2.RendererPlugin, logger log.Logger) error
 
-// StartSecretsManagerFunc callback function called when a secrets manager plugin is started.
-type StartSecretsManagerFunc func(pluginID string, secretsmanager secretsmanagerplugin.SecretsManagerPlugin, logger log.Logger) error
-
 // PluginDescriptor is a descriptor used for registering backend plugins.
 type PluginDescriptor struct {
-	pluginID              string
-	executablePath        string
-	executableArgs        []string
-	skipHostEnvVars       bool
-	managed               bool
-	versionedPlugins      map[int]goplugin.PluginSet
-	startRendererFn       StartRendererFunc
-	startSecretsManagerFn StartSecretsManagerFunc
+	pluginID         string
+	executablePath   string
+	executableArgs   []string
+	skipHostEnvVars  bool
+	managed          bool
+	versionedPlugins map[int]goplugin.PluginSet
+	startRendererFn  StartRendererFunc
 }
 
 // NewBackendPlugin creates a new backend plugin factory used for registering a backend plugin.
@@ -131,14 +125,3 @@ func NewRendererPlugin(pluginID, executablePath string, startFn StartRendererFun
 		startRendererFn:  startFn,
 	})
 }
-
-// NewSecretsManagerPlugin creates a new secrets manager plugin factory used for registering a backend secrets manager plugin.
-func NewSecretsManagerPlugin(pluginID, executablePath string, startFn StartSecretsManagerFunc) backendplugin.PluginFactoryFunc {
-	return newPlugin(PluginDescriptor{
-		pluginID:              pluginID,
-		executablePath:        executablePath,
-		managed:               false,
-		versionedPlugins:      pluginSet,
-		startSecretsManagerFn: startFn,
-	})
-}

pkg/plugins/backendplugin/grpcplugin/client_v2.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
-	"github.com/grafana/grafana/pkg/plugins/backendplugin/secretsmanagerplugin"
 	"github.com/grafana/grafana/pkg/plugins/log"
 )
 
@@ -32,7 +31,6 @@ type ClientV2 struct {
 	grpcplugin.AdmissionClient
 	grpcplugin.ConversionClient
 	pluginextensionv2.RendererPlugin
-	secretsmanagerplugin.SecretsManagerPlugin
 }
 
 func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugin.ClientProtocol) (*ClientV2, error) {
@@ -71,11 +69,6 @@ func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugi
 		return nil, err
 	}
 
-	rawSecretsManager, err := rpcClient.Dispense("secretsmanager")
-	if err != nil {
-		return nil, err
-	}
-
 	c := &ClientV2{}
 	if rawDiagnostics != nil {
 		if diagnosticsClient, ok := rawDiagnostics.(grpcplugin.DiagnosticsClient); ok {
@@ -119,24 +112,12 @@ func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugi
 		}
 	}
 
-	if rawSecretsManager != nil {
-		if secretsManagerPlugin, ok := rawSecretsManager.(secretsmanagerplugin.SecretsManagerPlugin); ok {
-			c.SecretsManagerPlugin = secretsManagerPlugin
-		}
-	}
-
 	if descriptor.startRendererFn != nil {
 		if err := descriptor.startRendererFn(descriptor.pluginID, c.RendererPlugin, logger); err != nil {
 			return nil, err
 		}
 	}
 
-	if descriptor.startSecretsManagerFn != nil {
-		if err := descriptor.startSecretsManagerFn(descriptor.pluginID, c.SecretsManagerPlugin, logger); err != nil {
-			return nil, err
-		}
-	}
-
 	return c, nil
 }