@@ -7,16 +7,15 @@ package grafana
77
88import (
99 "context"
10- "fmt"
1110 "strings"
1211
12+ "github.com/cockroachdb/cockroach/pkg/roachprod/promhelperclient"
1313 "github.com/cockroachdb/cockroach/pkg/roachprod/roachprodutil"
1414 "github.com/cockroachdb/cockroach/pkg/util/httputil"
1515 "github.com/cockroachdb/errors"
1616 "github.com/go-openapi/strfmt"
1717 grafana "github.com/grafana/grafana-openapi-client-go/client"
1818 "github.com/grafana/grafana-openapi-client-go/models"
19- "google.golang.org/api/idtoken"
2019)
2120
2221// newGrafanaClient is a helper function that creates an HTTP client to
@@ -26,30 +25,37 @@ import (
2625func newGrafanaClient (
2726 ctx context.Context , host string , secure bool ,
2827) (* grafana.GrafanaHTTPAPI , error ) {
29- headers := map [string ]string {}
3028 scheme := "http"
3129
30+ // Use the default HTTP client for unsecure Grafana calls.
31+ grafanaHttpClient := httputil .DefaultClient .Client
32+
3233 if secure {
3334 scheme = "https"
3435
35- // Read in the service account key and audience, so we can retrieve the identity token.
36- if _ , err := roachprodutil . SetServiceAccountCredsEnv ( ctx , false ); err != nil {
37- return nil , err
38- }
39-
40- token , err := roachprodutil . GetServiceAccountToken ( ctx , idtoken . NewTokenSource )
36+ // Grafana annotations currently use the same service account
37+ // and OAuth client ID as the prometheus helper service.
38+ iapTokenSource , err := roachprodutil . NewIAPTokenSource (roachprodutil. IAPTokenSourceOptions {
39+ OAuthClientID : promhelperclient . OAuthClientID ,
40+ ServiceAccountEmail : promhelperclient . ServiceAccountEmail ,
41+ } )
4142 if err != nil {
4243 return nil , err
4344 }
44- headers ["Authorization" ] = fmt .Sprintf ("Bearer %s" , token )
45+
46+ // Override the default HTTP client with the one
47+ // that has the IAP token source.
48+ grafanaHttpClient = iapTokenSource .GetHTTPClient ()
4549 }
4650
47- headers [httputil .ContentTypeHeader ] = httputil .JSONContentType
4851 cfg := & grafana.TransportConfig {
49- Host : host ,
50- BasePath : "/api" ,
51- Schemes : []string {scheme },
52- HTTPHeaders : headers ,
52+ Host : host ,
53+ BasePath : "/api" ,
54+ Schemes : []string {scheme },
55+ HTTPHeaders : map [string ]string {
56+ httputil .ContentTypeHeader : httputil .JSONContentType ,
57+ },
58+ Client : grafanaHttpClient ,
5359 }
5460
5561 return grafana .NewHTTPClientWithConfig (strfmt .Default , cfg ), nil
0 commit comments