Skip to content

Commit 48a82a9

Browse files
stephenpluspluscallmehiphop
stephenplusplus
authored and
callmehiphop
committed
all modules: ensure all User-Agents are set (#1568)
1 parent 6153b0f commit 48a82a9

File tree

41 files changed

+55
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+55
-93
lines changed

‎packages/bigquery/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"bigquery"
5151
],
5252
"dependencies": {
53-
"@google-cloud/common": "^0.4.0",
53+
"@google-cloud/common": "^0.5.0",
5454
"arrify": "^1.0.0",
5555
"duplexify": "^3.2.0",
5656
"extend": "^3.0.0",

‎packages/bigquery/src/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ var Job = require('./job.js');
4343
*/
4444
var Table = require('./table.js');
4545

46-
var PKG = require('../package.json');
47-
4846
/**
4947
* In the following examples from this page and the other modules (`Dataset`,
5048
* `Table`, etc.), we are going to be using a dataset from
@@ -69,7 +67,7 @@ function BigQuery(options) {
6967
var config = {
7068
baseUrl: 'https://www.googleapis.com/bigquery/v2',
7169
scopes: ['https://www.googleapis.com/auth/bigquery'],
72-
userAgent: PKG.name + '/' + PKG.version
70+
packageJson: require('../package.json')
7371
};
7472

7573
common.Service.call(this, config, options);

‎packages/bigquery/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ var Service = require('@google-cloud/common').Service;
2626
var Table = require('../src/table.js');
2727
var util = require('@google-cloud/common').util;
2828

29-
var PKG = require('../package.json');
30-
3129
var fakeUtil = extend({}, util);
3230

3331
function FakeTable(a, b) {
@@ -118,7 +116,7 @@ describe('BigQuery', function() {
118116
assert.deepEqual(calledWith.scopes, [
119117
'https://www.googleapis.com/auth/bigquery'
120118
]);
121-
assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
119+
assert.deepEqual(calledWith.packageJson, require('../package.json'));
122120
});
123121
});
124122

‎packages/bigtable/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"bigtable"
5151
],
5252
"dependencies": {
53-
"@google-cloud/common": "^0.4.0",
53+
"@google-cloud/common": "^0.5.0",
5454
"arrify": "^1.0.0",
5555
"concat-stream": "^1.5.0",
5656
"create-error-class": "^3.0.2",

‎packages/bigtable/src/index.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,15 @@ var util = require('util');
2929

3030
/**
3131
* @private
32-
* @type {module:bigtable/instance}
32+
* @type {module:bigtable/cluster}
3333
*/
34-
var Instance = require('./instance.js');
34+
var Cluster = require('./cluster.js');
3535

3636
/**
3737
* @private
38-
* @type {module:bigtable/cluster}
38+
* @type {module:bigtable/instance}
3939
*/
40-
var Cluster = require('./cluster.js');
41-
42-
var PKG = require('../package.json');
40+
var Instance = require('./instance.js');
4341

4442
/**
4543
* @alias module:bigtable
@@ -319,7 +317,7 @@ function Bigtable(options) {
319317
'https://www.googleapis.com/auth/bigtable.data',
320318
'https://www.googleapis.com/auth/cloud-platform'
321319
],
322-
userAgent: PKG.name + '/' + PKG.version
320+
packageJson: require('../package.json')
323321
};
324322

325323
common.GrpcService.call(this, config, options);

‎packages/bigtable/test/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ var sinon = require('sinon').sandbox.create();
2626
var common = require('@google-cloud/common');
2727
var Cluster = require('../src/cluster.js');
2828
var Instance = require('../src/instance.js');
29-
var PKG = require('../package.json');
3029

3130
var fakeUtil = extend({}, common.util);
3231
var fakeStreamRouter = {
@@ -143,7 +142,7 @@ describe('Bigtable', function() {
143142
'https://www.googleapis.com/auth/cloud-platform'
144143
]);
145144

146-
assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
145+
assert.deepEqual(calledWith.packageJson, require('../package.json'));
147146
});
148147

149148
it('should set the projectName', function() {

‎packages/compute/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"compute engine"
5151
],
5252
"dependencies": {
53-
"@google-cloud/common": "^0.1.0",
53+
"@google-cloud/common": "^0.5.0",
5454
"arrify": "^1.0.0",
5555
"async": "^1.4.2",
5656
"create-error-class": "^2.0.1",

‎packages/compute/src/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ var Snapshot = require('./snapshot.js');
8080
*/
8181
var Zone = require('./zone.js');
8282

83-
var PKG = require('../package.json');
84-
8583
/**
8684
* @alias module:compute
8785
* @constructor
@@ -99,7 +97,7 @@ function Compute(options) {
9997
var config = {
10098
baseUrl: 'https://www.googleapis.com/compute/v1',
10199
scopes: ['https://www.googleapis.com/auth/compute'],
102-
userAgent: PKG.name + '/' + PKG.version
100+
packageJson: require('../package.json')
103101
};
104102

105103
common.Service.call(this, config, options);

‎packages/compute/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ var proxyquire = require('proxyquire');
2525
var Service = require('@google-cloud/common').Service;
2626
var util = require('@google-cloud/common').util;
2727

28-
var PKG = require('../package.json');
29-
3028
var slice = Array.prototype.slice;
3129

3230
var fakeUtil = extend({}, util, {
@@ -183,7 +181,7 @@ describe('Compute', function() {
183181
assert.deepEqual(calledWith.scopes, [
184182
'https://www.googleapis.com/auth/compute'
185183
]);
186-
assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
184+
assert.deepEqual(calledWith.packageJson, require('../package.json'));
187185
});
188186
});
189187

‎packages/datastore/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"datastore"
5151
],
5252
"dependencies": {
53-
"@google-cloud/common": "^0.4.0",
53+
"@google-cloud/common": "^0.5.0",
5454
"arrify": "^1.0.0",
5555
"concat-stream": "^1.5.0",
5656
"create-error-class": "^3.0.2",

‎packages/datastore/src/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ var Query = require('./query.js');
4949
*/
5050
var Transaction = require('./transaction.js');
5151

52-
var PKG = require('../package.json');
53-
5452
/**
5553
* @constructor
5654
* @alias module:datastore
@@ -323,7 +321,7 @@ function Datastore(options) {
323321
service: 'datastore',
324322
apiVersion: 'v1',
325323
scopes: ['https://www.googleapis.com/auth/datastore'],
326-
userAgent: PKG.name + '/' + PKG.version,
324+
packageJson: require('../package.json'),
327325
grpcMetadata: {
328326
'google-cloud-resource-prefix': 'projects/' + this.projectId
329327
}

‎packages/datastore/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ var extend = require('extend');
2121
var proxyquire = require('proxyquire');
2222
var util = require('@google-cloud/common').util;
2323

24-
var PKG = require('../package.json');
25-
2624
var fakeEntity = {
2725
Int: function(value) {
2826
this.value = value;
@@ -157,7 +155,7 @@ describe('Datastore', function() {
157155
assert.deepEqual(calledWith.scopes, [
158156
'https://www.googleapis.com/auth/datastore'
159157
]);
160-
assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
158+
assert.deepEqual(calledWith.packageJson, require('../package.json'));
161159
assert.deepEqual(calledWith.grpcMetadata, {
162160
'google-cloud-resource-prefix': 'projects/' + datastore.projectId
163161
});

‎packages/dns/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"dns"
5151
],
5252
"dependencies": {
53-
"@google-cloud/common": "^0.1.0",
53+
"@google-cloud/common": "^0.5.0",
5454
"arrify": "^1.0.0",
5555
"dns-zonefile": "0.1.18",
5656
"extend": "^3.0.0",

‎packages/dns/src/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ var util = require('util');
3232
*/
3333
var Zone = require('./zone.js');
3434

35-
var PKG = require('../package.json');
36-
3735
/**
3836
* [Google Cloud DNS](https://cloud.google.com/dns/what-is-cloud-dns) is a high-
3937
* performance, resilient, global DNS service that provides a cost-effective way
@@ -60,7 +58,7 @@ function DNS(options) {
6058
'https://www.googleapis.com/auth/ndev.clouddns.readwrite',
6159
'https://www.googleapis.com/auth/cloud-platform'
6260
],
63-
userAgent: PKG.name + '/' + PKG.version
61+
packageJson: require('../package.json')
6462
};
6563

6664
common.Service.call(this, config, options);

‎packages/dns/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ var proxyquire = require('proxyquire');
2424
var Service = require('@google-cloud/common').Service;
2525
var util = require('@google-cloud/common').util;
2626

27-
var PKG = require('../package.json');
28-
2927
var extended = false;
3028
var fakeStreamRouter = {
3129
extend: function(Class, methods) {
@@ -113,7 +111,7 @@ describe('DNS', function() {
113111
'https://www.googleapis.com/auth/ndev.clouddns.readwrite',
114112
'https://www.googleapis.com/auth/cloud-platform'
115113
]);
116-
assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
114+
assert.deepEqual(calledWith.packageJson, require('../package.json'));
117115
});
118116
});
119117

‎packages/language/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"language"
5353
],
5454
"dependencies": {
55-
"@google-cloud/common": "^0.4.0",
55+
"@google-cloud/common": "^0.5.0",
5656
"arguejs": "^0.2.3",
5757
"arrify": "^1.0.1",
5858
"extend": "^3.0.0",

‎packages/language/src/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ var util = require('util');
3232
*/
3333
var Document = require('./document.js');
3434

35-
var PKG = require('../package.json');
36-
3735
/**
3836
* <p class="notice">
3937
* **This is a Beta release of Google Cloud Natural Language.** This API is
@@ -79,7 +77,7 @@ function Language(options) {
7977
scopes: [
8078
'https://www.googleapis.com/auth/cloud-platform'
8179
],
82-
userAgent: PKG.name + '/' + PKG.version
80+
packageJson: require('../package.json')
8381
};
8482

8583
common.GrpcService.call(this, config, options);

‎packages/language/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ var googleProtoFiles = require('google-proto-files');
2222
var proxyquire = require('proxyquire');
2323
var util = require('@google-cloud/common').util;
2424

25-
var PKG = require('../package.json');
26-
2725
var fakeUtil = extend(true, {}, util);
2826

2927
function FakeDocument() {
@@ -98,7 +96,7 @@ describe('Language', function() {
9896
scopes: [
9997
'https://www.googleapis.com/auth/cloud-platform'
10098
],
101-
userAgent: PKG.name + '/' + PKG.version
99+
packageJson: require('../package.json')
102100
});
103101
});
104102
});

‎packages/logging/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"stackdriver"
5353
],
5454
"dependencies": {
55-
"@google-cloud/common": "^0.4.0",
55+
"@google-cloud/common": "^0.5.0",
5656
"arguejs": "^0.2.3",
5757
"arrify": "^1.0.0",
5858
"extend": "^3.0.0",

‎packages/logging/src/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ var Log = require('./log.js');
4646
*/
4747
var Sink = require('./sink.js');
4848

49-
var PKG = require('../package.json');
50-
5149
/**
5250
* <p class="notice">
5351
* **This is a Beta release of Stackdriver Logging.** This API is not covered
@@ -85,7 +83,7 @@ function Logging(options) {
8583
scopes: [
8684
'https://www.googleapis.com/auth/cloud-platform'
8785
],
88-
userAgent: PKG.name + '/' + PKG.version
86+
packageJson: require('../package.json')
8987
};
9088

9189
common.GrpcService.call(this, config, options);

‎packages/logging/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ var googleProtoFiles = require('google-proto-files');
2323
var proxyquire = require('proxyquire');
2424
var util = require('@google-cloud/common').util;
2525

26-
var PKG = require('../package.json');
27-
2826
var extended = false;
2927
var fakeStreamRouter = {
3028
extend: function(Class, methods) {
@@ -147,7 +145,7 @@ describe('Logging', function() {
147145
assert.deepEqual(calledWith.scopes, [
148146
'https://www.googleapis.com/auth/cloud-platform'
149147
]);
150-
assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
148+
assert.deepEqual(calledWith.packageJson, require('../package.json'));
151149
});
152150
});
153151

‎packages/prediction/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"prediction"
5151
],
5252
"dependencies": {
53-
"@google-cloud/common": "^0.1.0",
53+
"@google-cloud/common": "^0.5.0",
5454
"JSONStream": "^1.0.7",
5555
"arrify": "^1.0.0",
5656
"extend": "^3.0.0",

‎packages/prediction/src/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ var util = require('util');
3333
*/
3434
var Model = require('./model.js');
3535

36-
var PKG = require('../package.json');
37-
3836
/**
3937
* The [Google Prediction API](https://cloud.google.com/prediction/docs/getting-started)
4038
* provides pattern-matching and machine learning capabilities. Given a set of
@@ -70,7 +68,7 @@ function Prediction(options) {
7068
'https://www.googleapis.com/auth/prediction',
7169
'https://www.googleapis.com/auth/devstorage.read_only'
7270
],
73-
userAgent: PKG.name + '/' + PKG.version
71+
packageJson: require('../package.json')
7472
};
7573

7674
common.Service.call(this, config, options);

‎packages/prediction/test/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ var proxyquire = require('proxyquire');
2424
var Service = require('@google-cloud/common').Service;
2525
var util = require('@google-cloud/common').util;
2626

27-
var PKG = require('../package.json');
28-
2927
function FakeModel() {
3028
this.calledWith_ = arguments;
3129
}
@@ -114,7 +112,7 @@ describe('Prediction', function() {
114112
'https://www.googleapis.com/auth/prediction',
115113
'https://www.googleapis.com/auth/devstorage.read_only'
116114
]);
117-
assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
115+
assert.deepEqual(calledWith.packageJson, require('../package.json'));
118116
});
119117
});
120118

‎packages/pubsub/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"pubsub"
5151
],
5252
"dependencies": {
53-
"@google-cloud/common": "^0.4.0",
53+
"@google-cloud/common": "^0.5.0",
5454
"arguejs": "^0.2.3",
5555
"arrify": "^1.0.0",
5656
"extend": "^3.0.0",

‎packages/pubsub/src/iam.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ function IAM(pubsub, id) {
7373
scopes: [
7474
'https://www.googleapis.com/auth/pubsub',
7575
'https://www.googleapis.com/auth/cloud-platform'
76-
]
76+
],
77+
packageJson: require('../package.json')
7778
};
7879

7980
this.id = id;

0 commit comments

Comments
 (0)