From 32444cd24d01805b739e3436d974fccf2b2772b7 Mon Sep 17 00:00:00 2001
From: yangzhouhan <yangzhouhan@gmail.com>
Date: Fri, 14 Aug 2015 11:35:15 -0700
Subject: [PATCH] minor changes

---
 credentials/oauth/oauth.go | 7 +------
 interop/client/client.go   | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/credentials/oauth/oauth.go b/credentials/oauth/oauth.go
index 01a17188..28ed0c39 100644
--- a/credentials/oauth/oauth.go
+++ b/credentials/oauth/oauth.go
@@ -61,7 +61,6 @@ func (ts TokenSource) GetRequestMetadata(ctx context.Context) (map[string]string
 	}, nil
 }
 
-// jwtAccess creates a JWT and send as the access token.
 type jwtAccess struct {
 	ts oauth2.TokenSource
 }
@@ -71,11 +70,7 @@ func NewJWTAccessFromFile(keyFile string, audience string) (credentials.Credenti
 	if err != nil {
 		return nil, fmt.Errorf("credentials: failed to read the service account key file: %v", err)
 	}
-	ts, err := google.JWTAccessTokenSourceFromJSON(jsonKey, audience)
-	if err != nil {
-		return nil, err
-	}
-	return jwtAccess{ts: ts}, nil
+	return NewJWTAccessFromKey(jsonKey, audience)
 }
 
 func NewJWTAccessFromKey(jsonKey []byte, audience string) (credentials.Credentials, error) {
diff --git a/interop/client/client.go b/interop/client/client.go
index 865bcb34..122261d9 100644
--- a/interop/client/client.go
+++ b/interop/client/client.go
@@ -480,7 +480,7 @@ func main() {
 		doServiceAccountCreds(tc)
 	case "jwt_token_creds":
 		if !*useTLS {
-			grpclog.Fatalf("TLS is not enabled. TLS is required to execute service_account_creds test case.")
+			grpclog.Fatalf("TLS is not enabled. TLS is required to execute jwt_token_creds test case.")
 		}
 		doJWTTokenCreds(tc)
 	case "cancel_after_begin":