IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dashboard Extractor: Don't fail when using default OSS implementation (#46024)

Browse Source 
* Don't fail when using default OSS implementation

* Check correct error
This commit is contained in:
Selene
2022-03-02 11:04:29 +01:00
committed by GitHub
parent 8e08128f83
commit 5eaf6509c0
5 changed files with 79 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/datasources.go
View File

@@ -9,11 +9,12 @@ import (
"sort"
"strconv"
"github.com/grafana/grafana/pkg/services/datasources/permissions"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/api/datasource"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins/adapters"
@@ -577,7 +578,7 @@ func (hs *HTTPServer) filterDatasourcesByQueryPermission(ctx context.Context, us
query.Result = datasources
if err := hs.DatasourcePermissionsService.FilterDatasourcesBasedOnQueryPermissions(ctx, &query); err != nil {
if !errors.Is(err, bus.ErrHandlerNotFound) {
if !errors.Is(err, permissions.ErrNotImplemented) {
return nil, err
}
return datasources, nil