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

stackdriver: wip - remove debug code

Browse Source
This commit is contained in:
Erik Sundell 2018-10-09 16:28:04 +02:00
parent aa2e64e160
commit 823838a839
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,9 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
} }
} }
gceAutoAuthentication := ds.JsonData.Get("gceAutomaticAuthentication").MustBool() authenticationType := ds.JsonData.Get("authenticationType").MustString()
logger.Info("gceAutoAuthentication", "gceAutoAuthentication", gceAutoAuthentication) if route.JwtTokenAuth != nil && authenticationType == "jwt" {
if route.JwtTokenAuth != nil && !gceAutoAuthentication { logger.Info("authenticationType", "authenticationType", "jwt")
if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil { if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil {
logger.Error("Failed to get access token", "error", err) logger.Error("Failed to get access token", "error", err)
} else { } else {
@ -65,7 +65,8 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
} }
} }
if gceAutoAuthentication && route.JwtTokenAuth == nil { if authenticationType == "gce" {
logger.Info("authenticationType", "authenticationType", "gce")
tokenSrc, err := google.DefaultTokenSource(ctx, route.JwtTokenAuth.Scopes...) tokenSrc, err := google.DefaultTokenSource(ctx, route.JwtTokenAuth.Scopes...)
if err != nil { if err != nil {
logger.Error("Failed to get default token from meta data server", "error", err) logger.Error("Failed to get default token from meta data server", "error", err)

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

@ -17,8 +17,8 @@ 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) {
gceAutomaticAuthentication := e.dsInfo.JsonData.Get("gceAutomaticAuthentication").MustBool() authenticationType := e.dsInfo.JsonData.Get("authenticationType").MustString()
if gceAutomaticAuthentication { if authenticationType == "gce" {
defaultProject, err := e.getDefaultProject(ctx) defaultProject, err := e.getDefaultProject(ctx)
if err != nil { if err != nil {
return nil, err return nil, err