support PUBSUB_EMULATOR_HOST

Author: stephenplusplus

lib/common/grpc-service.js

@@ -143,6 +143,10 @@ function GrpcService(config, options) {
   var apiVersion = config.apiVersion;
   var rootDir = googleProtoFiles('..');
 
+  if (config.customEndpoint) {
+    this.grpcCredentials = grpc.credentials.createInsecure();
+  }
+
   this.protoOpts = config.proto;
   this.proto = grpc.load({
     root: rootDir,

lib/pubsub/index.js

@@ -585,20 +585,19 @@ PubSub.prototype.topic = function(name) {
  */
 PubSub.prototype.determineBaseUrl_ = function() {
   var baseUrl;
+  var leadingProtocol = new RegExp('^https*://');
   var trailingSlashes = new RegExp('/*$');
 
   if (process.env.PUBSUB_EMULATOR_HOST) {
-    baseUrl = process.env.PUBSUB_EMULATOR_HOST;
     this.customEndpoint = true;
+    baseUrl = process.env.PUBSUB_EMULATOR_HOST;
   } else {
-    baseUrl = 'https://pubsub.googleapis.com';
-  }
-
-  if (baseUrl.indexOf('http') !== 0) {
-    baseUrl = 'http://' + baseUrl;
+    baseUrl = 'pubsub.googleapis.com';
   }
 
-  this.baseUrl = baseUrl.replace(trailingSlashes, '');
+  this.baseUrl = baseUrl
+    .replace(leadingProtocol, '')
+    .replace(trailingSlashes, '');
 };
 
 /*! Developer Documentation

test/common/grpc-service.js

@@ -56,6 +56,12 @@ var fakeGrpc = {
         name: 'createFromGoogleCredential',
         args: arguments
       };
+    },
+    createInsecure: function() {
+      return {
+        name: 'createInsecure',
+        args: arguments
+      };
     }
   }
 };
@@ -139,6 +145,12 @@ describe('GrpcService', function() {
       new GrpcService(CONFIG, OPTIONS);
     });
 
+    it('should set insecure credentials if using customEndpoint', function() {
+      var config = extend({}, CONFIG, { customEndpoint: true });
+      var grpcService = new GrpcService(config, OPTIONS);
+      assert.strictEqual(grpcService.grpcCredentials.name, 'createInsecure');
+    });
+
     it('should call grpc.load correctly', function(done) {
       grpcLoadOverride = function(opts) {
         assert.strictEqual(opts.root, ROOT_DIR);

test/pubsub/index.js

@@ -127,12 +127,12 @@ describe('PubSub', function() {
       ]);
     });
 
-    it('should use the PUBSUB_HOST env var', function() {
+    it('should use the PUBSUB_EMULATOR_HOST env var', function() {
       var pubSubHost = 'pubsub-host';
-      process.env.PUBSUB_HOST = pubSubHost;
+      process.env.PUBSUB_EMULATOR_HOST = pubSubHost;
 
       var pubsub = new PubSub({ projectId: 'project-id' });
-      delete process.env.PUBSUB_HOST;
+      delete process.env.PUBSUB_EMULATOR_HOST;
 
       var calledWith = pubsub.calledWith_[0];
       assert.strictEqual(calledWith.baseUrl, pubSubHost);
@@ -719,29 +719,33 @@ describe('PubSub', function() {
       delete process.env.PUBSUB_EMULATOR_HOST;
     });
 
-    it('should default to pubsub.googleapis.com/v1', function() {
+    it('should default to pubsub.googleapis.com', function() {
       pubsub.determineBaseUrl_();
 
-      var expectedBaseUrl = 'https://pubsub.googleapis.com/v1';
+      var expectedBaseUrl = 'pubsub.googleapis.com';
       assert.strictEqual(pubsub.baseUrl, expectedBaseUrl);
     });
 
     it('should remove slashes from the baseUrl', function() {
-      var expectedBaseUrl = 'http://localhost:8080';
+      var expectedBaseUrl = 'localhost:8080';
 
-      setHost('http://localhost:8080/');
+      setHost('localhost:8080/');
       pubsub.determineBaseUrl_();
       assert.strictEqual(pubsub.baseUrl, expectedBaseUrl);
 
-      setHost('http://localhost:8080//');
+      setHost('localhost:8080//');
       pubsub.determineBaseUrl_();
       assert.strictEqual(pubsub.baseUrl, expectedBaseUrl);
     });
 
-    it('should default to http if protocol is unspecified', function() {
-      setHost('localhost:8080');
+    it('should remove the protocol if specified', function() {
+      setHost('http://localhost:8080');
+      pubsub.determineBaseUrl_();
+      assert.strictEqual(pubsub.baseUrl, 'localhost:8080');
+
+      setHost('https://localhost:8080');
       pubsub.determineBaseUrl_();
-      assert.strictEqual(pubsub.baseUrl, 'http://localhost:8080');
+      assert.strictEqual(pubsub.baseUrl, 'localhost:8080');
     });
 
     it('should not set customEndpoint when using default endpoint', function() {
@@ -751,7 +755,7 @@ describe('PubSub', function() {
     });
 
     describe('with PUBSUB_EMULATOR_HOST environment variable', function() {
-      var PUBSUB_EMULATOR_HOST = 'http://localhost:9090';
+      var PUBSUB_EMULATOR_HOST = 'localhost:9090';
 
       beforeEach(function() {
         setHost(PUBSUB_EMULATOR_HOST);