Skip to content

Commit 9c89117

Browse files
sduskissduskis
authored
Merge branch 'master' into tag-ex-comments-family
2 parents a86cf22 + 109d081 commit 9c89117

File tree

2 files changed

+121
-55
lines changed

2 files changed

+121
-55
lines changed

‎src/v2/bigtable_client.js

+33-34
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,11 @@ class BigtableClient {
251251
options = options || {};
252252
options.otherArgs = options.otherArgs || {};
253253
options.otherArgs.headers = options.otherArgs.headers || {};
254-
options.otherArgs.headers['x-goog-request-params'] =
255-
gax.routingHeader.fromParams({
256-
'table_name': request.tableName
257-
});
254+
options.otherArgs.headers[
255+
'x-goog-request-params'
256+
] = gax.routingHeader.fromParams({
257+
table_name: request.tableName,
258+
});
258259

259260
return this._innerApiCalls.readRows(request, options);
260261
}
@@ -297,10 +298,11 @@ class BigtableClient {
297298
options = options || {};
298299
options.otherArgs = options.otherArgs || {};
299300
options.otherArgs.headers = options.otherArgs.headers || {};
300-
options.otherArgs.headers['x-goog-request-params'] =
301-
gax.routingHeader.fromParams({
302-
'table_name': request.tableName
303-
});
301+
options.otherArgs.headers[
302+
'x-goog-request-params'
303+
] = gax.routingHeader.fromParams({
304+
table_name: request.tableName,
305+
});
304306

305307
return this._innerApiCalls.sampleRowKeys(request, options);
306308
}
@@ -370,10 +372,11 @@ class BigtableClient {
370372
options = options || {};
371373
options.otherArgs = options.otherArgs || {};
372374
options.otherArgs.headers = options.otherArgs.headers || {};
373-
options.otherArgs.headers['x-goog-request-params'] =
374-
gax.routingHeader.fromParams({
375-
'table_name': request.tableName
376-
});
375+
options.otherArgs.headers[
376+
'x-goog-request-params'
377+
] = gax.routingHeader.fromParams({
378+
table_name: request.tableName,
379+
});
377380

378381
return this._innerApiCalls.mutateRow(request, options, callback);
379382
}
@@ -426,10 +429,11 @@ class BigtableClient {
426429
options = options || {};
427430
options.otherArgs = options.otherArgs || {};
428431
options.otherArgs.headers = options.otherArgs.headers || {};
429-
options.otherArgs.headers['x-goog-request-params'] =
430-
gax.routingHeader.fromParams({
431-
'table_name': request.tableName
432-
});
432+
options.otherArgs.headers[
433+
'x-goog-request-params'
434+
] = gax.routingHeader.fromParams({
435+
table_name: request.tableName,
436+
});
433437

434438
return this._innerApiCalls.mutateRows(request, options);
435439
}
@@ -514,10 +518,11 @@ class BigtableClient {
514518
options = options || {};
515519
options.otherArgs = options.otherArgs || {};
516520
options.otherArgs.headers = options.otherArgs.headers || {};
517-
options.otherArgs.headers['x-goog-request-params'] =
518-
gax.routingHeader.fromParams({
519-
'table_name': request.tableName
520-
});
521+
options.otherArgs.headers[
522+
'x-goog-request-params'
523+
] = gax.routingHeader.fromParams({
524+
table_name: request.tableName,
525+
});
521526

522527
return this._innerApiCalls.checkAndMutateRow(request, options, callback);
523528
}
@@ -591,10 +596,11 @@ class BigtableClient {
591596
options = options || {};
592597
options.otherArgs = options.otherArgs || {};
593598
options.otherArgs.headers = options.otherArgs.headers || {};
594-
options.otherArgs.headers['x-goog-request-params'] =
595-
gax.routingHeader.fromParams({
596-
'table_name': request.tableName
597-
});
599+
options.otherArgs.headers[
600+
'x-goog-request-params'
601+
] = gax.routingHeader.fromParams({
602+
table_name: request.tableName,
603+
});
598604

599605
return this._innerApiCalls.readModifyWriteRow(request, options, callback);
600606
}
@@ -627,9 +633,7 @@ class BigtableClient {
627633
* @returns {String} - A string representing the project.
628634
*/
629635
matchProjectFromTableName(tableName) {
630-
return this._pathTemplates.tablePathTemplate
631-
.match(tableName)
632-
.project;
636+
return this._pathTemplates.tablePathTemplate.match(tableName).project;
633637
}
634638

635639
/**
@@ -640,9 +644,7 @@ class BigtableClient {
640644
* @returns {String} - A string representing the instance.
641645
*/
642646
matchInstanceFromTableName(tableName) {
643-
return this._pathTemplates.tablePathTemplate
644-
.match(tableName)
645-
.instance;
647+
return this._pathTemplates.tablePathTemplate.match(tableName).instance;
646648
}
647649

648650
/**
@@ -653,11 +655,8 @@ class BigtableClient {
653655
* @returns {String} - A string representing the table.
654656
*/
655657
matchTableFromTableName(tableName) {
656-
return this._pathTemplates.tablePathTemplate
657-
.match(tableName)
658-
.table;
658+
return this._pathTemplates.tablePathTemplate.match(tableName).table;
659659
}
660660
}
661661

