From 5c8973eeac2e95e888a359acbfba5f67b0a3ee31 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 7 Sep 2017 09:17:24 -0400 Subject: [PATCH] pubsub: set sslCreds when apiEndpoint is used (#2583) --- packages/pubsub/src/index.js | 2 ++ packages/pubsub/test/index.js | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/packages/pubsub/src/index.js b/packages/pubsub/src/index.js index e70bc171d63..4ab7b04e7c9 100644 --- a/packages/pubsub/src/index.js +++ b/packages/pubsub/src/index.js @@ -23,6 +23,7 @@ var common = require('@google-cloud/common'); var extend = require('extend'); var googleAuth = require('google-auto-auth'); +var grpc = require('grpc'); var is = require('is'); var PKG = require('../package.json'); @@ -291,6 +292,7 @@ PubSub.prototype.determineBaseUrl_ = function() { this.options.servicePath = baseUrlParts[0]; this.options.port = baseUrlParts[1]; + this.options.sslCreds = grpc.credentials.createInsecure(); }; /** diff --git a/packages/pubsub/test/index.js b/packages/pubsub/test/index.js index a7fc25c9d67..017d587d67f 100644 --- a/packages/pubsub/test/index.js +++ b/packages/pubsub/test/index.js @@ -19,12 +19,15 @@ var arrify = require('arrify'); var assert = require('assert'); var extend = require('extend'); +var grpc = require('grpc'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; var PKG = require('../package.json'); var v1 = require('../src/v1/index.js'); +var fakeGrpc = extend({}, grpc); + var SubscriptionCached = require('../src/subscription.js'); var SubscriptionOverride; @@ -122,6 +125,7 @@ describe('PubSub', function() { util: fakeUtil }, 'google-auto-auth': fakeGoogleAutoAuth, + grpc: fakeGrpc, './snapshot.js': FakeSnapshot, './subscription.js': Subscription, './topic.js': FakeTopic, @@ -604,12 +608,18 @@ describe('PubSub', function() { var defaultBaseUrl_ = 'defaulturl'; var testingUrl = 'localhost:8085'; + var fakeCreds = {}; + fakeGrpc.credentials.createInsecure = function() { + return fakeCreds; + }; + setHost(defaultBaseUrl_); pubsub.options.apiEndpoint = testingUrl; pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, '8085'); + assert.strictEqual(pubsub.options.sslCreds, fakeCreds); }); it('should remove slashes from the baseUrl', function() {