From 20cfac45cc4bfbc1a209b40f9d90a8cbb6efb1a0 Mon Sep 17 00:00:00 2001
From: Michael Mandrus <michael.mandrus@grafana.com>
Date: Wed, 25 May 2022 20:50:41 -0400
Subject: [PATCH] Fix argument types for remote checker

---
 pkg/plugins/backendplugin/grpcplugin/client.go      | 4 ++--
 pkg/plugins/backendplugin/grpcplugin/client_v2.go   | 4 ++--
 pkg/services/secrets/kvstore/remote_plugin_check.go | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/plugins/backendplugin/grpcplugin/client.go b/pkg/plugins/backendplugin/grpcplugin/client.go
index f0ccbb0d0e5..f8372c3fb0d 100644
--- a/pkg/plugins/backendplugin/grpcplugin/client.go
+++ b/pkg/plugins/backendplugin/grpcplugin/client.go
@@ -52,7 +52,7 @@ type PluginDescriptor struct {
 	managed               bool
 	versionedPlugins      map[int]goplugin.PluginSet
 	startRendererFn       StartRendererFunc
-	startSecretsmanagerFn StartSecretsManagerFunc
+	startSecretsManagerFn StartSecretsManagerFunc
 }
 
 // getV2PluginSet returns list of plugins supported on v2.
@@ -101,6 +101,6 @@ func NewSecretsManagerPlugin(pluginID, executablePath string, startFn StartSecre
 		versionedPlugins: map[int]goplugin.PluginSet{
 			grpcplugin.ProtocolVersion: getV2PluginSet(),
 		},
-		startSecretsmanagerFn: startFn,
+		startSecretsManagerFn: startFn,
 	})
 }
diff --git a/pkg/plugins/backendplugin/grpcplugin/client_v2.go b/pkg/plugins/backendplugin/grpcplugin/client_v2.go
index 86efea54285..392f2e74477 100644
--- a/pkg/plugins/backendplugin/grpcplugin/client_v2.go
+++ b/pkg/plugins/backendplugin/grpcplugin/client_v2.go
@@ -102,8 +102,8 @@ func newClientV2(descriptor PluginDescriptor, logger log.Logger, rpcClient plugi
 		}
 	}
 
-	if descriptor.startSecretsmanagerFn != nil {
-		if err := descriptor.startSecretsmanagerFn(descriptor.pluginID, c.SecretsManagerPlugin, logger); err != nil {
+	if descriptor.startSecretsManagerFn != nil {
+		if err := descriptor.startSecretsManagerFn(descriptor.pluginID, c.SecretsManagerPlugin, logger); err != nil {
 			return nil, err
 		}
 	}
diff --git a/pkg/services/secrets/kvstore/remote_plugin_check.go b/pkg/services/secrets/kvstore/remote_plugin_check.go
index 10e6960e45c..f290dac3eea 100644
--- a/pkg/services/secrets/kvstore/remote_plugin_check.go
+++ b/pkg/services/secrets/kvstore/remote_plugin_check.go
@@ -1,12 +1,12 @@
 package kvstore
 
 import (
-	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/plugins/manager"
 )
 
 type UseRemoteSecretsPluginCheck interface {
 	ShouldUseRemoteSecretsPlugin() bool
-	GetManager() plugins.SecretsManagerManager
+	GetManager() *manager.PluginManager
 }
 
 type OSSRemoteSecretsPluginCheck struct {
@@ -21,6 +21,6 @@ func (c *OSSRemoteSecretsPluginCheck) ShouldUseRemoteSecretsPlugin() bool {
 	return false
 }
 
-func (c *OSSRemoteSecretsPluginCheck) GetManager() plugins.SecretsManagerManager {
+func (c *OSSRemoteSecretsPluginCheck) GetManager() *manager.PluginManager {
 	return nil
 }