From 89a030c00a3d4f26ebafe9db4ceff1a064f64cd0 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 5 Oct 2020 14:58:55 -0700
Subject: [PATCH] tests: Update google-auth-library dependency from 0.9 to 6.1

---
 test/interop/interop_client.js | 64 ++++++++++------------------------
 test/package.json              |  2 +-
 2 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/test/interop/interop_client.js b/test/interop/interop_client.js
index 1c2ec8f3..0b177e53 100644
--- a/test/interop/interop_client.js
+++ b/test/interop/interop_client.js
@@ -22,7 +22,8 @@ var fs = require('fs');
 var path = require('path');
 var grpc = require('../any_grpc').client;
 var protoLoader = require('../../packages/proto-loader');
-var GoogleAuth = require('google-auth-library');
+
+const { GoogleAuth } = require('google-auth-library');
 
 var protoPackage = protoLoader.loadSync(
     'src/proto/grpc/testing/test.proto',
@@ -463,60 +464,31 @@ function oauth2Test(client, done, extra) {
 }
 
 function perRpcAuthTest(client, done, extra) {
-  (new GoogleAuth()).getApplicationDefault(function(err, credential) {
+  const creds = grpc.credentials.createFromGoogleCredential(new GoogleAuth({scopes: extra.oauth_scope}));
+  client.unaryCall(arg, {credentials: creds}, function(err, resp) {
     assert.ifError(err);
-    var arg = {
-      fill_username: true,
-      fill_oauth_scope: true
-    };
-    var scope = extra.oauth_scope;
-    if (credential.createScopedRequired() && scope) {
-      credential = credential.createScoped(scope);
+    assert.strictEqual(resp.username, SERVICE_ACCOUNT_EMAIL);
+    assert(extra.oauth_scope.indexOf(resp.oauth_scope) > -1);
+    if (done) {
+      done();
     }
-    var creds = grpc.credentials.createFromGoogleCredential(credential);
-    client.unaryCall(arg, {credentials: creds}, function(err, resp) {
-      assert.ifError(err);
-      assert.strictEqual(resp.username, SERVICE_ACCOUNT_EMAIL);
-      assert(extra.oauth_scope.indexOf(resp.oauth_scope) > -1);
-      if (done) {
-        done();
-      }
-    });
   });
 }
 
 function getApplicationCreds(scope, callback) {
-  (new GoogleAuth()).getApplicationDefault(function(err, credential) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    if (credential.createScopedRequired() && scope) {
-      credential = credential.createScoped(scope);
-    }
-    callback(null, grpc.credentials.createFromGoogleCredential(credential));
-  });
+  callback(null, grpc.credentials.createFromGoogleCredential(new GoogleAuth({scopes: scope})));
 }
 
 function getOauth2Creds(scope, callback) {
-  (new GoogleAuth()).getApplicationDefault(function(err, credential) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    credential = credential.createScoped(scope);
-    credential.getAccessToken(function(err, token) {
-      if (err) {
-        callback(err);
-        return;
-      }
-      var updateMd = function(service_url, callback) {
-        var metadata = new grpc.Metadata();
-        metadata.add('authorization', 'Bearer ' + token);
-        callback(null, metadata);
-      };
-      callback(null, grpc.credentials.createFromMetadataGenerator(updateMd));
-    });
+  (new GoogleAuth()).getAccessToken().then((token) => {
+    var updateMd = function(service_url, callback) {
+      var metadata = new grpc.Metadata();
+      metadata.add('authorization', 'Bearer ' + token);
+      callback(null, metadata);
+    };
+    callback(null, grpc.credentials.createFromMetadataGenerator(updateMd));
+  }, (error) => {
+    callback(error);
   });
 }
 
diff --git a/test/package.json b/test/package.json
index 2867bc77..4f42f7bf 100644
--- a/test/package.json
+++ b/test/package.json
@@ -15,7 +15,7 @@
   ],
   "dependencies": {
     "express": "^4.16.3",
-    "google-auth-library": "^0.9.2",
+    "google-auth-library": "^6.1.0",
     "grpc": "^1.24.2",
     "lodash": "^4.17.4",
     "poisson-process": "^1.0.0"