fix(deps): upgrade to google-gax 1.x (#651)

googleapis · Jul 8, 2019 · a32e838 · a32e838
1 parent 6705517
commit a32e838
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -63,7 +63,9 @@
     "events-intercept": "^2.0.0",
     "extend": "^3.0.1",
     "google-auth-library": "^4.0.0",
-    "google-gax": "^0.26.0",
+    "google-gax": "^1.0.0",
+    "grpc": "^1.21.1",
+    "grpc-gcp": "^0.1.1",
     "is": "^3.2.1",
     "lodash.snakecase": "^4.1.1",
     "merge-stream": "^2.0.0",

diff --git a/src/index.ts b/src/index.ts
@@ -36,6 +36,13 @@ import {Table} from './table';
 import {PartitionedDml, Snapshot, Transaction} from './transaction';
 import {GrpcClientOptions} from 'google-gax';
 import {ChannelCredentials} from 'grpc';
+import {
+  createGcpApiConfig,
+  gcpCallInvocationTransformer,
+  gcpChannelFactoryOverride,
+} from 'grpc-gcp';
+
+const grpc = require('grpc');
 
 // Import the clients for each version supported by this package.
 const gapic = Object.freeze({
@@ -212,18 +219,19 @@ class Spanner extends Service {
         }
       }
     }
-    options = extend(
+    options = (Object.assign(
       {
         libName: 'gccl',
         libVersion: require('../../package.json').version,
         scopes,
+        // Enable grpc-gcp support
+        'grpc.callInvocationTransformer': gcpCallInvocationTransformer,
+        'grpc.channelFactoryOverride': gcpChannelFactoryOverride,
+        'grpc.gcpApiConfig': createGcpApiConfig(gcpApiConfig),
+        grpc,
       },
       options || {}
-    );
-
-    // Enable grpc-gcp support
-    options = Object.assign({'grpc_gcp.apiConfig': gcpApiConfig}, options);
-
+    ) as {}) as SpannerOptions;
     const config = ({
       baseUrl:
         options.apiEndpoint ||

diff --git a/test/index.ts b/test/index.ts
@@ -28,6 +28,8 @@ import * as pfy from '@google-cloud/promisify';
 import * as sinon from 'sinon';
 import * as spnr from '../src';
 
+const grpc = require('grpc');
+
 const apiConfig = require('../src/spanner_grpc_config.json');
 
 function getFake(obj: {}) {
@@ -49,6 +51,16 @@ function fakeReplaceProjectIdToken(...args) {
   );
 }
 
+const fakeGrpcGcp = {
+  gcpChannelFactoryOverride: {},
+  gcpCallInvocationTransformer: {},
+  createGcpApiConfig: apiConfig => {
+    return {
+      calledWith_: apiConfig,
+    };
+  },
+};
+
 const fakePaginator = {
   paginator: {
     streamify(methodName) {
@@ -146,6 +158,7 @@ describe('Spanner', () => {
       'google-auth-library': {
         GoogleAuth: fakeGoogleAuth,
       },
+      'grpc-gcp': fakeGrpcGcp,
       './codec.js': {codec: fakeCodec},
       './instance.js': {Instance: FakeInstance},
       './v1': fakeV1,
@@ -170,6 +183,19 @@ describe('Spanner', () => {
   afterEach(() => sandbox.restore());
 
   describe('instantiation', () => {
+    const EXPECTED_OPTIONS = extend({}, OPTIONS, {
+      libName: 'gccl',
+      libVersion: require('../../package.json').version,
+      scopes: [],
+      grpc,
+      'grpc.callInvocationTransformer':
+        fakeGrpcGcp.gcpCallInvocationTransformer,
+      'grpc.channelFactoryOverride': fakeGrpcGcp.gcpChannelFactoryOverride,
+      'grpc.gcpApiConfig': {
+        calledWith_: apiConfig,
+      },
+    });
+
     it('should localize a cached gapic client map', () => {
       assert(spanner.clients_ instanceof Map);
       assert.strictEqual(spanner.clients_.size, 0);
@@ -189,16 +215,9 @@ describe('Spanner', () => {
     });
 
     it('should create an auth instance from google-auth-library', () => {
-      const expectedOptions = extend({}, OPTIONS, {
-        libName: 'gccl',
-        libVersion: require('../../package.json').version,
-        scopes: [],
-        'grpc_gcp.apiConfig': apiConfig,
-      });
-
       assert.deepStrictEqual(
         getFake(spanner.auth).calledWith_[0],
-        expectedOptions
+        EXPECTED_OPTIONS
       );
     });
 
@@ -210,11 +229,8 @@ describe('Spanner', () => {
 
       const spanner = new Spanner(OPTIONS);
 
-      const expectedOptions = extend({}, OPTIONS, {
-        libName: 'gccl',
-        libVersion: require('../../package.json').version,
+      const expectedOptions = extend({}, EXPECTED_OPTIONS, {
         scopes: expectedScopes,
-        'grpc_gcp.apiConfig': apiConfig,
       });
 
       assert.deepStrictEqual(
@@ -242,15 +258,7 @@ describe('Spanner', () => {
         packageJson: require('../../package.json'),
       });
 
-      assert.deepStrictEqual(
-        options,
-        extend({}, OPTIONS, {
-          libName: 'gccl',
-          libVersion: require('../../package.json').version,
-          scopes: [],
-          'grpc_gcp.apiConfig': apiConfig,
-        })
-      );
+      assert.deepStrictEqual(options, EXPECTED_OPTIONS);
     });
 
     it('should optionally accept a servicePath', () => {