662-
663662
module.exports = BigtableClient;

‎test/gapic-v2.js

+88-21
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ describe('BigtableClient', () => {
3232
});
3333

3434
// Mock request
35-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
35+
var formattedTableName = client.tablePath(
36+
'[PROJECT]',
37+
'[INSTANCE]',
38+
'[TABLE]'
39+
);
3640
var request = {
3741
tableName: formattedTableName,
3842
};
@@ -44,7 +48,10 @@ describe('BigtableClient', () => {
4448
};
4549

4650
// Mock Grpc layer
47-
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(request, expectedResponse);
51+
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(
52+
request,
53+
expectedResponse
54+
);
4855

4956
var stream = client.readRows(request);
5057
stream.on('data', response => {
@@ -65,13 +72,21 @@ describe('BigtableClient', () => {
6572
});
6673

6774
// Mock request
68-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
75+
var formattedTableName = client.tablePath(
76+
'[PROJECT]',
77+
'[INSTANCE]',
78+
'[TABLE]'
79+
);
6980
var request = {
7081
tableName: formattedTableName,
7182
};
7283

7384
// Mock Grpc layer
74-
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(request, null, error);
85+
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(
86+
request,
87+
null,
88+
error
89+
);
7590

7691
var stream = client.readRows(request);
7792
stream.on('data', () => {
@@ -95,7 +110,11 @@ describe('BigtableClient', () => {
95110
});
96111

97112
// Mock request
98-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
113+
var formattedTableName = client.tablePath(
114+
'[PROJECT]',
115+
'[INSTANCE]',
116+
'[TABLE]'
117+
);
99118
var request = {
100119
tableName: formattedTableName,
101120
};
@@ -109,7 +128,10 @@ describe('BigtableClient', () => {
109128
};
110129

111130
// Mock Grpc layer
112-
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(request, expectedResponse);
131+
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(
132+
request,
133+
expectedResponse
134+
);
113135

114136
var stream = client.sampleRowKeys(request);
115137
stream.on('data', response => {
@@ -130,13 +152,21 @@ describe('BigtableClient', () => {
130152
});
131153

132154
// Mock request
133-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
155+
var formattedTableName = client.tablePath(
156+
'[PROJECT]',
157+
'[INSTANCE]',
158+
'[TABLE]'
159+
);
134160
var request = {
135161
tableName: formattedTableName,
136162
};
137163

138164
// Mock Grpc layer
139-
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(request, null, error);
165+
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(
166+
request,
167+
null,
168+
error
169+
);
140170

141171
var stream = client.sampleRowKeys(request);
142172
stream.on('data', () => {
@@ -160,7 +190,11 @@ describe('BigtableClient', () => {
160190
});
161191

162192
// Mock request
163-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
193+
var formattedTableName = client.tablePath(
194+
'[PROJECT]',
195+
'[INSTANCE]',
196+
'[TABLE]'
197+
);
164198
var rowKey = '122';
165199
var mutations = [];
166200
var request = {
@@ -192,7 +226,11 @@ describe('BigtableClient', () => {
192226
});
193227

194228
// Mock request
195-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
229+
var formattedTableName = client.tablePath(
230+
'[PROJECT]',
231+
'[INSTANCE]',
232+
'[TABLE]'
233+
);
196234
var rowKey = '122';
197235
var mutations = [];
198236
var request = {
@@ -225,7 +263,11 @@ describe('BigtableClient', () => {
225263
});
226264

227265
// Mock request
228-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
266+
var formattedTableName = client.tablePath(
267+
'[PROJECT]',
268+
'[INSTANCE]',
269+
'[TABLE]'
270+
);
229271
var entries = [];
230272
var request = {
231273
tableName: formattedTableName,
@@ -236,7 +278,10 @@ describe('BigtableClient', () => {
236278
var expectedResponse = {};
237279

238280
// Mock Grpc layer
239-
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(request, expectedResponse);
281+
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(
282+
request,
283+
expectedResponse
284+
);
240285

241286
var stream = client.mutateRows(request);
242287
stream.on('data', response => {
@@ -257,15 +302,23 @@ describe('BigtableClient', () => {
257302
});
258303

259304
// Mock request
260-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
305+
var formattedTableName = client.tablePath(
306+
'[PROJECT]',
307+
'[INSTANCE]',
308+
'[TABLE]'
309+
);
261310
var entries = [];
262311
var request = {
263312
tableName: formattedTableName,
264313
entries: entries,
265314
};
266315

267316
// Mock Grpc layer
268-
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(request, null, error);
317+
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(
318+
request,
319+
null,
320+
error
321+
);
269322

270323
var stream = client.mutateRows(request);
271324
stream.on('data', () => {
@@ -289,7 +342,11 @@ describe('BigtableClient', () => {
289342
});
290343

291344
// Mock request
292-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
345+
var formattedTableName = client.tablePath(
346+
'[PROJECT]',
347+
'[INSTANCE]',
348+
'[TABLE]'
349+
);
293350
var rowKey = '122';
294351
var request = {
295352
tableName: formattedTableName,
@@ -322,7 +379,11 @@ describe('BigtableClient', () => {
322379
});
323380

324381
// Mock request
325-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
382+
var formattedTableName = client.tablePath(
383+
'[PROJECT]',
384+
'[INSTANCE]',
385+
'[TABLE]'
386+
);
326387
var rowKey = '122';
327388
var request = {
328389
tableName: formattedTableName,
@@ -353,7 +414,11 @@ describe('BigtableClient', () => {
353414
});
354415

355416
// Mock request
356-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
417+
var formattedTableName = client.tablePath(
418+
'[PROJECT]',
419+
'[INSTANCE]',
420+
'[TABLE]'
421+
);
357422
var rowKey = '122';
358423
var rules = [];
359424
var request = {
@@ -385,7 +450,11 @@ describe('BigtableClient', () => {
385450
});
386451

387452
// Mock request
388-
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
453+
var formattedTableName = client.tablePath(
454+
'[PROJECT]',
455+
'[INSTANCE]',
456+
'[TABLE]'
457+
);
389458
var rowKey = '122';
390459
var rules = [];
391460
var request = {
@@ -409,7 +478,6 @@ describe('BigtableClient', () => {
409478
});
410479
});
411480
});
412-
413481
});
414482

415483
function mockSimpleGrpcMethod(expectedRequest, response, error) {
@@ -431,8 +499,7 @@ function mockServerStreamingGrpcMethod(expectedRequest, response, error) {
431499
var mockStream = through2.obj((chunk, enc, callback) => {
432500
if (error) {
433501
callback(error);
434-
}
435-
else {
502+
} else {
436503
callback(null, response);
437504
}
438505
});

0 commit comments

Comments
 (0)