rename error type to suggest user friendly only
This commit is contained in:
@@ -24,7 +24,7 @@ import (
|
||||
)
|
||||
|
||||
var datasourcesLogger = log.New("datasources")
|
||||
var secretsPluginError *models.ErrDatasourceSecretsPlugin
|
||||
var secretsPluginError *models.ErrDatasourceSecretsPluginUserFriendly
|
||||
|
||||
func (hs *HTTPServer) GetDataSources(c *models.ReqContext) response.Response {
|
||||
query := models.GetDataSourcesQuery{OrgId: c.OrgId, DataSourceLimit: hs.Cfg.DataSourceLimit}
|
||||
|
||||
@@ -82,11 +82,11 @@ func (ds DataSource) AllowedCookies() []string {
|
||||
}
|
||||
|
||||
// Specific error type for grpc secrets management so that we can show more detailed plugin errors to users
|
||||
type ErrDatasourceSecretsPlugin struct {
|
||||
type ErrDatasourceSecretsPluginUserFriendly struct {
|
||||
Err error
|
||||
}
|
||||
|
||||
func (e ErrDatasourceSecretsPlugin) Error() string {
|
||||
func (e ErrDatasourceSecretsPluginUserFriendly) Error() string {
|
||||
return e.Err.Error()
|
||||
}
|
||||
|
||||
|
||||
@@ -125,6 +125,6 @@ func parseKeys(keys []*smp.Key) []Key {
|
||||
return newKeys
|
||||
}
|
||||
|
||||
func wrapUserFriendlySecretError(ufe string) models.ErrDatasourceSecretsPlugin {
|
||||
return models.ErrDatasourceSecretsPlugin{Err: errors.New(ufe)}
|
||||
func wrapUserFriendlySecretError(ufe string) models.ErrDatasourceSecretsPluginUserFriendly {
|
||||
return models.ErrDatasourceSecretsPluginUserFriendly{Err: errors.New(ufe)}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user