opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: add default value for authentication type

Browse Source
This commit is contained in:
Erik Sundell
2018-10-09 16:36:45 +02:00
parent 823838a839
commit cd7b454e25
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/pluginproxy/ds_auth_provider.go
View File

@ -55,7 +55,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
} }
} }
authenticationType := ds.JsonData.Get("authenticationType").MustString() authenticationType := ds.JsonData.Get("authenticationType").MustString("jwt")
if route.JwtTokenAuth != nil && authenticationType == "jwt" { if route.JwtTokenAuth != nil && authenticationType == "jwt" {
logger.Info("authenticationType", "authenticationType", "jwt") logger.Info("authenticationType", "authenticationType", "jwt")
if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil { if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil {

2
pkg/tsdb/stackdriver/test_datasource_query.go
View File

@ -17,7 +17,7 @@ import (
) )
func (e *StackdriverExecutor) executeTestDataSource(ctx context.Context, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) { func (e *StackdriverExecutor) executeTestDataSource(ctx context.Context, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) {
authenticationType := e.dsInfo.JsonData.Get("authenticationType").MustString() authenticationType := e.dsInfo.JsonData.Get("authenticationType").MustString("jwt")
if authenticationType == "gce" { if authenticationType == "gce" {
defaultProject, err := e.getDefaultProject(ctx) defaultProject, err := e.getDefaultProject(ctx)
if err != nil { if err != nil {