prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use new oauth2 package

Browse Source 
Fixes #608
This commit is contained in:
kargakis 2015-03-23 17:40:01 +01:00
parent ee9dd8abdb
commit 3ccd56d848
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
storage/bigquery/client/client.go
View File

@ -18,12 +18,11 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http"
"strings" "strings"
"code.google.com/p/goauth2/oauth"
"code.google.com/p/goauth2/oauth/jwt"
bigquery "code.google.com/p/google-api-go-client/bigquery/v2" bigquery "code.google.com/p/google-api-go-client/bigquery/v2"
"golang.org/x/oauth2"
"golang.org/x/oauth2/jwt"
) )
var ( var (
@ -42,13 +41,13 @@ const (
type Client struct { type Client struct {
service *bigquery.Service service *bigquery.Service
token *oauth.Token token *oauth2.Token
datasetId string datasetId string
tableId string tableId string
} }
// Helper method to create an authenticated connection. // Helper method to create an authenticated connection.
func connect() (*oauth.Token, *bigquery.Service, error) { func connect() (*oauth2.Token, *bigquery.Service, error) {
if *clientId == "" { if *clientId == "" {
return nil, nil, fmt.Errorf("no client id specified") return nil, nil, fmt.Errorf("no client id specified")
} }
@ -67,25 +66,30 @@ func connect() (*oauth.Token, *bigquery.Service, error) {
return nil, nil, fmt.Errorf("could not access credential file %v - %v", pemFile, err) return nil, nil, fmt.Errorf("could not access credential file %v - %v", pemFile, err)
} }
t := jwt.NewToken(*serviceAccount, authScope, pemBytes) jwtConfig := &jwt.Config{
token, err := t.Assert(&http.Client{}) Email: *serviceAccount,
Scopes: []string{authScope},
PrivateKey: pemBytes,
TokenURL: "https://accounts.google.com/o/oauth2/token",
}
token, err := jwtConfig.TokenSource(oauth2.NoContext).Token()
if err != nil { if err != nil {
fmt.Printf("Invalid token: %v\n", err)
return nil, nil, err return nil, nil, err
} }
config := &oauth.Config{ if !token.Valid() {
ClientId: *clientId, return nil, nil, fmt.Errorf("invalid token for BigQuery oauth")
ClientSecret: *clientSecret,
Scope: authScope,
AuthURL: "https://accounts.google.com/o/oauth2/auth",
TokenURL: "https://accounts.google.com/o/oauth2/token",
} }
transport := &oauth.Transport{ config := &oauth2.Config{
Token: token, ClientID: *clientId,
Config: config, ClientSecret: *clientSecret,
Scopes: []string{authScope},
Endpoint: oauth2.Endpoint{
AuthURL: "https://accounts.google.com/o/oauth2/auth",
TokenURL: "https://accounts.google.com/o/oauth2/token",
},
} }
client := transport.Client() client := config.Client(oauth2.NoContext, token)
service, err := bigquery.New(client) service, err := bigquery.New(client)
if err != nil { if err != nil {
@ -122,7 +126,7 @@ func (c *Client) getService() (*bigquery.Service, error) {
} }
// Refresh expired token. // Refresh expired token.
if c.token.Expired() { if !c.token.Valid() {
token, service, err := connect() token, service, err := connect()
if err != nil { if err != nil {
return nil, err return nil, err