Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: run prettier for auto-generated code #273

Merged
merged 1 commit into from
Aug 10, 2018
Merged

chore: run prettier for auto-generated code #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 33 additions & 34 deletions src/v2/bigtable_client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,11 @@ class BigtableClient {
options = options || {};
options.otherArgs = options.otherArgs || {};
options.otherArgs.headers = options.otherArgs.headers || {};
options.otherArgs.headers['x-goog-request-params'] =
gax.routingHeader.fromParams({
'table_name': request.tableName
});
options.otherArgs.headers[
'x-goog-request-params'
] = gax.routingHeader.fromParams({
table_name: request.tableName,
});

return this._innerApiCalls.readRows(request, options);
}
Expand Down Expand Up @@ -297,10 +298,11 @@ class BigtableClient {
options = options || {};
options.otherArgs = options.otherArgs || {};
options.otherArgs.headers = options.otherArgs.headers || {};
options.otherArgs.headers['x-goog-request-params'] =
gax.routingHeader.fromParams({
'table_name': request.tableName
});
options.otherArgs.headers[
'x-goog-request-params'
] = gax.routingHeader.fromParams({
table_name: request.tableName,
});

return this._innerApiCalls.sampleRowKeys(request, options);
}
Expand Down Expand Up @@ -370,10 +372,11 @@ class BigtableClient {
options = options || {};
options.otherArgs = options.otherArgs || {};
options.otherArgs.headers = options.otherArgs.headers || {};
options.otherArgs.headers['x-goog-request-params'] =
gax.routingHeader.fromParams({
'table_name': request.tableName
});
options.otherArgs.headers[
'x-goog-request-params'
] = gax.routingHeader.fromParams({
table_name: request.tableName,
});

return this._innerApiCalls.mutateRow(request, options, callback);
}
Expand Down Expand Up @@ -426,10 +429,11 @@ class BigtableClient {
options = options || {};
options.otherArgs = options.otherArgs || {};
options.otherArgs.headers = options.otherArgs.headers || {};
options.otherArgs.headers['x-goog-request-params'] =
gax.routingHeader.fromParams({
'table_name': request.tableName
});
options.otherArgs.headers[
'x-goog-request-params'
] = gax.routingHeader.fromParams({
table_name: request.tableName,
});

return this._innerApiCalls.mutateRows(request, options);
}
Expand Down Expand Up @@ -514,10 +518,11 @@ class BigtableClient {
options = options || {};
options.otherArgs = options.otherArgs || {};
options.otherArgs.headers = options.otherArgs.headers || {};
options.otherArgs.headers['x-goog-request-params'] =
gax.routingHeader.fromParams({
'table_name': request.tableName
});
options.otherArgs.headers[
'x-goog-request-params'
] = gax.routingHeader.fromParams({
table_name: request.tableName,
});

return this._innerApiCalls.checkAndMutateRow(request, options, callback);
}
Expand Down Expand Up @@ -591,10 +596,11 @@ class BigtableClient {
options = options || {};
options.otherArgs = options.otherArgs || {};
options.otherArgs.headers = options.otherArgs.headers || {};
options.otherArgs.headers['x-goog-request-params'] =
gax.routingHeader.fromParams({
'table_name': request.tableName
});
options.otherArgs.headers[
'x-goog-request-params'
] = gax.routingHeader.fromParams({
table_name: request.tableName,
});

return this._innerApiCalls.readModifyWriteRow(request, options, callback);
}
Expand Down Expand Up @@ -627,9 +633,7 @@ class BigtableClient {
* @returns {String} - A string representing the project.
*/
matchProjectFromTableName(tableName) {
return this._pathTemplates.tablePathTemplate
.match(tableName)
.project;
return this._pathTemplates.tablePathTemplate.match(tableName).project;
}

/**
Expand All @@ -640,9 +644,7 @@ class BigtableClient {
* @returns {String} - A string representing the instance.
*/
matchInstanceFromTableName(tableName) {
return this._pathTemplates.tablePathTemplate
.match(tableName)
.instance;
return this._pathTemplates.tablePathTemplate.match(tableName).instance;
}

/**
Expand All @@ -653,11 +655,8 @@ class BigtableClient {
* @returns {String} - A string representing the table.
*/
matchTableFromTableName(tableName) {
return this._pathTemplates.tablePathTemplate
.match(tableName)
.table;
return this._pathTemplates.tablePathTemplate.match(tableName).table;
}
}


module.exports = BigtableClient;
109 changes: 88 additions & 21 deletions test/gapic-v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ describe('BigtableClient', () => {
});

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var request = {
tableName: formattedTableName,
};
Expand All @@ -44,7 +48,10 @@ describe('BigtableClient', () => {
};

// Mock Grpc layer
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(request, expectedResponse);
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(
request,
expectedResponse
);

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

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var request = {
tableName: formattedTableName,
};

// Mock Grpc layer
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(request, null, error);
client._innerApiCalls.readRows = mockServerStreamingGrpcMethod(
request,
null,
error
);

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

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var request = {
tableName: formattedTableName,
};
Expand All @@ -109,7 +128,10 @@ describe('BigtableClient', () => {
};

// Mock Grpc layer
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(request, expectedResponse);
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(
request,
expectedResponse
);

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

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var request = {
tableName: formattedTableName,
};

// Mock Grpc layer
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(request, null, error);
client._innerApiCalls.sampleRowKeys = mockServerStreamingGrpcMethod(
request,
null,
error
);

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

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var rowKey = '122';
var mutations = [];
var request = {
Expand Down Expand Up @@ -192,7 +226,11 @@ describe('BigtableClient', () => {
});

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var rowKey = '122';
var mutations = [];
var request = {
Expand Down Expand Up @@ -225,7 +263,11 @@ describe('BigtableClient', () => {
});

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var entries = [];
var request = {
tableName: formattedTableName,
Expand All @@ -236,7 +278,10 @@ describe('BigtableClient', () => {
var expectedResponse = {};

// Mock Grpc layer
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(request, expectedResponse);
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(
request,
expectedResponse
);

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

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var entries = [];
var request = {
tableName: formattedTableName,
entries: entries,
};

// Mock Grpc layer
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(request, null, error);
client._innerApiCalls.mutateRows = mockServerStreamingGrpcMethod(
request,
null,
error
);

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

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var rowKey = '122';
var request = {
tableName: formattedTableName,
Expand Down Expand Up @@ -322,7 +379,11 @@ describe('BigtableClient', () => {
});

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var rowKey = '122';
var request = {
tableName: formattedTableName,
Expand Down Expand Up @@ -353,7 +414,11 @@ describe('BigtableClient', () => {
});

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var rowKey = '122';
var rules = [];
var request = {
Expand Down Expand Up @@ -385,7 +450,11 @@ describe('BigtableClient', () => {
});

// Mock request
var formattedTableName = client.tablePath('[PROJECT]', '[INSTANCE]', '[TABLE]');
var formattedTableName = client.tablePath(
'[PROJECT]',
'[INSTANCE]',
'[TABLE]'
);
var rowKey = '122';
var rules = [];
var request = {
Expand All @@ -409,7 +478,6 @@ describe('BigtableClient', () => {
});
});
});

});

function mockSimpleGrpcMethod(expectedRequest, response, error) {
Expand All @@ -431,8 +499,7 @@ function mockServerStreamingGrpcMethod(expectedRequest, response, error) {
var mockStream = through2.obj((chunk, enc, callback) => {
if (error) {
callback(error);
}
else {
} else {
callback(null, response);
}
});
Expand Down