public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Use new oauth2 golang library

Browse Source
This commit is contained in:
Dave Cunningham 2015-02-11 21:21:24 -05:00
parent 4d666a6dc4
commit 1ef2cf1610
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
config.go
View File

@ -8,14 +8,12 @@ import (
"os"
"code.google.com/p/google-api-go-client/compute/v1"
// oauth2 "github.com/rasa/oauth2-fork-b3f9a68"
"github.com/golang/oauth2"
// oauth2 "github.com/rasa/oauth2-fork-b3f9a68/google"
"github.com/golang/oauth2/google"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"golang.org/x/oauth2/jwt"
)
const clientScopes string = "https://www.googleapis.com/auth/compute"
// Config is the configuration structure used to instantiate the Google
// provider.
@ -41,8 +39,7 @@ func (c *Config) loadAndValidate() error {
c.Region = os.Getenv("GOOGLE_REGION")
}
var f *oauth2.Options
var err error
var client *http.Client
if c.AccountFile != "" {
if err := loadJSON(&account, c.AccountFile); err != nil {
@ -52,29 +49,42 @@ func (c *Config) loadAndValidate() error {
err)
}
clientScopes := []string{"https://www.googleapis.com/auth/compute"}
// Get the token for use in our requests
log.Printf("[INFO] Requesting Google token...")
log.Printf("[INFO] -- Email: %s", account.ClientEmail)
log.Printf("[INFO] -- Scopes: %s", clientScopes)
log.Printf("[INFO] -- Private Key Length: %d", len(account.PrivateKey))
f, err = oauth2.New(
oauth2.JWTClient(account.ClientEmail, []byte(account.PrivateKey)),
oauth2.Scope(clientScopes),
google.JWTEndpoint())
conf := jwt.Config{
Email: account.ClientEmail,
PrivateKey: []byte(account.PrivateKey),
Scopes: clientScopes,
TokenURL: "https://accounts.google.com/o/oauth2/token",
}
// Initiate an http.Client. The following GET request will be
// authorized and authenticated on the behalf of
// your service account.
client = conf.Client(oauth2.NoContext)
} else {
log.Printf("[INFO] Requesting Google token via GCE Service Role...")
f, err = oauth2.New(google.ComputeEngineAccount(""))
client = &http.Client{
Transport: &oauth2.Transport{
// Fetch from Google Compute Engine's metadata server to retrieve
// an access token for the provided account.
// If no account is specified, "default" is used.
Source: google.ComputeTokenSource(""),
},
}
}
if err != nil {
return fmt.Errorf("Error retrieving auth token: %s", err)
}
log.Printf("[INFO] Instantiating GCE client...")
c.clientCompute, err = compute.New(&http.Client{Transport: f.NewTransport()})
var err error
c.clientCompute, err = compute.New(client)
if err != nil {
return err
}