From 34f3cd75b01d65882c4f07c59ca35cbef601f992 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 31 Jan 2017 11:52:55 -0500 Subject: [PATCH] pubsub: incorporate @google-cloud/common-grpc --- packages/pubsub/package.json | 3 ++- packages/pubsub/src/iam.js | 5 +++-- packages/pubsub/src/index.js | 5 +++-- packages/pubsub/src/subscription.js | 5 +++-- packages/pubsub/src/topic.js | 5 +++-- packages/pubsub/test/iam.js | 6 ++++-- packages/pubsub/test/index.js | 4 +++- packages/pubsub/test/subscription.js | 6 ++++-- packages/pubsub/test/topic.js | 10 ++++++---- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index ba3b2eb3ae6..03cfdd9a573 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -50,7 +50,8 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.11.0", + "@google-cloud/common": "^0.12.0", + "@google-cloud/common-grpc": "^0.1.1", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.10.0", diff --git a/packages/pubsub/src/iam.js b/packages/pubsub/src/iam.js index 8192b4a8977..61c6980b789 100644 --- a/packages/pubsub/src/iam.js +++ b/packages/pubsub/src/iam.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var is = require('is'); var util = require('util'); @@ -79,10 +80,10 @@ function IAM(pubsub, id) { this.id = id; - common.GrpcService.call(this, config, pubsub.options); + commonGrpc.Service.call(this, config, pubsub.options); } -util.inherits(IAM, common.GrpcService); +util.inherits(IAM, commonGrpc.Service); /** * Get the IAM policy diff --git a/packages/pubsub/src/index.js b/packages/pubsub/src/index.js index c51344c64e4..c1d452313ef 100644 --- a/packages/pubsub/src/index.js +++ b/packages/pubsub/src/index.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var extend = require('extend'); var is = require('is'); var util = require('util'); @@ -76,10 +77,10 @@ function PubSub(options) { this.options = options; - common.GrpcService.call(this, config, options); + commonGrpc.Service.call(this, config, options); } -util.inherits(PubSub, common.GrpcService); +util.inherits(PubSub, commonGrpc.Service); /** * Create a topic with the given name. diff --git a/packages/pubsub/src/subscription.js b/packages/pubsub/src/subscription.js index 0fda9769605..53b968f9019 100644 --- a/packages/pubsub/src/subscription.js +++ b/packages/pubsub/src/subscription.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var events = require('events'); var is = require('is'); var modelo = require('modelo'); @@ -270,7 +271,7 @@ function Subscription(pubsub, options) { config.methods.create = true; } - common.GrpcServiceObject.call(this, config); + commonGrpc.ServiceObject.call(this, config); events.EventEmitter.call(this); this.autoAck = is.boolean(options.autoAck) ? options.autoAck : false; @@ -331,7 +332,7 @@ function Subscription(pubsub, options) { this.listenForEvents_(); } -modelo.inherits(Subscription, common.GrpcServiceObject, events.EventEmitter); +modelo.inherits(Subscription, commonGrpc.ServiceObject, events.EventEmitter); /** * Simplify a message from an API response to have five properties: `id`, diff --git a/packages/pubsub/src/topic.js b/packages/pubsub/src/topic.js index 02183424070..ffead1a73d5 100644 --- a/packages/pubsub/src/topic.js +++ b/packages/pubsub/src/topic.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var extend = require('extend'); var is = require('is'); var util = require('util'); @@ -180,7 +181,7 @@ function Topic(pubsub, name) { } }; - common.GrpcServiceObject.call(this, { + commonGrpc.ServiceObject.call(this, { parent: pubsub, id: this.name, createMethod: pubsub.createTopic.bind(pubsub), @@ -224,7 +225,7 @@ function Topic(pubsub, name) { this.iam = new IAM(pubsub, this.name); } -util.inherits(Topic, common.GrpcServiceObject); +util.inherits(Topic, commonGrpc.ServiceObject); /** * Format a message object as the upstream API expects it. diff --git a/packages/pubsub/test/iam.js b/packages/pubsub/test/iam.js index 21cfa8a3f1b..14151ef892d 100644 --- a/packages/pubsub/test/iam.js +++ b/packages/pubsub/test/iam.js @@ -18,7 +18,7 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcService = require('@google-cloud/common').GrpcService; +var GrpcService = require('@google-cloud/common-grpc').Service; var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -52,8 +52,10 @@ describe('IAM', function() { before(function() { IAM = proxyquire('../src/iam.js', { '@google-cloud/common': { - GrpcService: FakeGrpcService, util: fakeUtil + }, + '@google-cloud/common-grpc': { + Service: FakeGrpcService } }); }); diff --git a/packages/pubsub/test/index.js b/packages/pubsub/test/index.js index df69e1d3cff..b6f822ebc28 100644 --- a/packages/pubsub/test/index.js +++ b/packages/pubsub/test/index.js @@ -77,10 +77,12 @@ describe('PubSub', function() { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../', { '@google-cloud/common': { - GrpcService: FakeGrpcService, paginator: fakePaginator, util: fakeUtil }, + '@google-cloud/common-grpc': { + Service: FakeGrpcService + }, './subscription.js': Subscription, './topic.js': Topic }); diff --git a/packages/pubsub/test/subscription.js b/packages/pubsub/test/subscription.js index c1ef84d6096..f28bb98c63a 100644 --- a/packages/pubsub/test/subscription.js +++ b/packages/pubsub/test/subscription.js @@ -18,7 +18,7 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; +var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject; var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -81,9 +81,11 @@ describe('Subscription', function() { before(function() { Subscription = proxyquire('../src/subscription.js', { '@google-cloud/common': { - GrpcServiceObject: FakeGrpcServiceObject, util: fakeUtil }, + '@google-cloud/common-grpc': { + ServiceObject: FakeGrpcServiceObject + }, './iam.js': FakeIAM }); diff --git a/packages/pubsub/test/topic.js b/packages/pubsub/test/topic.js index c6f91d34182..2a06c2ec2e7 100644 --- a/packages/pubsub/test/topic.js +++ b/packages/pubsub/test/topic.js @@ -18,7 +18,7 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; +var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject; var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -60,11 +60,13 @@ describe('Topic', function() { before(function() { Topic = proxyquire('../src/topic.js', { - './iam.js': FakeIAM, '@google-cloud/common': { - GrpcServiceObject: FakeGrpcServiceObject, util: fakeUtil - } + }, + '@google-cloud/common-grpc': { + ServiceObject: FakeGrpcServiceObject + }, + './iam.js': FakeIAM }); });