Fix argument types for remote checker

This commit is contained in:
Michael Mandrus
2022-05-25 20:50:41 -04:00
parent cb4ee91359
commit 20cfac45cc
3 changed files with 7 additions and 7 deletions
@@ -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,
})
}
@@ -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
}
}
@@ -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
}