updated admin base url with custom endpoint for emulator use

callmehiphop · callmehiphop · commit f741be27046f · 2016-09-19T13:57:31.000-04:00
diff --git a/packages/bigtable/src/index.js b/packages/bigtable/src/index.js
@@ -292,22 +292,22 @@ function Bigtable(options) {
     return new Bigtable(options);
   }
 
+  var baseUrl = 'bigtable.googleapis.com';
   var adminBaseUrl = 'bigtableadmin.googleapis.com';
 
-  var customEndpoint = is.defined(options.apiEndpoint) ||
-    is.defined(process.env.BIGTABLE_EMULATOR_HOST);
-
-  var baseUrl = 'bigtable.googleapis.com';
+  var customEndpoint = options.apiEndpoint ||
+    process.env.BIGTABLE_EMULATOR_HOST;
 
   if (customEndpoint) {
-    baseUrl = options.apiEndpoint || process.env.BIGTABLE_EMULATOR_HOST;
+    baseUrl = customEndpoint;
+    adminBaseUrl = baseUrl;
   }
 
   var config = {
     baseUrl: baseUrl,
     service: 'bigtable',
     apiVersion: 'v2',
-    customEndpoint: customEndpoint,
+    customEndpoint: !!customEndpoint,
     protoServices: {
       Bigtable: googleProtoFiles.bigtable.v2,
       BigtableTableAdmin: {
diff --git a/packages/bigtable/test/index.js b/packages/bigtable/test/index.js
@@ -19,6 +19,7 @@
 var assert = require('assert');
 var extend = require('extend');
 var googleProtoFiles = require('google-proto-files');
+var is = require('is');
 var nodeutil = require('util');
 var proxyquire = require('proxyquire');
 var sinon = require('sinon').sandbox.create();
@@ -157,6 +158,16 @@ describe('Bigtable', function() {
       var calledWith = bigtable.calledWith_[0];
       assert.strictEqual(calledWith.baseUrl, endpoint);
       assert.strictEqual(calledWith.customEndpoint, true);
+
+      Object.keys(calledWith.protoServices).forEach(function(service) {
+        service = calledWith.protoServices[service];
+
+        if (is.object(service)) {
+          assert.strictEqual(service.baseUrl, endpoint);
+        }
+      });
+
+      delete process.env.BIGTABLE_EMULATOR_HOST;
     });
 
     it('should work with a custom apiEndpoint', function() {
@@ -170,6 +181,14 @@ describe('Bigtable', function() {
       var calledWith = bigtable.calledWith_[0];
       assert.strictEqual(calledWith.baseUrl, options.apiEndpoint);
       assert.strictEqual(calledWith.customEndpoint, true);
+
+      Object.keys(calledWith.protoServices).forEach(function(service) {
+        service = calledWith.protoServices[service];
+
+        if (is.object(service)) {
+          assert.strictEqual(service.baseUrl, options.apiEndpoint);
+        }
+      });
     });
 
     it('should set the projectName', function() {
