Kaynağa Gözat

stackdriver: wip - add scope and remove debug code

Erik Sundell 7 yıl önce
ebeveyn
işleme
2002162073
1 değiştirilmiş dosya ile 1 ekleme ve 19 silme
  1. 1 19
      pkg/api/pluginproxy/ds_auth_provider.go

+ 1 - 19
pkg/api/pluginproxy/ds_auth_provider.go

@@ -64,7 +64,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
 	}
 
 	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()
 		if projectName == "" {
 			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())
 
 }