Skip to content

Commit a5a0523

Browse files
callmehiphopstephenplusplus
authored andcommitted
pubsub: set sslCreds when apiEndpoint is used (#2583)
1 parent 2515cdd commit a5a0523

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

handwritten/pubsub/src/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
var common = require('@google-cloud/common');
2424
var extend = require('extend');
2525
var googleAuth = require('google-auto-auth');
26+
var grpc = require('grpc');
2627
var is = require('is');
2728

2829
var PKG = require('../package.json');
@@ -291,6 +292,7 @@ PubSub.prototype.determineBaseUrl_ = function() {
291292

292293
this.options.servicePath = baseUrlParts[0];
293294
this.options.port = baseUrlParts[1];
295+
this.options.sslCreds = grpc.credentials.createInsecure();
294296
};
295297

296298
/**

handwritten/pubsub/test/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@
1919
var arrify = require('arrify');
2020
var assert = require('assert');
2121
var extend = require('extend');
22+
var grpc = require('grpc');
2223
var proxyquire = require('proxyquire');
2324
var util = require('@google-cloud/common').util;
2425

2526
var PKG = require('../package.json');
2627
var v1 = require('../src/v1/index.js');
2728

29+
var fakeGrpc = extend({}, grpc);
30+
2831
var SubscriptionCached = require('../src/subscription.js');
2932
var SubscriptionOverride;
3033

@@ -122,6 +125,7 @@ describe('PubSub', function() {
122125
util: fakeUtil
123126
},
124127
'google-auto-auth': fakeGoogleAutoAuth,
128+
grpc: fakeGrpc,
125129
'./snapshot.js': FakeSnapshot,
126130
'./subscription.js': Subscription,
127131
'./topic.js': FakeTopic,
@@ -604,12 +608,18 @@ describe('PubSub', function() {
604608
var defaultBaseUrl_ = 'defaulturl';
605609
var testingUrl = 'localhost:8085';
606610

611+
var fakeCreds = {};
612+
fakeGrpc.credentials.createInsecure = function() {
613+
return fakeCreds;
614+
};
615+
607616
setHost(defaultBaseUrl_);
608617
pubsub.options.apiEndpoint = testingUrl;
609618
pubsub.determineBaseUrl_();
610619

611620
assert.strictEqual(pubsub.options.servicePath, 'localhost');
612621
assert.strictEqual(pubsub.options.port, '8085');
622+
assert.strictEqual(pubsub.options.sslCreds, fakeCreds);
613623
});
614624

615625
it('should remove slashes from the baseUrl', function() {

0 commit comments

Comments
 (0)