public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stackdriver: wip - always use gce default account for stackdriver

Browse Source
This commit is contained in:
Erik Sundell
2018-10-03 21:48:20 +02:00
parent 2002162073
commit b2de0d8c3e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/pluginproxy/ds_auth_provider.go
+8 -8
View File
@@ -55,15 +55,15 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
}
}
if route.JwtTokenAuth != nil && len(ds.SecureJsonData["privateKey"]) != 0 {
if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil {
logger.Error("Failed to get access token", "error", err)
} else {
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
}
}
// if route.JwtTokenAuth != nil && len(ds.SecureJsonData["privateKey"]) != 0 {
// if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil {
// logger.Error("Failed to get access token", "error", err)
// } else {
// req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
// }
// }
if req.Header.Get("Authorization") == "" && ds.Type == "stackdriver" {
if ds.Type == "stackdriver" {
defaultCredentials, err := google.FindDefaultCredentials(ctx, "https://www.googleapis.com/auth/monitoring.read")
projectName := ds.JsonData.Get("defaultProject").MustString()
if projectName == "" {