Merge pull request #2116 from dgageot/1628-oauth2

Move `goauth2/oauth` dependency to `golang.org/x/oauth2`
docker · Nov 4, 2015 · 34ee11e · 34ee11e
2 parents 0836929 + f3c5f05
commit 34ee11e
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 1,954 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go
@@ -5,13 +5,13 @@ import (
 	"io/ioutil"
 	"time"
 
-	"code.google.com/p/goauth2/oauth"
 	"github.com/digitalocean/godo"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnflag"
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/docker/machine/libmachine/state"
+	"golang.org/x/oauth2"
 )
 
 type Driver struct {
@@ -293,11 +293,11 @@ func (d *Driver) Kill() error {
 }
 
 func (d *Driver) getClient() *godo.Client {
-	t := &oauth.Transport{
-		Token: &oauth.Token{AccessToken: d.AccessToken},
-	}
+	token := &oauth2.Token{AccessToken: d.AccessToken}
+	tokenSource := oauth2.StaticTokenSource(token)
+	client := oauth2.NewClient(oauth2.NoContext, tokenSource)
 
-	return godo.NewClient(t.Client())
+	return godo.NewClient(client)
 }
 
 func (d *Driver) publicSSHKeyPath() string {

diff --git a/vendor/code.google.com/p/goauth2/oauth/example/oauthreq.go b/vendor/code.google.com/p/goauth2/oauth/example/oauthreq.go
diff --git a/vendor/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json b/vendor/code.google.com/p/goauth2/oauth/jwt/example/example.client_secrets.json
diff --git a/vendor/code.google.com/p/goauth2/oauth/jwt/example/example.pem b/vendor/code.google.com/p/goauth2/oauth/jwt/example/example.pem
diff --git a/vendor/code.google.com/p/goauth2/oauth/jwt/example/main.go b/vendor/code.google.com/p/goauth2/oauth/jwt/example/main.go