Merge branch 'httpclient'

google/appenginevm.go

@@ -16,7 +16,7 @@ import (
 // AppEngineConfig represents a configuration for an
 // App Engine application's Google service account.
 type AppEngineConfig struct {
-	// Transport is the round tripper to be used
+	// Transport is the http.RoundTripper to be used
 	// to construct new oauth2.Transport instances from
 	// this configuration.
 	Transport http.RoundTripper
@@ -29,16 +29,15 @@ type AppEngineConfig struct {
 // provided auth scopes.
 func NewAppEngineConfig(context appengine.Context, scopes []string) *AppEngineConfig {
 	return &AppEngineConfig{
-		Transport: http.DefaultTransport,
-		context:   context,
-		scopes:    scopes,
+		context: context,
+		scopes:  scopes,
 	}
 }
 
 // NewTransport returns a transport that authorizes
 // the requests with the application's service account.
 func (c *AppEngineConfig) NewTransport() *oauth2.Transport {
-	return oauth2.NewTransport(c.Transport, c, nil)
+	return oauth2.NewTransport(c.transport(), c, nil)
 }
 
 // FetchToken fetches a new access token for the provided scopes.
@@ -52,3 +51,10 @@ func (c *AppEngineConfig) FetchToken(existing *oauth2.Token) (*oauth2.Token, err
 		Expiry:      expiry,
 	}, nil
 }
+
+func (c *AppEngineConfig) transport() http.RoundTripper {
+	if c.Transport != nil {
+		return c.Transport
+	}
+	return http.DefaultTransport
+}