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 - add scope and remove debug code

Browse Source
This commit is contained in:
Erik Sundell 2018-10-03 21:37:00 +02:00
parent df215d9d09
commit 2002162073
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
} }
if req.Header.Get("Authorization") == "" && ds.Type == "stackdriver" { if req.Header.Get("Authorization") == "" && ds.Type == "stackdriver" {
defaultCredentials, err := google.FindDefaultCredentials(ctx) defaultCredentials, err := google.FindDefaultCredentials(ctx, "https://www.googleapis.com/auth/monitoring.read")
projectName := ds.JsonData.Get("defaultProject").MustString() projectName := ds.JsonData.Get("defaultProject").MustString()
if projectName == "" { if projectName == "" {
ds.JsonData.Set("defaultProject", defaultCredentials.ProjectID) ds.JsonData.Set("defaultProject", defaultCredentials.ProjectID)
@ -81,24 +81,6 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
} }
} }
if req.Header.Get("Authorization") == "" && ds.Type == "stackdriver" {
credentials, err := google.FindDefaultCredentials(ctx, "https://www.googleapis.com/auth/monitoring.read")
projectName := ds.JsonData.Get("defaultProject").MustString()
if projectName == "" {
ds.JsonData.Set("defaultProject", credentials.ProjectID)
}
if err != nil {
logger.Error("Failed to get access token", "error", err)
} else {
token, err := credentials.TokenSource.Token()
if err != nil {
logger.Error("Failed to get access token", "error", err)
} else {
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
}
}
}
logger.Info("Requesting", "url", req.URL.String()) logger.Info("Requesting", "url", req.URL.String())
} }